From c60d98386eb9c5802aef8b9283fe3f7f8ff659c5 Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Tue, 18 Feb 2025 10:20:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E5=8D=8E=E4=B8=BA=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/sky/agconnect-services.json | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/android/app/src/sky/agconnect-services.json b/android/app/src/sky/agconnect-services.json
index 887f84c5..e66f71f0 100644
--- a/android/app/src/sky/agconnect-services.json
+++ b/android/app/src/sky/agconnect-services.json
@@ -26,21 +26,21 @@
 		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
 	},
 	"client":{
-		"cp_id":"30086000752967166",
-		"product_id":"388421841222116270",
-		"client_id":"1406555529261648640",
-		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
-		"project_id":"388421841222116270",
-		"app_id":"110798531",
-		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"cp_id":"30086000764882919",
+		"product_id":"388421841222019909",
+		"client_id":"1376040077926370048",
+		"client_secret":"FE068E768F2B897A291DFFD186E0C0E495BE4BE6CCD7C5973B6C02ADF9178916",
+		"project_id":"388421841222019909",
+		"app_id":"110413691",
+		"api_key":"DAEDAG1Mu4qubka2IheS5XVoQQIyqAr2tU+VyLcUukdN4iHjP9FZRI16fUIhWz+lsz8si57hQ/gjoNNvQBmgglsT5jnXFcnY4nF1wQ==",
 		"package_name":"com.skychip.lock"
 	},
 	"oauth_client":{
-		"client_id":"110798531",
+		"client_id":"110413691",
 		"client_type":1
 	},
 	"app_info":{
-		"app_id":"110798531",
+		"app_id":"110413691",
 		"package_name":"com.skychip.lock"
 	},
 	"service":{
@@ -81,15 +81,15 @@
 		{
 			"package_name":"com.skychip.lock",
 			"client":{
-				"app_id":"110798531"
+				"app_id":"110413691"
 			},
 			"app_info":{
 				"package_name":"com.skychip.lock",
-				"app_id":"110798531"
+				"app_id":"110413691"
 			},
 			"oauth_client":{
 				"client_type":1,
-				"client_id":"110798531"
+				"client_id":"110413691"
 			}
 		}
 	]

From a785c0777cfeeb848bc7af0afe4924c3e5fb0bb0 Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Tue, 18 Feb 2025 10:22:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?ci:=20=E5=B0=8F=E7=89=88=E6=9C=AC=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tag_generator.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tag_generator.sh b/tag_generator.sh
index 02ddc5d3..39c384ee 100755
--- a/tag_generator.sh
+++ b/tag_generator.sh
@@ -34,7 +34,7 @@ else
     echo "----$commit_message"
     if [[ "$commit_message" =~ ("feat:"*) ]]; then
         ((minor++))
-        new_patch=0
+#        new_patch=0
         break
     elif [[ "$commit_message" =~ ("fix:"*) ]] && [[ $new_patch == $patch ]]; then
         ((new_patch++))

From 1ef8cecc3961dd1c76f4f9dffccfda8d50e92c29 Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Tue, 18 Feb 2025 10:29:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ci:=20=E5=B0=8F=E7=89=88=E6=9C=AC=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tag_generator.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tag_generator.sh b/tag_generator.sh
index 39c384ee..27e39182 100755
--- a/tag_generator.sh
+++ b/tag_generator.sh
@@ -27,22 +27,23 @@ else
   fi
   echo "compare_json:$compare_json\n"
   new_patch=$patch
+  new_minor=$minor
   while IFS= read -r commit_json; do
     # 使用 jq 解析每一行的 JSON 对象
     commit_id=$(echo "$commit_json" | jq -r '.id')
     commit_message=$(echo "$commit_json" | jq -r '.message')
     echo "----$commit_message"
-    if [[ "$commit_message" =~ ("feat:"*) ]]; then
-        ((minor++))
+    if [[ "$commit_message" =~ ("feat:"*) ]]  && [[ $new_minor == $minor ]]; then
+        ((new_minor++))
 #        new_patch=0
-        break
-    elif [[ "$commit_message" =~ ("fix:"*) ]] && [[ $new_patch == $patch ]]; then
+#        break
+    elif [[ "$commit_message" =~ ("fix:"*) ]]; then
         ((new_patch++))
-    elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]] && [[ $new_patch == $patch ]]; then
+    elif [[ ! "$commit_message" =~ ("Merge"* | "Revert"*) ]]; then
         ((new_patch++))
     fi
   done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}')
-  next_tag="v$major.$minor.$new_patch"
+  next_tag="v$major.$new_minor.$new_patch"
 fi
 echo "New Tag:$newest_tag;New version: $next_tag;command: $1"
 if [[ "$1" == "generate_tag" ]];then