钉钉同步后，自动绑定

maxkey-core/src/main/java/org/maxkey/entity/SocialsAssociate.java

@@ -0,0 +1,149 @@
+package org.maxkey.entity;
+
+import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "MXK_SOCIALS_ASSOCIATE")
+public class SocialsAssociate extends JpaBaseEntity implements Serializable
+{
+
+    @Id
+    @Column
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
+    private String id;
+
+    @Column
+    private String provider;
+
+    @Column
+    private String userId;
+
+    @Column
+    private String username;
+
+    @Column
+    private String socialUserId;
+
+    @Column
+    private String socialUserInfo;
+
+    @Column
+    private String accessToken;
+
+    @Column
+    private String exAttribute;
+
+    @Column
+    private String createdDate;
+
+    @Column
+    private String updatedDate;
+
+    public SocialsAssociate()
+    {
+
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getProvider()
+    {
+        return provider;
+    }
+
+    public void setProvider(String provider)
+    {
+        this.provider = provider;
+    }
+
+    public String getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(String userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getSocialUserId()
+    {
+        return socialUserId;
+    }
+
+    public void setSocialUserId(String socialUserId)
+    {
+        this.socialUserId = socialUserId;
+    }
+
+    public String getSocialUserInfo()
+    {
+        return socialUserInfo;
+    }
+
+    public void setSocialUserInfo(String socialUserInfo)
+    {
+        this.socialUserInfo = socialUserInfo;
+    }
+
+    public String getAccessToken()
+    {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken)
+    {
+        this.accessToken = accessToken;
+    }
+
+    public String getExAttribute()
+    {
+        return exAttribute;
+    }
+
+    public void setExAttribute(String exAttribute)
+    {
+        this.exAttribute = exAttribute;
+    }
+
+    public String getCreatedDate()
+    {
+        return createdDate;
+    }
+
+    public void setCreatedDate(String createdDate)
+    {
+        this.createdDate = createdDate;
+    }
+
+    public String getUpdatedDate()
+    {
+        return updatedDate;
+    }
+
+    public void setUpdatedDate(String updatedDate)
+    {
+        this.updatedDate = updatedDate;
+    }
+}

maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java

@@ -20,8 +20,10 @@ package org.maxkey.synchronizer.dingding;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.maxkey.constants.ConstantsPasswordSetType;
+import org.maxkey.entity.SocialsAssociate;
 import org.maxkey.entity.Synchronizers;
 import org.maxkey.entity.UserInfo;
+import org.maxkey.persistence.service.SocialsAssociateService;
 import org.maxkey.persistence.service.UserInfoService;
 import org.maxkey.synchronizer.ISynchronizerService;
 import org.slf4j.Logger;
@@ -47,6 +49,10 @@ public class DingdingUsersService implements ISynchronizerService
     @Autowired
     UserInfoService userInfoService;
 
+    @Autowired
+    SocialsAssociateService socialsAssociateService;
+
+
     String access_token;
 
     public void sync()
@@ -85,9 +91,18 @@ public class DingdingUsersService implements ISynchronizerService
                         if (loadUser != null)
                         {
                             userInfoService.update(userInfo);
+
                         } else
                         {
                             userInfoService.insert(userInfo);
+                            //绑定用户
+                            SocialsAssociate socialsAssociate = new SocialsAssociate();
+                            socialsAssociate.setProvider("dingtalk");
+                            socialsAssociate.setSocialUserId(user.getUnionid());
+                            socialsAssociate.setUserId(userInfo.getId());
+                            socialsAssociate.setUsername(userInfo.getUsername());
+                            socialsAssociateService.merge(socialsAssociate);
+                            _logger.info("bind user  " + socialsAssociate);
                         }
                         _logger.info("userInfo " + userInfo);
                     }
@@ -110,8 +125,8 @@ public class DingdingUsersService implements ISynchronizerService
     public UserInfo buildUserInfo(ListUserResponse user)
     {
         UserInfo userInfo = new UserInfo();
-
-        userInfo.setUsername(user.getUserid());//鐧诲綍鍚�
+        // 手机号 作为用户名
+        userInfo.setUsername(user.getMobile());//鐧诲綍鍚�
         userInfo.setNickName(user.getName());//鐢ㄦ埛鍚�
         userInfo.setDisplayName(user.getName());//鐢ㄦ埛鍚�
         userInfo.setFormattedName(user.getName());//鐢ㄦ埛鍚�

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/SocialsAssociateMapper.java

@@ -0,0 +1,9 @@
+package org.maxkey.persistence.mapper;
+
+
+import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
+import org.maxkey.entity.SocialsAssociate;
+
+public interface SocialsAssociateMapper extends IJpaBaseMapper<SocialsAssociate>
+{
+}

maxkey-persistence/src/main/java/org/maxkey/persistence/service/SocialsAssociateService.java

@@ -0,0 +1,27 @@
+package org.maxkey.persistence.service;
+
+import org.apache.mybatis.jpa.persistence.JpaBaseService;
+import org.maxkey.entity.SocialsAssociate;
+import org.maxkey.persistence.mapper.SocialsAssociateMapper;
+import org.maxkey.persistence.mapper.SocialsProviderMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class SocialsAssociateService  extends JpaBaseService<SocialsAssociate>
+{
+    final static Logger _logger = LoggerFactory.getLogger(SocialsAssociateService.class);
+
+    /* (non-Javadoc)
+     * @see com.connsec.db.service.BaseService#getMapper()
+     */
+    public SocialsAssociateService() {
+        super(SocialsAssociateMapper.class);
+    }
+
+    @Override
+    public SocialsAssociateMapper getMapper() {
+        return (SocialsAssociateMapper)super.getMapper();
+    }
+}

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/highgo/SocialsAssociateMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.maxkey.persistence.mapper.SocialsAssociateMapper">
+	
+
+</mapper>

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/SocialsAssociateMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.maxkey.persistence.mapper.SocialsAssociateMapper">
+	
+
+</mapper>

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/postgresql/SocialsAssociateMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.maxkey.persistence.mapper.SocialsAssociateMapper">
+	
+
+</mapper>

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/SocialsAssociateServiceTest.java

@@ -0,0 +1,36 @@
+package org.apache.mybatis.jpa.test;
+
+import org.apache.mybatis.jpa.util.WebContext;
+import org.junit.Test;
+import org.maxkey.entity.Accounts;
+import org.maxkey.entity.SocialsAssociate;
+import org.maxkey.entity.SocialsProvider;
+import org.maxkey.persistence.service.AccountsService;
+import org.maxkey.persistence.service.SocialsAssociateService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+public class SocialsAssociateServiceTest
+{
+    private static final Logger _logger = LoggerFactory.getLogger(SocialsAssociateServiceTest.class);
+
+    public static ApplicationContext context;
+
+    public static SocialsAssociateService service;
+
+    public SocialsAssociateService getservice()
+    {
+        service = (SocialsAssociateService) WebContext.getBean("socialsAssociateService");
+        return service;
+    }
+
+    @Test
+    public void get() throws Exception{
+        _logger.info("get...");
+        SocialsAssociate accounts= service.get("626019447567548416");
+
+        _logger.info("accounts "+accounts);
+
+    }
+}

maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ThirdLoginController.java

@@ -200,8 +200,10 @@ public class ThirdLoginController
     public List<HashMap<String, Object>> organizationsTree(HttpServletRequest request, @RequestParam(value = "id", required = false) String id)
     {
         String authorization = request.getHeader("Authorization");
+        String user = request.getHeader("user");
         _logger.debug("authorization id :" + authorization);
         _logger.debug("organizationsTree id :" + id);
+        _logger.debug("user :" + user);
         Organizations queryOrg = new Organizations();
         List<Organizations> organizationsList = this.organizationsService.queryOrgs(queryOrg);
         TreeNodeList treeNodeList = new TreeNodeList();