From cf41feda29d80483912ac467ef8cc99058ec1a37 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 27 Aug 2024 20:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=99=BB=E5=90=8D=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E7=94=A8=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zdxt/auth/feign/UserApiImpl.java |  8 +++++++
 .../system/user/mapper/UserMapper.java        |  1 +
 .../resources/mapper/system/UserMapper.xml    |  6 +++++
 .../service/impl/ThirdLoginServiceImpl.java   | 22 ++++++++++++++++---
 .../java/com/zdxt/auth/feign/UserApi.java     |  1 +
 5 files changed, 35 insertions(+), 3 deletions(-)

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 cc62ca35..dd264abc 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
@@ -166,6 +166,14 @@ public class UserApiImpl implements UserApi {
         return userBean;
     }
 
+    @Override
+    public UserBean getUserByUserPhone(String phone) {
+        User user = userMapper.selectUserByUserPhone(phone);
+        UserBean userBean = new UserBean();
+        BeanUtil.copyProperties(user, userBean);
+        return userBean;
+    }
+
     /*@Override
     public List<UserBean> getUserListByNoPermission(UserBean userBean) {
         User user=new User();
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
index 61a0a19a..9fb6700c 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
@@ -61,6 +61,7 @@ public interface UserMapper
      * @return 用户对象信息
      */
     public User selectUserByLoginName(String userName);
+    public User selectUserByUserPhone(String phone);
 
     /**
      * 通过手机号码查询用户
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
index 44ee970a..192438a9 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -259,6 +259,12 @@
         and u.del_flag = 0
     </select>
 
+    <select id="selectUserByUserPhone" parameterType="String" resultMap="UserResult">
+        <include refid="selectUserVo"/>
+        where u.phonenumber = #{phone}
+        and u.del_flag = 0
+    </select>
+
     <select id="selectUserByPhoneNumber" parameterType="String" resultMap="UserResult">
         <include refid="selectUserVo"/>
         where u.phonenumber = #{phonenumber}
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 7f4c57a3..5ee21197 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
@@ -19,6 +19,7 @@ import com.zdxt.code.utils.ServiceInvocation;
 import com.zdxt.common.util.IdCardCryptoUtil;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.UserConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@@ -67,12 +68,27 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     @Override
     public ZDResponse siqLogin(JSONObject jsonObject) {
         try {
+            UserBean user = null;
             //查询登录用户
-            log.info("用户名：{}",jsonObject.getString("account"));
-            UserBean user = userApi.getUserByUserLoginName(jsonObject.getString("account"));
+            if (StringUtils.isNotEmpty(jsonObject.getString("account"))) {
+                log.info("用户名：{}",jsonObject.getString("account"));
+                user = userApi.getUserByUserLoginName(jsonObject.getString("account"));
+            }
+            if (null == user || StringUtils.isEmpty(user.getLoginName())) {
+                // 电话号码解密并获取用户
+                String phone = IdCardCryptoUtil.symmetricDecryptIdCard(srzSecretKey, jsonObject.getString("phone"));
+                log.info("电话号码：{}",phone);
+                user = userApi.getUserByUserPhone(phone);
+            }
             //本系统令牌
 //            UsernamePasswordToken sysToken = new UsernamePasswordToken(user.getLoginName(), user.getPassword(), false);
-            UserToken sysToken = new UserToken(user.getLoginName(), LoginType.NOPASSWD);
+            UserToken sysToken = null;
+            if (null != user && StringUtils.isEmpty(user.getLoginName())) {
+                sysToken = new UserToken(user.getLoginName(), LoginType.NOPASSWD);
+            }
+            if (null != user || StringUtils.isEmpty(user.getPhonenumber())) {
+                sysToken = new UserToken(user.getPhonenumber(), LoginType.NOPASSWD);
+            }
             Subject subject = SecurityUtils.getSubject();
             subject.login(sysToken);
             user.setEnterpriseNumber(jsonObject.getString("corpCid"));
diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/UserApi.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/UserApi.java
index 60fe6c41..7c3390df 100644
--- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/UserApi.java
+++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/UserApi.java
@@ -43,6 +43,7 @@ public interface UserApi {
     @GetMapping("/getUserByLoginName")
     @ApiOperation("获取用户管理信息列表")
     public UserBean getUserByUserLoginName(String loginName);
+    public UserBean getUserByUserPhone(String phone);
 
     @GetMapping("/selectUserByName")
     @ApiOperation("获取用户管理信息列表")