企业端token问题修复

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -235,6 +235,10 @@ public class AppThirdLoginController {
         Long userId = thirdLoginService.addSiqUser(userInfo);
         userInfo.put("userId", userId);
 
+        log.info("================= siqLogin addSiqUser -> userId =================");
+        log.info(userId.toString());
+        log.info("================= siqLogin addSiqUser -> userId =================");
+
         //添加深i企用户关联企业信息
         thirdLoginService.addSiqUserCompany(userInfo);
         return thirdLoginService.siqLogin(userInfo);
@@ -246,10 +250,10 @@ public class AppThirdLoginController {
         String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getUserId());
         String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getUserName());
 
-        log.info("================= siqLogin =================");
+        log.info("================= siqLoginTest =================");
         log.info(userIdCode);
         log.info(userNameCode);
-        log.info("================= siqLogin =================");
+        log.info("================= siqLoginTest =================");
 
         Map<String,Object> heardMap = new HashMap<>();
         heardMap.put("x-auth-channel", IdUtil.simpleUUID());
@@ -264,11 +268,20 @@ public class AppThirdLoginController {
 
         JSONObject jsonObject = JSONObject.parseObject(data);
         JSONObject userInfo = (JSONObject) jsonObject.get("data");
+
+        log.info("================= userInfo =================");
+        log.info(jsonObject.getString("data"));
+        log.info(userInfo.toJSONString());
+        log.info("================= userInfo =================");
         //添加深i企用户
 
         Long userId = thirdLoginService.addSiqUser(userInfo);
         userInfo.put("userId", userId);
 
+        log.info("================= siqLogin addSiqUser -> userId =================");
+        log.info(userId.toString());
+        log.info("================= siqLogin addSiqUser -> userId =================");
+
         //添加深i企用户关联企业信息
         thirdLoginService.addSiqUserCompany(userInfo);
         return thirdLoginService.siqLogin(userInfo);

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java

@@ -66,6 +66,8 @@ public class ResourcesConfig implements WebMvcConfigurer
         registry.addInterceptor(new JWTInterceptor())
                 .addPathPatterns("/app/**")
                 .excludePathPatterns("/app/thirdLogin/siqLogin","/app/thirdLogin/siqLoginTest",
+                        "/app/thirdLogin/getSiqCode",
+                        "/common/upload",
                         "/app/thirdLogin/szyptLogin/**",
                         "/captcha/captchaImage/**",
                         "/appLogin","/login","/index",

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/jwt/JWTInterceptor.java

@@ -23,6 +23,9 @@ public class JWTInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 
+        String method = request.getMethod();
+        if ("OPTIONS".equals(method)) { return true; }
+
         String token = request.getHeader("token");
         Map<String, Object> map = new HashMap<>();
 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

@@ -208,7 +208,7 @@ security:
 
 
 allowed:
-  servernames: 10.76.108.1,10.76.108.3,10.132.108.3,139.186.135.156,jdm.szssfj.cn,58.250.157.161,192.168.31.146,localhost,10.76.108.25
+  servernames: 10.76.108.1,10.76.108.3,10.132.108.3,139.186.135.156,jdm.szssfj.cn,58.250.157.161,127.0.0.1
 
 excel:
   export: true

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@@ -72,6 +72,11 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
     public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint)
     {
         UserBean user = userApi.getUserByUserId(enterpriseComplaint.getUserId());
+        System.out.println("========================");
+        System.out.println("enterpriseComplaint.getUserId : "+ enterpriseComplaint.getUserId());
+        System.out.println("user.getUserId : " + user.getUserId());
+        System.out.println("user.getUserName : " + user.getUserName());
+        System.out.println("========================");
         enterpriseComplaint.setCreateTime(DateUtils.getNowDate());
         enterpriseComplaint.setId(IdUtil.simpleUUID());
         int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);