Merge branch 'master' into develop

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

@@ -12,9 +12,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.response.ResultEnum;
+import com.mmc.iuav.user.util.PathUtil;
 
 /**
  * @author: zj

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(0).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(0).build());
+        return ResultBody.success(LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).build());
     }
 
     @Override

kustomization/overlays/dev/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base
+  - ../../base
 #namePrefix: dev-
 namespace: dev
 commonLabels:
@@ -9,8 +9,8 @@ commonLabels:
 commonAnnotations:
   note: This is dev!
 patches:
-- path: ./configMap.yaml
-- path: ./service-patch.yaml
+  - path: ./configMap.yaml
+  - path: ./service-patch.yaml
     target:
       kind: Service
       name: cms-svc

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: aff8b6d5d24d7859a41467f17bce510670143837
+  newTag: f3feaca2b4ecd07343122ef2a7b3bfd8e40a9b19