Merge branch 'develop' of http://git.mmcuav.cn/iuav/cms

# Conflicts:
#	kustomization/overlays/prod/kustomization.yaml

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserApplyTagVO.java

@@ -28,7 +28,7 @@ public class UserApplyTagVO implements Serializable {
     @NotNull(message = "加盟标签id不能为空", groups = { Insert.class })
     private Integer cooperationTagId;
     @ApiModelProperty(value = "用户id")
-    @NotNull(message = "加盟标签id不能为空", groups = { Insert.class })
+    //@NotNull(message = "加盟标签id不能为空", groups = { Insert.class })
     private Integer userAccountId;
     @ApiModelProperty(value = "申请人名称")
     @NotBlank(message = "申请人名称不能为空", groups = { Insert.class })

cms-common/cms-common-util/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
+            <version>4.5.13</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
@@ -38,6 +38,11 @@
             <artifactId>jjwt</artifactId>
             <version>0.9.1</version>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+        </dependency>
 
     </dependencies>
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/TokenCheckHandleInterceptor.java

 package com.mmc.iuav.user.auth;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
-import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.util.PathUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;

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

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/17 21:17
@@ -18,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "合作加盟")
 @RequestMapping("/cooperation/")
 @RestController
-public class CooperationController {
+public class CooperationController extends BaseController{
     @Autowired
     private CooperationService cooperationService;
 
@@ -39,7 +41,9 @@ public class CooperationController {
     @ApiOperation(value = "申请加盟")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("apply")
-    public ResultBody apply(@Validated(value = {Insert.class})@RequestBody UserApplyTagVO userApplyTagVO){
+    public ResultBody apply(@Validated(value = {Insert.class})@RequestBody UserApplyTagVO userApplyTagVO, HttpServletRequest request){
+        Integer userAccountId  = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+        userApplyTagVO.setUserAccountId(userAccountId);
         return cooperationService.apply(userApplyTagVO);
     }
 

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

 package com.mmc.iuav.user.controller;
 
-import com.mmc.iuav.group.Insert;
-import com.mmc.iuav.response.ResultBody;
-import com.mmc.iuav.user.model.vo.AppUserSucVO;
-import com.mmc.iuav.user.model.vo.WxLoginVO;
-import com.mmc.iuav.user.service.AuthService;
-import com.mmc.iuav.user.service.UserAccountService;
-import io.swagger.annotations.*;
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.service.AuthService;
+
+import io.swagger.annotations.*;
 
 /**
  * @author: zj
@@ -20,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
 @Api(tags = "临时登录授权")
 @RequestMapping("/temp-auth/")
 @RestController
-public class TempLoginController extends BaseController{
+public class TempLoginController extends BaseController {
 
     @Autowired
     private AuthService authService;
@@ -35,8 +32,13 @@ public class TempLoginController extends BaseController{
     @ApiOperation(value = "查询登录信息")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @GetMapping("getLoginInfo")
-    public ResultBody getLoginInfo(@ApiParam(value = "临时登录code",example = "kj6d9wcxyp92jajugdnc") @RequestParam String randomLoginCode){
+    public ResultBody getLoginInfo(
+            @ApiParam(value = "临时登录code", example = "kj6d9wcxyp92jajugdnc") @RequestParam String randomLoginCode) {
         return authService.getLoginInfo(randomLoginCode);
     }
 
+
+
+    
+    //test
 }

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

@@ -157,12 +157,12 @@ public class AuthServiceImpl implements AuthService {
         map.put(JwtConstant.TOKEN_TYPE, JwtConstant.M_TOKEN);
         String token = JwtUtil.createJwt(map);
         LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).uid(user.getUid())
-                .userName(user.getUserName()).nickName(user.getNickName()).phoneNum(user.getPhoneNum()).portType(100).build();
+                .userName(user.getUserName()).nickName(user.getNickName()).phoneNum(user.getPhoneNum()).build();
         stringRedisTemplate.opsForValue().set(
                 token, JSONObject.toJSONString(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
 
-        return ResultBody.success(LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).portType(100).build());
+        return ResultBody.success(LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).build());
     }
 
     @Override

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

@@ -97,7 +97,7 @@
     </select>
 
     <select id="getUserAccountById" resultType="com.mmc.iuav.user.entity.UserAccountDO">
-        select id, account_type, uid, phone_num, user_name, nick_name, user_img, open_id, union_id, user_sex, email, source, account_status, remark,
+        select id, account_type, account_no, uid, phone_num, user_name, nick_name, user_img, open_id, union_id, user_sex, email, source, account_status, remark,
         	port_type, is_deleted, create_time, update_time
         from user_account
         where id = #{id}

kustomization/overlays/dev/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base
+  - ../../base
 #namePrefix: dev-
 namespace: dev
 commonLabels:
@@ -9,12 +9,12 @@ commonLabels:
 commonAnnotations:
   note: This is dev!
 patches:
-- path: ./configMap.yaml
-- path: ./service-patch.yaml
-  target:
-    kind: Service
-    name: cms-svc
+  - path: ./configMap.yaml
+  - path: ./service-patch.yaml
+    target:
+      kind: Service
+      name: cms-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 71b20b73cb9c383853e6bede37f83e970e4a0adc
+  newTag: 654ef1259bcb25094f1e2e61a32369080022dbd0

kustomization/overlays/prod/kustomization.yaml

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

pom.xml

@@ -88,6 +88,12 @@
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>3.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
@@ -141,11 +147,11 @@
                 <version>2.1.2</version>
             </dependency>
 
+            <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>8.0.15</version>
-                <scope>provided</scope>
+                <version>8.0.28</version>
             </dependency>
 
             <dependency>
@@ -187,7 +193,7 @@
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
-                <version>1.4</version>
+                <version>1.5</version>
             </dependency>
 
             <dependency>
@@ -196,16 +202,17 @@
                 <version>3.13.1</version>
             </dependency>
 
+            <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>18.0</version>
+                <version>31.1-jre</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi</artifactId>
-                <version>4.1.0</version>
+                <version>4.1.1</version>
                 <scope>compile</scope>
             </dependency>