From 1e4982622a91904b16d92ac98f77baaccdb2162d Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 26 Apr 2024 19:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9i=E6=B7=B1=E5=9C=B3=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/EmergencyService/pom.xml | 10 ++++---- .../java/com/zdxt/auth/feign/UserApiImpl.java | 2 +- .../code/controller/ThirdLoginController.java | 24 +++++++++++++++++-- .../service/impl/ThirdLoginServiceImpl.java | 6 +++-- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/lib/EmergencyService/pom.xml b/lib/EmergencyService/pom.xml index b4c86eba..bd2bc2f5 100644 --- a/lib/EmergencyService/pom.xml +++ b/lib/EmergencyService/pom.xml @@ -338,11 +338,11 @@ EmergencyCommonmDatascope 1.0.0 - - EmergencyBaseLib - EmergencyCommonEntity - 1.0.0 - + + + + + diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java index 9704ec92..4d937c4d 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java @@ -47,7 +47,7 @@ public class UserApiImpl implements UserApi { @Override public UserBean getCurrentUser() { User sysUser = ShiroUtils.getSysUser(); - if (null == sysUser) return null; + if (null == sysUser) { return null; } UserBean userBean = new UserBean(); userBean.setDeptId(sysUser.getDeptId()); userBean.setEmail(sysUser.getEmail()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ThirdLoginController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ThirdLoginController.java index 482eda15..e281dd71 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ThirdLoginController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ThirdLoginController.java @@ -1,12 +1,18 @@ package com.zdxt.code.controller; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.UserApi; import com.zdxt.code.domain.SiqLogin; import com.zdxt.code.service.ThirdLoginService; import com.zdxt.code.utils.HttpUtil; import com.zdxt.code.utils.IdCardCryptoUtil; import com.zdxt.common.ZDResponse; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -39,6 +45,8 @@ public class ThirdLoginController { @Autowired private ThirdLoginService thirdLoginService; + @Autowired + private UserApi userApi; /** * 深i企用户登录 * @param siqLogin @@ -46,6 +54,20 @@ public class ThirdLoginController { @PostMapping("/siqLogin") @ResponseBody public ZDResponse siqLogin(@RequestBody SiqLogin siqLogin){ +// try { +// //查询登录用户 +// UserBean user = userApi.getUserByUserLoginName("3ab349ca"); +// //本系统令牌 +// UsernamePasswordToken sysToken = new UsernamePasswordToken(user.getLoginName(), user.getPassword(), false); +// Subject subject = SecurityUtils.getSubject(); +// subject.login(sysToken); +// return ZDResponse.success("登录成功",user); +// } catch (Exception e) { +// e.printStackTrace(); +// } + + + //敏感信息加密 String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getUserId()); String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getUserName()); @@ -64,12 +86,10 @@ public class ThirdLoginController { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(userInfo); - log.info("用户信息：{}",jsonObject.toJSONString()); //添加深i企用户 thirdLoginService.addSiqUser(jsonObject); //添加深i企用户关联企业信息 thirdLoginService.addSiqUserCompany(jsonObject); - return thirdLoginService.siqLogin(jsonObject); } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java index d65564c4..dacc2e6d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java @@ -1,5 +1,6 @@ package com.zdxt.code.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; @@ -47,10 +48,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { @Override public ZDResponse siqLogin(JSONObject jsonObject) { - try { //查询登录用户 - UserBean user = userApi.getUserByUserLoginName(jsonObject.getString("account")); + JSONObject tmpObj = JSON.parseObject(jsonObject.getString("data")); + log.info("用户名：{}",tmpObj.getString("account")); + UserBean user = userApi.getUserByUserLoginName(tmpObj.getString("account")); //本系统令牌 UsernamePasswordToken sysToken = new UsernamePasswordToken(user.getLoginName(), user.getPassword(), false); Subject subject = SecurityUtils.getSubject();