钉钉

smart-steward-api/src/main/java/com/smartSteward/web/controller/common/CaptchaController.java

@@ -82,7 +82,9 @@ public class CaptchaController
         FastByteArrayOutputStream os = new FastByteArrayOutputStream();
         try
         {
-            ImageIO.write(image, "jpg", os);
+            if (image != null) {
+                ImageIO.write(image, "jpg", os);
+            }
         }
         catch (IOException e)
         {

smart-steward-api/src/main/java/com/smartSteward/web/controller/dingTalk/DingTalkCallbackController.java

@@ -1,13 +1,21 @@
 package com.smartSteward.web.controller.dingTalk;
 
+import com.smartSteward.common.annotation.Anonymous;
 import com.smartSteward.common.config.smartStewardConfig;
+import com.smartSteward.common.constant.Constants;
+import com.smartSteward.common.core.AjaxResult;
 import com.smartSteward.common.utils.StringUtils;
 import com.smartSteward.common.utils.file.FileUtils;
+import com.smartSteward.service.dingTalk.IDingTalkService;
+import com.smartSteward.web.controller.BaseController;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 钉钉回调事件接口
@@ -16,8 +24,9 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @RequestMapping("/dingTalk")
-public class DingTalkCallbackController {
-
+public class DingTalkCallbackController extends BaseController {
+    @Autowired
+    private IDingTalkService dingTalkService;
     /**
      * 通用下载请求
      *
@@ -27,13 +36,36 @@ public class DingTalkCallbackController {
      * @param requestBody 数据包数据中的加密数据
      */
     @PostMapping("/receive")
-    public void receive( @RequestParam("signature") String signature,
+    @Anonymous
+    public AjaxResult receive( @RequestParam("signature") String signature,
                               @RequestParam("timestamp") String timestamp,
                               @RequestParam("nonce") String nonce,
                               @RequestBody String requestBody)
     {
 
-
-
+        //异步处理事件订阅
+        CompletableFuture.supplyAsync(() -> dingTalkService.
+                receive(signature,timestamp,nonce,requestBody)).
+                thenAccept(result -> System.out.println("Result: " + result));
+        return success();
+    }
+    /**
+     * 同步钉钉数据
+     *
+     */
+    @PostMapping("/synchronize")
+    @Anonymous
+    public AjaxResult synchronize( )
+    {
+        //异步处理事件订阅
+       CompletableFuture.supplyAsync(() -> {
+           try {
+               dingTalkService. synchronize();
+           } catch (Exception e) {
+               throw new RuntimeException(e);
+           }
+           return null;
+    }).thenAccept(result -> System.out.println("Result: " + result));
+        return success();
     }
 }

smart-steward-api/src/main/java/com/smartSteward/web/controller/system/SysLoginController.java

@@ -3,8 +3,6 @@ package com.smartSteward.web.controller.system;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-
-import com.smartSteward.service.dingTalk.IDingTalkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

smart-steward-api/src/main/java/com/smartSteward/web/core/config/SwaggerConfig.java

@@ -2,6 +2,8 @@ package com.smartSteward.web.core.config;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

smart-steward-api/src/main/resources/application-dev.yml

@@ -47,7 +47,7 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
+                login-username: smartSteward
                 login-password: 123456
             filter:
                 stat:
@@ -82,15 +82,28 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
     dingTalk:
-        # 钥匙
-        app_key: ding77tk1okpuoxhitxs
-        # 密钥
-        app_secret: lrV9pt51pjxUY00qCkPdoZ-393can29IujDFdlR9SZnechH_pSG1Tl1maWocWrDB
-
+        # 钉钉应用Key
+        app_key: ding0na3clg9jd7svbxm
+        # 钉钉应用密钥
+        app_secret: WE90y569RWtS4NZy7bS2ZniX2zXv2udwwkZ487eBVZynWZ9hwLycpHM-GO9mosxr
+        # 加密密钥
+        aes_kes: 43fafsarvvIvxKpQOh8b8MzhSqc4SmOlSgmBjevlcba
+        # 回调Token
+        token: 9uX6tAw5GRUQsH8DoNQTxhC
+        # 企业ID
+        corpId : ding3d771cecb9f68bfe35c2f4657eb6378f
     # Swagger配置
     swagger:
         # 是否开启swagger
         enabled: true
         # 请求前缀
         pathMapping: /dev-api
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.smartSteward.**.database.*
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-dev-config.xml
 

smart-steward-api/src/main/resources/application-production.yml

@@ -47,7 +47,7 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
+                login-username: smartSteward
                 login-password: 123456
             filter:
                 stat:
@@ -82,14 +82,28 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
     dingTalk:
-        # 钥匙
-        app_key: ding77tk1okpuoxhitxs
-        # 密钥
-        app_secret: lrV9pt51pjxUY00qCkPdoZ-393can29IujDFdlR9SZnechH_pSG1Tl1maWocWrDB
+        # 钉钉应用Key
+        app_key: ding0na3clg9jd7svbxm
+        # 钉钉应用密钥
+        app_secret: WE90y569RWtS4NZy7bS2ZniX2zXv2udwwkZ487eBVZynWZ9hwLycpHM-GO9mosxr
+        # 加密密钥
+        aes_kes: 43fafsarvvIvxKpQOh8b8MzhSqc4SmOlSgmBjevlcba
+        # 回调Token
+        token: 9uX6tAw5GRUQsH8DoNQTxhC
+        # 企业ID
+        corpId: ding3d771cecb9f68bfe35c2f4657eb6378f
 
     # Swagger配置
     swagger:
         # 是否开启swagger
         enabled: false
         # 请求前缀
-        pathMapping: /dev-api
+        pathMapping: /dev-api
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.smartSteward.**.database.*
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-production-config.xml

smart-steward-api/src/main/resources/application.yml

@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.smart-steward: debug
     org.springframework: warn
 
 # 用户配置
@@ -53,6 +53,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: dev
+    #active: production
   # 文件上传
   servlet:
     multipart:
@@ -77,14 +78,7 @@ token:
   # 令牌有效期（默认30分钟）
   expireTime: 30
 
-# MyBatis配置
-mybatis:
-  # 搜索指定包别名
-  typeAliasesPackage: com.smartSteward.**.database.*
-  # 配置mapper的扫描，找到所有的mapper.xml映射文件
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  # 加载全局的配置文件
-  configLocation: classpath:mybatis/mybatis-config.xml
+
 
 # PageHelper分页插件
 pagehelper:

smart-steward-api/src/main/resources/mybatis/mybatis-config.xml

@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
         <setting name="logImpl"                  value="SLF4J"  />
         <!-- 使用驼峰命名法转换字段 -->
 		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+        <!-- mybatis日志 -->
+        <setting name="logImpl" value="STDOUT_LOGGING"/>
 	</settings>
 	
 </configuration>

smart-steward-api/src/main/resources/mybatis/mybatis-production-config.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <!-- 全局参数 -->
+    <settings>
+        <!-- 使全局的映射器启用或禁用缓存 -->
+        <setting name="cacheEnabled"             value="true"   />
+        <!-- 允许JDBC 支持自动生成主键 -->
+        <setting name="useGeneratedKeys"         value="true"   />
+        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
+        <setting name="defaultExecutorType"      value="SIMPLE" />
+		<!-- 指定 MyBatis 所用日志的具体实现 -->
+        <setting name="logImpl"                  value="SLF4J"  />
+        <!-- 使用驼峰命名法转换字段 -->
+		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+        <!-- mybatis日志 -->
+        <!--<setting name="logImpl" value="STDOUT_LOGGING"/> -->
+	</settings>
+	
+</configuration>

smart-steward-common/src/main/java/com/smartSteward/common/core/database/system/SysDept.java

@@ -53,6 +53,10 @@ public class SysDept extends BaseEntity
 
     /** 父部门名称 */
     private String parentName;
+    /** 钉钉部门id */
+    private String dingDeptId;
+    /** 钉钉父级部门id */
+    private String dingParentId;
     
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
@@ -173,6 +177,29 @@ public class SysDept extends BaseEntity
         this.parentName = parentName;
     }
 
+
+    public String getDingDeptId()
+    {
+        return dingDeptId;
+    }
+
+    public void setDingDeptId(String dingDeptId)
+    {
+        this.dingDeptId = dingDeptId;
+    }
+
+    public String getDingParentId()
+    {
+        return dingParentId;
+    }
+
+    public void setDingParentId(String dingParentId)
+    {
+        this.dingParentId = dingParentId;
+    }
+
+
+
     public List<SysDept> getChildren()
     {
         return children;
@@ -200,6 +227,8 @@ public class SysDept extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("dingDeptId", getDingDeptId())
+            .append("dingParentId", getDingParentId())
             .toString();
     }
 }

smart-steward-common/src/main/java/com/smartSteward/common/core/database/system/SysUser.java

@@ -93,6 +93,10 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    /** 钉钉用户userId */
+    private String dingUserId;
+
+
     public SysUser()
     {
 
@@ -311,6 +315,17 @@ public class SysUser extends BaseEntity
         this.roleId = roleId;
     }
 
+
+    public String getDingUserId()
+    {
+        return dingUserId;
+    }
+
+    public void setDingUserId(String dingUserId)
+    {
+        this.dingUserId = dingUserId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -334,6 +349,7 @@ public class SysUser extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("dept", getDept())
+            .append("dingUserId", getDingUserId())
             .toString();
     }
 }

