Merge branch 'develop'

.github/workflows/develop.yml

@@ -31,15 +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同步状态..."
-          #mentioned_list: '["@all"]'
-          #mentioned_mobile_list: '["@all"]'
+          msgtype: markdown
+          content: "
+          ### GitHub提交信息 \n
+          > - 提交人: ${{github.actor}} \n
+          > - 提交信息: ${{ github.event.head_commit.message }} \n
+          > - 提交到仓库: ${{github.repository}} \n
+          > - 提交到分支: ${{github.ref}} \n
+          即将开始更新，请关注Argocd同步状态...
+          "
 
       - name: Set up JDK 8
         uses: actions/setup-java@v1
@@ -73,4 +78,19 @@ jobs:
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
           git commit -am "generated Image update"
-          git push origin develop
+          git push origin develop
\ No newline at end of file
+
+      - 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,15 +32,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同步状态..."
-          #mentioned_list: '["@all"]'
-          #mentioned_mobile_list: '["@all"]'
+          msgtype: markdown
+          content: "
+          ### GitHub提交信息 \n
+          > - 提交人: ${{github.actor}} \n
+          > - 提交信息: ${{ github.event.head_commit.message }} \n
+          > - 提交到仓库: ${{github.repository}} \n
+          > - 提交到分支: ${{github.ref}} \n
+          即将开始更新，请关注Argocd同步状态...
+          "
 
       - name: Set up JDK 8
         uses: actions/setup-java@v1
@@ -74,4 +79,29 @@ jobs:
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
           git commit -am "generated Image update"
-          git push origin master
+          git push origin master
\ No newline at end of file
+
+      - 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 请修复错误后重新提交...
+                        "
+          }'
+        #- name: Commit files
+        #  run: |
+        #    git config --local user.email "Chuck@users.noreply.github.com"
+        #    git config --local user.name "Chuck"
+        #    git commit -am "Image Update"
+
+        #- name: Push changes
+        #  uses: ad-m/github-push-action@master
+      #  with:
+      #    github_token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CooperationController.java

@@ -82,7 +82,7 @@ public class CooperationController extends BaseController {
   @GetMapping("approvalApplyTag")
   public ResultBody approvalApplyTag(
       @RequestParam(value = "id") Integer id, @RequestParam(value = "status") Boolean status) {
-    return ResultBody.success(cooperationService.approvalApplyTag(id, status));
+    return cooperationService.approvalApplyTag(id, status);
   }
 
   @ApiOperation(value = "后台设置小程序用户标签")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -127,6 +127,7 @@ public class CooperationServiceImpl implements CooperationService {
     return ResultBody.success(userApplyTagDetailsVO);
   }
 
+  @Transactional
   @Override
   public ResultBody approvalApplyTag(Integer id, Boolean status) {
     // 判断用户是否已经是该渠道
@@ -134,18 +135,17 @@ public class CooperationServiceImpl implements CooperationService {
     int count =
         cooperationDao.userTagInfo(
             userApplyTag.getCooperationTagId(), userApplyTag.getUserAccountId());
-    if (count == 0) {
-      if (status) {
-        cooperationDao.updateApplyTagStatus(id, 1);
+    if (status){
+      cooperationDao.updateApplyTagStatus(id, 1);
+      if (count == 0){
         // 审批通过往用户标签表中新增一条数据
         UserTagDO userTagDO = new UserTagDO();
         userTagDO.setUserAccountId(userApplyTag.getUserAccountId());
         userTagDO.setCooperationTagId(userApplyTag.getCooperationTagId());
         cooperationDao.insertUserTag(userTagDO);
-      } else {
-        cooperationDao.updateApplyTagStatus(id, 2);
       }
-      return ResultBody.success();
+    }else {
+      cooperationDao.updateApplyTagStatus(id, 2);
     }
     return ResultBody.success();
   }

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -10,8 +10,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
     database: 1
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
-    password: MMC@2022&REDIS
+    host: 127.0.0.1
     port: 6379
   #rabbitMQ
   rabbitmq:

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 4c9d44c0d2b2687d57491a54dcdf99ddff67a4c3
+  newTag: 09419886c7020f6a51922ed3103025fdfb04dab7