Browse Source

第三方登录

hym 4 years ago
parent
commit
b5098d3a8e

+ 2 - 0
user_auth/src/main/java/com/huaxu/dao/UserMapper.java

@@ -110,4 +110,6 @@ public interface UserMapper {
     String getUniqueUserID(Integer id);
     String getUniqueUserID(Integer id);
 
 
     String getAppSecret(String appId);
     String getAppSecret(String appId);
+
+    void updateUniqueUserID(@Param("id")Integer id, @Param("uid") String uid);
 }
 }

+ 1 - 0
user_auth/src/main/java/com/huaxu/entity/User.java

@@ -102,5 +102,6 @@ public class User implements Serializable {
     private Integer roleState;
     private Integer roleState;
     private Integer tenantState;
     private Integer tenantState;
     private String iotPhoneNumber;
     private String iotPhoneNumber;
+    private String customerId;
 
 
 }
 }

+ 4 - 0
user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -204,6 +204,10 @@ public class UserServiceImpl implements UserService {
         Integer id = currentUser.getId();
         Integer id = currentUser.getId();
         String appSecret=userMapper.getAppSecret(appId);
         String appSecret=userMapper.getAppSecret(appId);
         String uniqueUserID=userMapper.getUniqueUserID(id);
         String uniqueUserID=userMapper.getUniqueUserID(id);
+        if(uniqueUserID==null){
+            uniqueUserID=UUID.randomUUID().toString();
+            userMapper.updateUniqueUserID(id,uniqueUserID);
+        }
         Random random = new Random();
         Random random = new Random();
         String code="";
         String code="";
 
 

+ 6 - 3
user_auth/src/main/resources/mapper/UserMapper.xml

@@ -52,7 +52,7 @@
     <select id="selectList" resultMap="UserMap">
     <select id="selectList" resultMap="UserMap">
         select
         select
        b.TENANT_STATE, a.*, b.LOGO,b.WEB_URL ,c.ORG_STATE companyOrgState,d.ORG_STATE departmentOrgState,
        b.TENANT_STATE, a.*, b.LOGO,b.WEB_URL ,c.ORG_STATE companyOrgState,d.ORG_STATE departmentOrgState,
-       b.iot_phone_number from uims_user a join uims_tenant b on a.TENANT_ID=b.CODE
+       b.iot_phone_number,b.customer_id from uims_user a join uims_tenant b on a.TENANT_ID=b.CODE
         join uims_org c on a.COMPANY_ORG_ID=c.id left join
         join uims_org c on a.COMPANY_ORG_ID=c.id left join
         uims_org d on a.DEPT_ORG_ID=d.ID
         uims_org d on a.DEPT_ORG_ID=d.ID
         <where>
         <where>
@@ -333,9 +333,12 @@
         order by b.MENU_SEQ
         order by b.MENU_SEQ
     </select>
     </select>
     <select id="getAppSecret" resultType="string">
     <select id="getAppSecret" resultType="string">
-        select APP_SECRET_KEY from uims.uims_app where APP_ID=#{appId}
+        select APP_SECRET_KEY from uims_app where APP_ID=#{appId}
     </select>
     </select>
     <select id="getUniqueUserID" resultType="string">
     <select id="getUniqueUserID" resultType="string">
-        select uniq_id from uims.uims_user where id=#{id}
+        select uniq_id from uims_user where id=#{id}
     </select>
     </select>
+    <update id="updateUniqueUserID">
+        update uims_user set uniq_id=#{uid} where id=#{id}
+    </update>
 </mapper>
 </mapper>