smart-steward-common/src/main/java/com/smartSteward/common/utils/dingTalk/DingTalkEncryptException.java

@@ -0,0 +1,54 @@
+package com.smartSteward.common.utils.dingTalk;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 加解密异常类
+ * @author smart_Steward
+ */
+public class DingTalkEncryptException extends Exception {
+    /**成功**/
+    public static final int SUCCESS = 0;
+    /**加密明文文本非法**/
+    public final static int  ENCRYPTION_PLAINTEXT_ILLEGAL = 900001;
+    /**加密时间戳参数非法**/
+    public final static int  ENCRYPTION_TIMESTAMP_ILLEGAL = 900002;
+    /**加密随机字符串参数非法**/
+    public final static int  ENCRYPTION_NONCE_ILLEGAL = 900003;
+    /**不合法的aeskey**/
+    public final static int AES_KEY_ILLEGAL = 900004;
+    /**签名不匹配**/
+    public final static int SIGNATURE_NOT_MATCH = 900005;
+    /**计算签名错误**/
+    public final static int COMPUTE_SIGNATURE_ERROR = 900006;
+    /**计算加密文字错误**/
+    public final static int COMPUTE_ENCRYPT_TEXT_ERROR  = 900007;
+    /**计算解密文字错误**/
+    public final static int COMPUTE_DECRYPT_TEXT_ERROR  = 900008;
+    /**计算解密文字长度不匹配**/
+    public final static int COMPUTE_DECRYPT_TEXT_LENGTH_ERROR  = 900009;
+    /**计算解密文字suiteKey(ISV)或者corpid(普通企业)不匹配**/
+    public final static int COMPUTE_DECRYPT_TEXT_CORPID_ERROR  = 900010;
+
+    private static final Map<Integer,String> MSG_MAP = new HashMap<Integer,String>();
+    static{
+        MSG_MAP.put(SUCCESS,"成功");
+        MSG_MAP.put(ENCRYPTION_PLAINTEXT_ILLEGAL,"加密明文文本非法");
+        MSG_MAP.put(ENCRYPTION_TIMESTAMP_ILLEGAL,"加密时间戳参数非法");
+        MSG_MAP.put(ENCRYPTION_NONCE_ILLEGAL,"加密随机字符串参数非法");
+        MSG_MAP.put(SIGNATURE_NOT_MATCH,"签名不匹配");
+        MSG_MAP.put(COMPUTE_SIGNATURE_ERROR,"签名计算失败");
+        MSG_MAP.put(AES_KEY_ILLEGAL,"不合法的aes key");
+        MSG_MAP.put(COMPUTE_ENCRYPT_TEXT_ERROR,"计算加密文字错误");
+        MSG_MAP.put(COMPUTE_DECRYPT_TEXT_ERROR,"计算解密文字错误");
+        MSG_MAP.put(COMPUTE_DECRYPT_TEXT_LENGTH_ERROR,"计算解密文字长度不匹配");
+        MSG_MAP.put(COMPUTE_DECRYPT_TEXT_CORPID_ERROR,"计算解密文字suiteKey(ISV)或者corpid(普通企业)不匹配");
+    }
+
+    public Integer  code;
+    public DingTalkEncryptException(Integer exceptionCode){
+        super(MSG_MAP.get(exceptionCode));
+        this.code = exceptionCode;
+    }
+}

