Merge branch 'develop'

.github/workflows/develop.yml

@@ -77,8 +77,9 @@ jobs:
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
-          git commit -am "Generated Image New Tag"
-          git push origin develop
+          git commit -am "Update Image Tag"
+          git tag -a $TAG -m "日常迭代"
+          git push origin develop --tags
 
       - name: Send Error Notification by WeChat
         if: ${{ failure() }}
@@ -91,6 +92,5 @@ jobs:
                           > - 提交人: ${{github.actor}} \n
                           > - 提交信息: ${{github.event.head_commit.message}} \n
                           > - 提交到仓库: ${{github.repository}} \n
-                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交...
-                        "
+                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
           }'
\ No newline at end of file

.github/workflows/master.yml

@@ -77,8 +77,9 @@ jobs:
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
-          git commit -am "Generated Image New Tag"
-          git push origin master
+          git commit -am "Update Image Tag"
+          git tag -a $TAG -m "日常迭代"
+          git push origin master --tags
 
       - name: Send Error Notification by WeChat
         if: ${{ failure() }}
@@ -91,6 +92,5 @@ jobs:
                           > - 提交人: ${{github.actor}} \n
                           > - 提交信息: ${{github.event.head_commit.message}} \n
                           > - 提交到仓库: ${{github.repository}} \n
-                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交...
-                        "
+                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
           }'
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/payment
-  newTag: 5bc3689fd1878d4b38427853c68a881da61ea2f0
+  newTag: 12debbeda34debd10c5157c5f9687e1414bc7975