publish 1.0.24-test

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.0.20</version>
+    <version>1.0.24-test</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>1.0.20</version>
+                <version>1.0.24-test</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>1.0.20</version>
+    <version>1.0.24-test</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-encrypt/src/main/java/com/tiesheng/encrypt/config/DecryptRequestBodyAdvice.java

@@ -4,6 +4,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import cn.hutool.log.LogFactory;
 import com.tiesheng.util.config.EncryptConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
@@ -66,6 +67,7 @@ public class DecryptRequestBodyAdvice implements RequestBodyAdvice {
         DecryptHttpInputMessage(HttpInputMessage inputMessage, EncryptConfig encryptConfig) throws Exception {
             this.headers = inputMessage.getHeaders();
             String bodyStr = IoUtil.read(inputMessage.getBody(), CharsetUtil.CHARSET_UTF_8);
+            LogFactory.get().info("DecryptRequestBodyAdvice: " + bodyStr);
             String encryptData = JSONUtil.parseObj(bodyStr).getStr("encryptData");
             if (!StrUtil.isEmpty(encryptData)) {
                 String decrypt = encryptConfig.decrypt(encryptData);

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java

@@ -86,7 +86,7 @@ public class LoginController {
     public ApiResp<String> uniqueIndex(@RequestBody UniqueIndexDTO dto) {
         TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("web_unique_index",
                 dto.getNo(), dto.getPlatform(), dto.getInfo()));
-        if (tokenBean == null) {
+        if (tokenBean == null || StrUtil.isEmpty(tokenBean.getId())) {
             throw new ApiException("登录失败");
         }
         return ApiResp.respOK(tokenBean.toToken());

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java

@@ -226,6 +226,8 @@ public class PlatformDingConfig {
 
     /**
      * 同步钉钉的通讯录
+     * <br />
+     * PS：如果需要钉钉用户手机号，需要开通权限：企业员工手机号信息
      *
      * @param deptVo   为null时从第一级获取
      * @param consumer 回调
@@ -264,18 +266,19 @@ public class PlatformDingConfig {
      * @param content
      * @param actionUrl
      * @param userIds
+     * @return
      */
-    public void messageNotification(String service, String title, String content, String actionUrl, List<String> userIds) {
+    public DingResponse<String> messageNotification(String service, String title, String markdown, String actionUrl, List<String> userIds) {
 
         if (CollUtil.isEmpty(userIds)) {
-            return;
+            return null;
         }
 
         DingConfigBean configBean = getConfigBean(service);
 
         JSONObject actionCard = new JSONObject();
         actionCard.set("title", title);
-        actionCard.set("markdown", "### " + title + "\n" + content);
+        actionCard.set("markdown", markdown);
         actionCard.set("single_title", "点击查看");
         actionCard.set("single_url", actionUrl);
 
@@ -287,7 +290,7 @@ public class PlatformDingConfig {
         body.putOpt("agent_id", configBean.getAgentId());
         body.putOpt("userid_list", CollUtil.join(userIds, ","));
         body.putOpt("msg", msg);
-        doRequest(service, "https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2", body,
+        return doRequest(service, "https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2", body,
                 new TypeReference<DingResponse<String>>() {
                 });
     }

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.20</version>
+        <version>1.0.24-test</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java

@@ -28,6 +28,28 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
     }
 
 
+    /**
+     * 获取（或创建）一个文本类型的配置
+     *
+     * @param configKey
+     * @param defaultValue
+     * @return
+     */
+    public CoreConfigSystem getTextOrCreate(String configKey, String defaultValue) {
+        CoreConfigSystem oneByColumn = getOneByColumn("config_key", configKey);
+        if (oneByColumn == null) {
+            oneByColumn = new CoreConfigSystem();
+            oneByColumn.setId(configKey);
+            oneByColumn.setConfigKey(configKey);
+            oneByColumn.setConfigVal(defaultValue);
+            oneByColumn.setRemark(defaultValue);
+            oneByColumn.setConfigType(0);
+            save(oneByColumn);
+        }
+        return oneByColumn;
+    }
+
+
     /**
      * 刷新功能点
      *

springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java

@@ -1,6 +1,6 @@
 package com.tiesheng.core.service;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Objects;
 
 /**
  * @author hao
@@ -37,11 +38,22 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
         platformUnique.setInfo(loginInfo.getInfo());
         saveOrUpdate(platformUnique);
 
+        String oldUserId = platformUnique.getUserId();
         TokenBean tokenBean = tieshengWebConfigurer.login(platformUnique);
         if (tokenBean != null) {
+
             // 添加登录日志
             coreLogService.addLoginLog(platformUnique, tokenBean);
+
+            // 更新唯一值
+            if (!StrUtil.isEmpty(tokenBean.getId()) &&
+                    !Objects.equals(oldUserId, tokenBean.getId())) {
+                platformUnique.setUserId(tokenBean.getId());
+                saveOrUpdate(platformUnique);
+            }
         }
+
+
         return tokenBean;
     }
 
@@ -55,19 +67,5 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
         tieshengWebConfigurer.onSignError(response);
     }
 
-    /**
-     * 更新用户id
-     *
-     * @param uniqueId
-     * @param userId
-     * @return
-     */
-    public boolean updateUserId(String uniqueId, String userId) {
-        return update(new UpdateWrapper<CorePlatformUnique>().eq("unique_id", uniqueId)
-                .set("user_id", userId)
-                .set("is_deleted", 0)
-        );
-    }
-
 
 }