smart-steward-common/src/main/java/com/smartSteward/common/utils/dingTalk/DingTalkEncryptor.java

@@ -0,0 +1,207 @@
+package com.smartSteward.common.utils.dingTalk;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.*;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.apache.commons.codec.binary.Base64;
+
+
+/**
+ * @author smart_Steward
+ */
+public class DingTalkEncryptor {
+
+    private static final Charset CHARSET = StandardCharsets.UTF_8;
+    private static final Base64 BASE64 = new Base64();
+    private final byte[] aesKey;
+    private final String token;
+    private final String corpId;
+    /**
+     * ask getPaddingBytes key固定长度
+     **/
+    private static final Integer AES_ENCODE_KEY_LENGTH = 43;
+    /**
+     * 加密随机字符串字节长度
+     **/
+    private static final Integer RANDOM_LENGTH = 16;
+
+    /**
+     * 构造函数
+     *
+     * @param token          钉钉开放平台上，开发者设置的token
+     * @param encodingAesKey 钉钉开放台上，开发者设置的EncodingAESKey
+     * @param corpId         ISV进行配置的时候应该传对应套件的SUITE_KEY(第一次创建时传的是默认的CREATE_SUITE_KEY)，普通企业是Corpid
+     */
+    public DingTalkEncryptor(String token, String encodingAesKey, String corpId) throws DingTalkEncryptException {
+        if (null == encodingAesKey || encodingAesKey.length() != AES_ENCODE_KEY_LENGTH) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.AES_KEY_ILLEGAL);
+        }
+        this.token = token;
+        this.corpId = corpId;
+        aesKey = Base64.decodeBase64(encodingAesKey + "=");
+    }
+
+    /**
+     * 将和钉钉开放平台同步的消息体加密,返回加密Map
+     *
+     * @param plaintext 传递的消息体明文
+     * @param timeStamp 时间戳
+     * @param nonce     随机字符串
+     */
+    public Map<String, String> getEncryptedMap(String plaintext, Long timeStamp, String nonce) throws DingTalkEncryptException {
+        if (null == plaintext) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.ENCRYPTION_PLAINTEXT_ILLEGAL);
+        }
+        if (null == timeStamp) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.ENCRYPTION_TIMESTAMP_ILLEGAL);
+        }
+        if (null == nonce) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.ENCRYPTION_NONCE_ILLEGAL);
+        }
+        // 加密
+        String encrypt = encrypt(Utils.getRandomStr(RANDOM_LENGTH), plaintext);
+        String signature = getSignature(token, String.valueOf(timeStamp), nonce, encrypt);
+        Map<String, String> resultMap = new HashMap<String, String>();
+        resultMap.put("msg_signature", signature);
+        resultMap.put("encrypt", encrypt);
+        resultMap.put("timeStamp", String.valueOf(timeStamp));
+        resultMap.put("nonce", nonce);
+        return resultMap;
+    }
+
+    /**
+     * 密文解密
+     *
+     * @param msgSignature 签名串
+     * @param timeStamp    时间戳
+     * @param nonce        随机串
+     * @param encryptMsg   密文
+     * @return 解密后的原文
+     */
+    public String getDecryptMsg(String msgSignature, String timeStamp, String nonce, String encryptMsg) throws DingTalkEncryptException {
+        //校验签名
+        String signature = getSignature(token, timeStamp, nonce, encryptMsg);
+        if (!signature.equals(msgSignature)) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_SIGNATURE_ERROR);
+        }
+        // 解密
+        return decrypt(encryptMsg);
+    }
+
+
+    /*
+     * 对明文加密.
+     * @param text 需要加密的明文
+     * @return 加密后base64编码的字符串
+     */
+    private String encrypt(String random, String plaintext) throws DingTalkEncryptException {
+        try {
+            byte[] randomBytes = random.getBytes(CHARSET);
+            byte[] plainTextBytes = plaintext.getBytes(CHARSET);
+            byte[] lengthByte = Utils.int2Bytes(plainTextBytes.length);
+            byte[] corpidBytes = corpId.getBytes(CHARSET);
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            byteStream.write(randomBytes);
+            byteStream.write(lengthByte);
+            byteStream.write(plainTextBytes);
+            byteStream.write(corpidBytes);
+            byte[] padBytes = PKCS7Padding.getPaddingBytes(byteStream.size());
+            byteStream.write(padBytes);
+            byte[] unencrypted = byteStream.toByteArray();
+            byteStream.close();
+            Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+            SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
+            IvParameterSpec iv = new IvParameterSpec(aesKey, 0, 16);
+            cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
+            byte[] encrypted = cipher.doFinal(unencrypted);
+            return BASE64.encodeToString(encrypted);
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_ENCRYPT_TEXT_ERROR);
+        }
+    }
+
+    /*
+     * 对密文进行解密.
+     * @param text 需要解密的密文
+     * @return 解密得到的明文
+     */
+    private String decrypt(String text) throws DingTalkEncryptException {
+        byte[] originalArr;
+        try {
+            // 设置解密模式为AES的CBC模式
+            Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+            SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
+            IvParameterSpec iv = new IvParameterSpec(Arrays.copyOfRange(aesKey, 0, 16));
+            cipher.init(Cipher.DECRYPT_MODE, keySpec, iv);
+            // 使用BASE64对密文进行解码
+            byte[] encrypted = Base64.decodeBase64(text);
+            // 解密
+            originalArr = cipher.doFinal(encrypted);
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_DECRYPT_TEXT_ERROR);
+        }
+
+        String plainText;
+        String fromCorpid;
+        try {
+            // 去除补位字符
+            byte[] bytes = PKCS7Padding.removePaddingBytes(originalArr);
+            // 分离16位随机字符串,网络字节序和corpId
+            byte[] networkOrder = Arrays.copyOfRange(bytes, 16, 20);
+            int plainTextLegth = Utils.bytes2int(networkOrder);
+            plainText = new String(Arrays.copyOfRange(bytes, 20, 20 + plainTextLegth), CHARSET);
+            fromCorpid = new String(Arrays.copyOfRange(bytes, 20 + plainTextLegth, bytes.length), CHARSET);
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_DECRYPT_TEXT_LENGTH_ERROR);
+        }
+
+        // corpid不相同的情况
+        if (!fromCorpid.equals(corpId)) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_DECRYPT_TEXT_CORPID_ERROR);
+        }
+        return plainText;
+    }
+
+    /**
+     * 数字签名
+     *
+     * @param token     isv token
+     * @param timestamp 时间戳
+     * @param nonce     随机串
+     * @param encrypt   加密文本
+     */
+    public String getSignature(String token, String timestamp, String nonce, String encrypt) throws DingTalkEncryptException {
+        try {
+            String[] array = new String[]{token, timestamp, nonce, encrypt};
+            Arrays.sort(array);
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < 4; i++) {
+                sb.append(array[i]);
+            }
+            String str = sb.toString();
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            md.update(str.getBytes());
+            byte[] digest = md.digest();
+
+            StringBuilder hexStr = new StringBuilder();
+            String shaHex = "";
+            for (byte b : digest) {
+                shaHex = Integer.toHexString(b & 0xFF);
+                if (shaHex.length() < 2) {
+                    hexStr.append(0);
+                }
+                hexStr.append(shaHex);
+            }
+            return hexStr.toString();
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_SIGNATURE_ERROR);
+        }
+    }
+}

