Merge branch 'develop'

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 java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 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
@@ -32,6 +31,8 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestURI = request.getRequestURI();
+        String remoteHost = request.getRemoteHost();
+        System.out.println("remoteHost: " + remoteHost);
 //        //根据uri确认是否要拦截
 //        if (!shouldFilter(requestURI)){
 //            return true;

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

@@ -38,5 +38,4 @@ public class TempLoginController extends BaseController {
         return authService.getLoginInfo(randomLoginCode);
     }
 
-    // test
 }

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

@@ -88,7 +88,7 @@ public class AuthServiceImpl implements AuthService {
         }
         //数据库查询用户信息
         UserAccountVO userAccountVO = userAccountService.getUserAccountInfoByUnionId(unionId);
-        String uid = userAccountVO.getUid();
+        String uid;
         if (userAccountVO == null) {
             UserAccountDO userAccountDO = new UserAccountDO();
             userAccountDO.setUnionId(unionId);
@@ -100,6 +100,8 @@ public class AuthServiceImpl implements AuthService {
             userAccountDO.setSource(wxLoginVO.getSource());
             userAccountService.insertUserAccount(userAccountDO);
             userAccountVO = userAccountDO.buildUserAccountVO();
+        }else {
+            uid = userAccountVO.getUid();
         }
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(JwtConstant.USER_ACCOUNT_ID, userAccountVO.getId());

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -6,9 +6,9 @@ data-filter:
     - /userapp/doc.html
     - /userapp/swagger-resources/**
     - /userapp/webjars/**
-    - /userapp/auth/testAppletLogin
     - /userapp/auth/backEndLogin
     - /userapp/auth/testAppletLogin
+    - /userapp/auth/appletLogin
     - /userapp/cooperation/listTag
     - /userapp/temp-auth/getLoginInfo
     - /userapp/wx/getAppletQRCode

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 9c8b081014a6dc23abc91032b0c093202bfa69bb
+  newTag: 3c361661bdb07ff498ea942e250c47b212509789