From 948f4a64496922ee3c4f5ff905176477e5c2a065 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 21 Jun 2024 11:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AFtoken=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppThirdLoginController.java | 17 +++++++++++++++-- .../auth/framework/config/ResourcesConfig.java | 2 ++ .../framework/shiro/jwt/JWTInterceptor.java | 3 +++ .../src/main/resources/application.yml | 2 +- .../impl/EnterpriseComplaintServiceImpl.java | 5 +++++ 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index 5fcea426..a3169792 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/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 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); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java index 303bee90..a42cd2f1 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java +++ b/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", diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/jwt/JWTInterceptor.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/jwt/JWTInterceptor.java index 1076f047..3c08a543 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/jwt/JWTInterceptor.java +++ b/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 map = new HashMap<>(); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml index f77c1a6c..42e8bc3b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml +++ b/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 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index fe5fa3e9..15571eba 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/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);