smart-steward-common/src/main/java/com/smartSteward/common/utils/dingTalk/PKCS7Padding.java

@@ -0,0 +1,47 @@
+package com.smartSteward.common.utils.dingTalk;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+/*
+ * PCS7算法的加密填充
+ */
+
+/**
+ * @author smart_Steward
+ */
+public class PKCS7Padding {
+    private final static Charset CHARSET    = StandardCharsets.UTF_8;
+    private final static int     BLOCK_SIZE = 32;
+
+    /**
+     * 填充mode字节
+     */
+    public static byte[] getPaddingBytes(int count) {
+        int amountToPad = BLOCK_SIZE - (count % BLOCK_SIZE);
+        char padChr = chr(amountToPad);
+        StringBuilder tmp = new StringBuilder();
+        for (int index = 0; index < amountToPad; index++) {
+            tmp.append(padChr);
+        }
+        return tmp.toString().getBytes(CHARSET);
+    }
+
+    /**
+     * 移除mode填充字节
+     */
+    public static byte[] removePaddingBytes(byte[] decrypted) {
+        int pad = (int) decrypted[decrypted.length - 1];
+        if (pad < 1 || pad > BLOCK_SIZE) {
+            pad = 0;
+        }
+        return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad);
+    }
+
+    private static char chr(int a) {
+        byte target = (byte) (a & 0xFF);
+        return (char) target;
+    }
+
+}

