修改i深圳登录

lib/EmergencyService/pom.xml

@@ -338,11 +338,11 @@
             <artifactId>EmergencyCommonmDatascope</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>EmergencyBaseLib</groupId>
-            <artifactId>EmergencyCommonEntity</artifactId>
-            <version>1.0.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>EmergencyBaseLib</groupId>-->
+<!--            <artifactId>EmergencyCommonEntity</artifactId>-->
+<!--            <version>1.0.0</version>-->
+<!--        </dependency>-->
         <!-- 分布式定时任务组件 -->
         <!-- 分布式文件存储组件 -->
         <dependency>

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());

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);
     }
 }

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();