Merge branch 'develop'

.gitlab-ci.yml

+stages:
+  - clean
+  - dockerbuild
+  - kustomize_tag_push
+
+variables:
+  REGION_id: cn-shenzhen
+  REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  IMAGE: cms
+  TAG: $CI_COMMIT_SHA
+  ACR_EE_USERNAME: QD--KeBiTeHangKong@1354706964800968
+  ACR_EE_PASSWORD: MMC@2023&ACR
+  ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
+  ACR_EE_IMAGE: cms
+  ACR_EE_TAG: $CI_COMMIT_SHA
+
+  JAVA_VERSION: '8'
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/cms.git
+
+mvn_clean:
+  stage: clean
+  script:
+    - echo "情理中..."
+    - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+
+docker_build_dev:
+  stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
+  only:
+    - develop
+  script:
+    - echo "dev docker build"
+    - echo $ACR_EE_USERNAME
+    - echo $ACR_EE_REGISTRY
+    - mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logout
+
+docker_build_prod:
+  stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
+  only:
+    - master
+  script:
+    - echo "prod docker build"
+    - echo $ACR_EE_USERNAME
+    - echo $ACR_EE_REGISTRY
+    - mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logout
+
+
+kustomize_set_image_dev:
+  stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
+  only:
+    - develop
+  before_script:
+    - echo "dev set image"
+    - git config --global user.name "bax" #配置本地仓库用户名信息
+    - git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
+  script:
+    - git remote -v
+    - git checkout -B develop
+    - cd kustomization/overlays/dev
+    - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+    - cat kustomization.yaml
+    - git remote set-url origin "$GITLAB_URL"
+    - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
+    - git push --set-upstream origin develop  #重新提交修改镜像版本后的代码
+
+
+
+kustomize_set_image_prod:
+  stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
+  only:
+    - master
+  before_script:
+    - echo "prod set image"
+    - echo "master"
+    - git config --global user.name "bax" #配置本地仓库用户名信息
+    - git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
+  script:
+    - git remote -v
+    - git checkout -B master
+    - cd kustomization/overlays/prod
+    - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+    - cat kustomization.yaml
+    - git remote set-url origin "$GITLAB_URL"
+    - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
+    - git push --set-upstream origin master  #重新提交修改镜像版本后的代码

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java

@@ -8,6 +8,7 @@ import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
 import com.mmc.iuav.user.model.vo.UserAccountMessageVo;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -210,4 +211,11 @@ public interface UserServiceDao {
     List<UserAccountDO> listAllUserAccountByIds(@Param("userIds") List<Integer> ids);
 
     int appUserCompanyAuthCount();
+
+    /**
+     * 查询该用户是否被邀请过了
+     * @param userId 用户id
+     * @return {@link Integer} 1表示被邀请过了 0表示没有
+     */
+    Integer getCountUserByUserCrd(Integer userId);
 }

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

@@ -248,15 +248,18 @@ public class UserAccountServiceImpl implements UserAccountService {
         userAccount.setPhoneNum(userPhoneNumber);
         userServiceDao.update(userAccount);
         System.out.println(userAccount);
-//        Integer countUser = userServiceDao.getCountUser(rcdUserId);
-//
-//        if (countUser != null && countUser !=0) {
-////        if (rcdUserId != null) {
-//            UserRcdDO userRcd = new UserRcdDO();
-//            userRcd.setUserAccountId(id);
-//            userRcd.setRcdUserId(rcdUserId);
-//            userServiceDao.insertUserRcd(userRcd);
-//        }
+        Integer countUser = userServiceDao.getCountUser(rcdUserId);
+        Integer countUserByUserCrd = userServiceDao.getCountUserByUserCrd(id);
+        if(countUserByUserCrd == 1) {
+            return ResultBody.success();
+        }
+        if (countUser != null && countUser !=0) {
+//        if (rcdUserId != null) {
+            UserRcdDO userRcd = new UserRcdDO();
+            userRcd.setUserAccountId(id);
+            userRcd.setRcdUserId(rcdUserId);
+            userServiceDao.insertUserRcd(userRcd);
+        }
 //
 //        /**
 //         * 积分

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -656,5 +656,8 @@
     <select id="getCountUser" resultType="java.lang.Integer">
         select count(id) from user_account where id = #{userId}
     </select>
+    <select id="getCountUserByUserCrd" resultType="java.lang.Integer">
+        select count(id) from user_rcd where user_account_id = #{userId}
+    </select>
 
 </mapper>

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: 45a89ad3beb8e63b5547d02f6e1e55724193c8a6
+  newTag: 0296dd1f8cf0ac68d08954ca8785dfcfbfe5a2a9