smart-steward-common/src/main/java/com/smartSteward/common/utils/dingTalk/Utils.java

@@ -0,0 +1,48 @@
+package com.smartSteward.common.utils.dingTalk;
+
+import java.util.Random;
+
+/**
+ * 加解密工具类
+ * @author smart_Steward
+ */
+public class Utils {
+    /**
+     *
+     */
+    public static String getRandomStr(int count) {
+        String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < count; i++) {
+            int number = random.nextInt(base.length());
+            sb.append(base.charAt(number));
+        }
+        return sb.toString();
+    }
+
+
+    /*
+     * int转byte数组,高位在前
+     */
+    public static byte[] int2Bytes(int count) {
+        byte[] byteArr = new byte[4];
+        byteArr[3] = (byte) (count & 0xFF);
+        byteArr[2] = (byte) (count >> 8 & 0xFF);
+        byteArr[1] = (byte) (count >> 16 & 0xFF);
+        byteArr[0] = (byte) (count >> 24 & 0xFF);
+        return byteArr;
+    }
+
+    /**
+     * 高位在前bytes数组转int
+     */
+    public static int bytes2int(byte[] byteArr) {
+        int count = 0;
+        for (int i = 0; i < 4; i++) {
+            count <<= 8;
+            count |= byteArr[i] & 0xff;
+        }
+        return count;
+    }
+}

smart-steward-common/src/main/java/com/smartSteward/common/utils/http/HttpUtils.java

