Merge remote-tracking branch 'origin/develop' into develop

.github/workflows/develop.yml

@@ -31,13 +31,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: WeChat Work notification by text
+      - name: WeChat Work notification by markdown
         uses: chf007/action-wechat-work@master
         env:
           WECHAT_WORK_BOT_WEBHOOK: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16
         with:
-          msgtype: text
-          content: "GitHub提交信息\n - 提交人: ${{github.actor}}\n - 提交信息: ${{ github.event.head_commit.message }}\n - 提交到仓库: ${{github.repository}}\n - 提交到分支: ${{github.ref}}\n 即将开始更新，请关注Argocd同步状态..."
+          msgtype: markdown
+          content: "
+          ### GitHub提交信息 \n
+          > - 提交人: ${{github.actor}} \n
+          > - 提交信息: ${{ github.event.head_commit.message }} \n
+          > - 提交到仓库: ${{github.repository}} \n
+          > - 提交到分支: ${{github.ref}} \n
+          即将开始更新，请关注Argocd同步状态...
+          "
 
       - name: Login to ACR EE with the AccessKey pair
         uses: aliyun/acr-login@v1
@@ -66,3 +73,17 @@ jobs:
           git remote set-url origin "$GITLAB_URL"
           git commit -am "Generated Image Update"
           git push origin "develop"
+
+      - name: Send Error Notification by WeChat
+        if: ${{ failure() }}
+        run: |
+          curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16' -H 'Content-Type: application/json' -d '
+          {
+            "msgtype": "markdown",
+            "markdown": {
+              "content": "### GitHub构建并推送镜像失败 \n
+                          > - 提交人: ${{github.actor}} \n
+                          > - 提交信息: ${{github.event.head_commit.message}} \n
+                          > - 提交到仓库: ${{github.repository}} \n
+                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
+          }'          
\ No newline at end of file

.github/workflows/master.yml

@@ -32,6 +32,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: WeChat Work notification by markdown
+        uses: chf007/action-wechat-work@master
+        env:
+          WECHAT_WORK_BOT_WEBHOOK: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16
+        with:
+          msgtype: markdown
+          content: "
+          ### GitHub提交信息 \n
+          > - 提交人: ${{github.actor}} \n
+          > - 提交信息: ${{ github.event.head_commit.message }} \n
+          > - 提交到仓库: ${{github.repository}} \n
+          > - 提交到分支: ${{github.ref}} \n
+          即将开始更新，请关注Argocd同步状态...
+          "        
+
       - name: Login to ACR EE with the AccessKey pair
         uses: aliyun/acr-login@v1
         with:
@@ -59,3 +74,17 @@ jobs:
           git remote set-url origin "$GITLAB_URL"
           git commit -am "generated Image update"
           git push origin "master"
+
+      - name: Send Error Notification by WeChat
+        if: ${{ failure() }}
+        run: |
+          curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16' -H 'Content-Type: application/json' -d '
+          {
+            "msgtype": "markdown",
+            "markdown": {
+              "content": "### GitHub构建并推送镜像失败 \n
+                          > - 提交人: ${{github.actor}} \n
+                          > - 提交信息: ${{github.event.head_commit.message}} \n
+                          > - 提交到仓库: ${{github.repository}} \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/admin
-  newTag: 682d7c8f7979b4524ab8018ee5e4ffc04baf18ed
+  newTag: a23ae1b6bc0f8422cc83cdc3aade3922220ff682