@@ -127,7 +127,7 @@ public class HttpUtils
      */
     public static String sendPost(String url, String param)
     {
-        return sendPost(url, param, MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        return sendPost(url, param, MediaType.APPLICATION_JSON_VALUE);
     }
 
     /**

smart-steward-entity/pom.xml

@@ -12,6 +12,16 @@
             <groupId>com.smartSteward</groupId>
             <artifactId>smart-steward-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <modelVersion>4.0.0</modelVersion>
 

smart-steward-entity/src/main/java/com/smartSteward/entity/input/dingTalk/AddressListRegister.java

@@ -0,0 +1,41 @@
+package com.smartSteward.entity.input.dingTalk;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+
+/**
+ * @author smart_Steward
+ */
+@Data
+public class AddressListRegister {
+    /**通讯录用户增加 */
+    public static final String USER_ADD_ORG = "user_add_org";
+    /**通讯录用户更改*/
+    public static final String USER_MODIFY_ORG = "user_modify_org";
+    /** 通讯录用户离职 */
+    public static final String USER_LEAVE_ORG = "user_leave_org";
+    /** 通讯录用户被设为管理员 */
+    public static final String ORG_ADMIN_ADD = "org_admin_add";
+    /** 通讯录用户被取消设置管理员 */
+    public static final String ORG_ADMIN_REMOVE = "org_admin_remove";
+    /**通讯录企业部门创建*/
+    public static final String ORG_DEPT_CREATE = "org_dept_create";
+    /** 通讯录企业部门修改 */
+    public static final String ORG_DEPT_MODIFY = "org_dept_modify";
+    /**通讯录企业部门删除*/
+    public static final String ORG_DEPT_REMOVE = "org_dept_remove";
+    /**企业被解散*/
+    public static final String ORG_REMOVE = "org_remove";
+    /**企业信息发生变更*/
+    public static final String ORG_CHANGE = "org_change";
+    /**员工角色信息发生变更*/
+    public static final String LABEL_USER_CHANGE = "label_user_change";
+    /**增加角色或者角色组*/
+    public static final String LABEL_CONF_ADD = "label_conf_add";
+    /**删除角色或者角色组*/
+    public static final String LABEL_CONF_DEL = "label_conf_del";
+    /**修改角色或者角色组*/
+    public static final String LABEL_CONF_MODIFY = "label_conf_modify";
+    /**测试回调接口事件类型*/
+    public static final String CHECK_URL = "check_url";
+}

smart-steward-entity/src/main/java/com/smartSteward/entity/view/dingTalk/DingTalkDept.java

@@ -0,0 +1,22 @@
+package com.smartSteward.entity.view.dingTalk;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author smart_Steward
+ */
+@Data
+public class DingTalkDept {
+    @JsonProperty("dept_id")
+    @ApiModelProperty("部门ID")
+    private  Long deptId;
+    @JsonProperty("name")
+    @ApiModelProperty("部门名称")
+    private  String name;
+    @JsonProperty("parent_id")
+    @ApiModelProperty("父部门ID")
+    private  Long parentId;
+
+}

smart-steward-entity/src/main/java/com/smartSteward/entity/view/dingTalk/DingTalkUser.java

@@ -0,0 +1,53 @@
+package com.smartSteward.entity.view.dingTalk;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author smart_Steward
+ */
+@Data
+public class DingTalkUser {
+    @JsonProperty("userid")
+    @ApiModelProperty("员工的userId")
+    private  String userid;
+    @JsonProperty("unionid")
+    @ApiModelProperty("员工在当前开发者企业账号范围内的唯一标识")
+    private  String unionId;
+    @ApiModelProperty("员工姓名")
+    @JsonProperty("name")
+    private  String name;
+    @ApiModelProperty("头像")
+    @JsonProperty("avatar")
+    private  String avatar;
+    @ApiModelProperty("员工直属主管")
+    @JsonProperty("manager_userid")
+    private  String managerUserid;
+    @ApiModelProperty("手机号")
+    @JsonProperty("mobile")
+    private  String mobile;
+    @ApiModelProperty("分机号")
+    @JsonProperty("telephone")
+    private  String telephone;
+    @ApiModelProperty("工号")
+    @JsonProperty("job_number")
+    private  String jobNumber;
+    @ApiModelProperty("职位")
+    @JsonProperty("title")
+    private  String title;
+    @ApiModelProperty("邮箱")
+    @JsonProperty("email")
+    private  String email;
+    @ApiModelProperty("办公地点")
+    @JsonProperty("work_place")
+    private  String workPlace;
+    @ApiModelProperty("备注")
+    @JsonProperty("remark")
+    private  String remark;
+    @ApiModelProperty("所属部门id列表")
+    @JsonProperty("dept_id_list")
+    private List<Long> deptIdList;
+}

smart-steward-framework/pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>6.8.3</version>
+            <version>6.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.smartSteward</groupId>

smart-steward-framework/src/main/java/com/smartSteward/framework/web/service/SysLoginService.java

@@ -120,28 +120,33 @@ public class SysLoginService
      */
     public String loginByDingTalk(String authCode)
     {
-        //通过Code获取钉钉用户手机号
-        String mobile=dingTalkService.getUserMobile(authCode);
-        // 手机号前置校验
-        loginByMobilePreCheck(mobile);
+        //通过Code获取钉钉用户userid
+        String dingUser =dingTalkService.getUserByUserId(authCode);
+        // IP黑名单校验
+        String blackStr = configService.selectConfigByKey("sys.login.blackIPList");
+        if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
+        {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(dingUser, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked")));
+            throw new BlackListException();
+        }
 
-        // 通过手机号获取用户
-        SysUser user = userService.selectUserByMobile(mobile);
+        // 通过钉钉UserId获取用户
+        SysUser user = userService.selectUserByDingUserId(dingUser);
         if (StringUtils.isNull(user))
         {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(mobile, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists")));
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(dingUser, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists")));
             throw new UserNotExistsException();
         }
 
         // 检查用户状态
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(mobile, Constants.LOGIN_FAIL, MessageUtils.message("user.password.delete")));
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(dingUser, Constants.LOGIN_FAIL, MessageUtils.message("user.password.delete")));
             throw new ServiceException(MessageUtils.message("user.password.delete"));
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(mobile, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark())));
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(dingUser, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark())));
             throw new ServiceException(MessageUtils.message("user.blocked", user.getRemark()));
         }
         // 构建登录用户信息
@@ -159,34 +164,13 @@ public class SysLoginService
         return tokenService.createToken(loginUser);
     }
 
-    /**
-     * 手机号登录前置校验
-     * @param mobile 手机号
-     */
-    public void loginByMobilePreCheck(String mobile)
-    {
-        // 手机号为空 错误
-        if (StringUtils.isEmpty(mobile))
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor("", Constants.LOGIN_FAIL, MessageUtils.message("user.mobile.not.null")));
-            throw new UserNotExistsException();
-        }
 
-        // IP黑名单校验
-        String blackStr = configService.selectConfigByKey("sys.login.blackIPList");
-        if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(mobile, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked")));
-            throw new BlackListException();
-        }
-    }
     /**
      * 校验验证码
      * 
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识
-     * @return 结果
      */
     public void validateCaptcha(String username, String code, String uuid)
     {

smart-steward-mapper/src/main/java/com/smartSteward/mapper/system/SysDeptMapper.java

@@ -43,6 +43,13 @@ public interface SysDeptMapper
      * @return 部门列表
      */
     public List<SysDept> selectChildrenDeptById(Long deptId);
+    /**
+     * 查询钉钉部门
+     *
+     * @param dingDeptId 钉钉部门id
+     * @return 部门列表
+     */
+    public List<SysDept> selectDingDeptList(List<Long>dingDeptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
@@ -51,7 +58,6 @@ public interface SysDeptMapper
      * @return 子部门数
      */
     public int selectNormalChildrenDeptById(Long deptId);
-
     /**
      * 是否存在子节点
      * 
@@ -85,6 +91,9 @@ public interface SysDeptMapper
      */
     public int insertDept(SysDept dept);
 
+
+
+
     /**
      * 修改部门信息
      * 
@@ -100,6 +109,9 @@ public interface SysDeptMapper
      */
     public void updateDeptStatusNormal(Long[] deptIds);
 
+
+
+
     /**
      * 修改子元素关系
      * 

smart-steward-mapper/src/main/java/com/smartSteward/mapper/system/SysUserMapper.java

@@ -21,6 +21,15 @@ public interface SysUserMapper
     public List<SysUser> selectUserList(SysUser sysUser);
 
     /**
+     * 查询所有用户
+     *
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectAllUserList();
+
+
+
+    /**
      * 根据条件分页查询已配用户角色列表
      * 
      * @param user 用户信息
@@ -52,7 +61,7 @@ public interface SysUserMapper
      */
     public SysUser selectUserById(Long userId);
 
-    public SysUser selectUserByMobile(String mobile);
+    public SysUser selectUserByDingUserId(String dingUserId);
 
     /**
      * 新增用户信息

smart-steward-mapper/src/main/resources/generator.yml

@@ -1,9 +1,9 @@
 # 代码生成
 gen:
   # 作者
-  author: ruoyi
+  author: smart-steward
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.smartSteward.system
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

smart-steward-mapper/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -20,10 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="dingDeptId" column="ding_dept_id" />
+		<result property="dingParentId" column="ding_parent_id" />
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time ,d.ding_dept_id ,ding_parent_id
         from sys_dept d
     </sql>
     
@@ -46,6 +48,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
+
+
+
+	<select id="selectDingDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0' and ding_dept_id in
+		<foreach collection="array" item="dingDeptId" open="(" separator="," close=")">
+			#{dingDeptId}
+		</foreach>
+		order by d.dept_id desc
+	</select>
+
     
     <select id="selectDeptListByRoleId" resultType="Long">
 		select d.dept_id
@@ -59,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
     
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,ding_dept_id,ding_parent_id,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
@@ -87,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
     
-    <insert id="insertDept" parameterType="SysDept">
+    <insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
@@ -99,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">email,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+		    <if test="dingDeptId != null and dingDeptId != ''">ding_dept_id,</if>
+		    <if test="dingParentId != null and dingParentId != ''">ding_parent_id,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -111,6 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+		    <if test="dingDeptId != null and dingDeptId !='' ">#{dingDeptId},</if>
+		    <if test="dingParentId != null and dingParentId !='' ">#{dingParentId},</if>
  			sysdate()
  		)
 	</insert>
@@ -127,6 +145,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="dingDeptId != null and dingDeptId !=''  ">ding_dept_id = #{dingDeptId},</if>
+			<if test="dingParentId != null and dingParentId !=''  ">ding_parent_id = #{dingParentId},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}
@@ -156,4 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
+
+
+
+
 </mapper> 

smart-steward-mapper/src/main/resources/mapper/system/SysUserMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"      column="update_by"       />
         <result property="updateTime"    column="update_time"     />
         <result property="remark"        column="remark"          />
+		<result property="dingUserId"    column="ding_user_id"    />
         <association property="dept"     javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"    javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -48,8 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, 
-        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, u.ding_user_id,
+        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status ,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.ding_user_id, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -120,6 +121,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
+
+	<select id="selectAllUserList"  resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.del_flag = '0'
+	</select>
 	
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
@@ -131,9 +137,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.user_id = #{userId}
 	</select>
 
-	<select id="selectUserByMobile" parameterType="String" resultMap="SysUserResult">
+	<select id="selectUserByDingUserID" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.phonenumber = #{mobile}  limit 1
+		where u.ding_user_id = #{dingUserId}  limit 1
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -163,10 +169,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">pwd_update_date,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+		    <if test="dingUserId != null and dingUserId != ''">ding_user_id,</if>
  			create_time
  		)values(
- 			<if test="userId != null and userId != ''">#{userId},</if>
- 			<if test="deptId != null and deptId != ''">#{deptId},</if>
+ 			<if test="userId != null and userId != 0">#{userId},</if>
+ 			<if test="deptId != null and deptId != 0">#{deptId},</if>
  			<if test="userName != null and userName != ''">#{userName},</if>
  			<if test="nickName != null and nickName != ''">#{nickName},</if>
  			<if test="email != null and email != ''">#{email},</if>
@@ -178,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+		    <if test="dingUserId != null and dingUserId != ''">#{dingUserId},</if>
  			sysdate()
  		)
 	</insert>
@@ -197,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="dingUserId != null">ding_user_id = #{dingUserId},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

smart-steward-service/src/main/java/com/smartSteward/service/dingTalk/IDingTalkService.java

@@ -1,10 +1,17 @@
 package com.smartSteward.service.dingTalk;
 
+import org.springframework.transaction.annotation.Transactional;
+
 /**
  * 通用钉钉访问
  *
  * @author smart-steward
  */
 public interface IDingTalkService {
-    String getUserMobile(String authCode) ;
+    @Transactional(rollbackFor = Exception.class)
+    void synchronize() throws Exception;
+
+    String getUserByUserId(String authCode) ;
+
+    boolean receive(String signature, String timestamp, String nonce, String requestBody);
 }

smart-steward-service/src/main/java/com/smartSteward/service/system/ISysDeptService.java

@@ -106,6 +106,9 @@ public interface ISysDeptService
      */
     public int insertDept(SysDept dept);
 
+
+    int insertDingDept(SysDept dept);
+
     /**
      * 修改保存部门信息
      * 
@@ -114,6 +117,8 @@ public interface ISysDeptService
      */
     public int updateDept(SysDept dept);
 
+    List<SysDept> selectDingDeptList(List<Long> dingDeptId);
+
     /**
      * 删除部门管理信息
      * 

smart-steward-service/src/main/java/com/smartSteward/service/system/ISysUserService.java

@@ -3,6 +3,7 @@ package com.smartSteward.service.system;
 import java.util.Date;
 import java.util.List;
 import com.smartSteward.common.core.database.system.SysUser;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 用户 业务层
@@ -43,6 +44,8 @@ public interface ISysUserService
      */
     public SysUser selectUserByUserName(String userName);
 
+    List<SysUser> selectAllUserList();
+
     /**
      * 通过用户ID查询用户
      * 
@@ -50,8 +53,13 @@ public interface ISysUserService
      * @return 用户对象信息
      */
     public SysUser selectUserById(Long userId);
-
-    SysUser selectUserByMobile(String mobile);
+    /**
+     * 根据钉钉UserId查询用户信息
+     *
+     * @param dingUserId 用户名
+     * @return 结果
+     */
+    SysUser selectUserByDingUserId(String dingUserId);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -131,6 +139,9 @@ public interface ISysUserService
      */
     public int updateUser(SysUser user);
 
+    @Transactional
+    int updateDingUser(SysUser user);
+
     /**
      * 用户授权角色
      * 

smart-steward-service/src/main/java/com/smartSteward/service/system/impl/SysDeptServiceImpl.java

@@ -220,7 +220,11 @@ public class SysDeptServiceImpl implements ISysDeptService
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         return deptMapper.insertDept(dept);
     }
-
+    @Override
+    public int insertDingDept(SysDept dept)
+    {
+        return deptMapper.insertDept(dept);
+    }
     /**
      * 修改保存部门信息
      * 
@@ -280,7 +284,11 @@ public class SysDeptServiceImpl implements ISysDeptService
             deptMapper.updateDeptChildren(children);
         }
     }
-
+    @Override
+    public List<SysDept> selectDingDeptList(List<Long> dingDeptId)
+    {
+        return deptMapper.selectDingDeptList(dingDeptId);
+    }
     /**
      * 删除部门管理信息
      * 

smart-steward-service/src/main/java/com/smartSteward/service/system/impl/SysUserServiceImpl.java

@@ -118,6 +118,18 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     /**
+     * 查询所有用户
+     *
+     * @return 用户对象信息
+     */
+    @Override
+    public List<SysUser> selectAllUserList()
+    {
+        return userMapper.selectAllUserList();
+    }
+
+
+    /**
      * 通过用户ID查询用户
      * 
      * @param userId 用户ID
@@ -130,14 +142,14 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     /**
-     * 通过用户手机号查询用户
+     * 通过用户钉钉useId查询用户
      *
-     * @param mobile 用户手机号
+     * @param dingUserId 用户手机号
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserByMobile(String mobile) {
-        return userMapper.selectUserByMobile(mobile);
+    public SysUser selectUserByDingUserId(String dingUserId) {
+        return userMapper.selectUserByDingUserId(dingUserId);
     }
 
     /**
@@ -315,6 +327,13 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.updateUser(user);
     }
 
+    @Override
+    @Transactional
+    public int updateDingUser(SysUser user)
+    {
+        return userMapper.updateUser(user);
+    }
+
     /**
      * 用户授权角色
      * 
@@ -374,6 +393,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @param loginDate 登录时间
      * @return 结果
      */
+    @Override
     public void updateLoginInfo(Long userId, String loginIp, Date loginDate)
     {
         userMapper.updateLoginInfo(userId, loginIp, loginDate);