publish 1.1.6

publish 1.1.5
Merge branch 'new_characterUtils' into 'master'
2025-05-27 13:20:03 +08:00 · 2024-06-19 13:54:11 +08:00 · 2024-06-19 05:53:24 +00:00 · 2024-06-19 13:53:01 +08:00 · 2024-06-19 13:46:50 +08:00 · 2024-06-19 05:45:11 +00:00
45 changed files with 760 additions and 185 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.gitea/workflows/mvn-deploy.yaml
+++ b/.gitea/workflows/mvn-deploy.yaml
@@ -0,0 +1,25 @@
+## 工作流触发时机
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+
+  ## 任务名称
+  local-deploy:
+
+    ## 任务执行的服务器
+    runs-on: tiesheng-local
+
+    ## 任务步骤
+    steps:
+
+      ## 检出代码（固定配置）
+      - name: Check out repository code
+        uses: https://git.tieshengkeji.com/actions/checkout@v4
+
+      ## maven打包
+      - name: Maven deploy
+        run: |
+          mvn deploy          
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +0,0 @@
-stages:
-  - deploy
-
-deploy-jar:
-  stage: deploy
-  tags:
-    - hzkepai
-  rules:
-    - if: $CI_COMMIT_TAG
-  script:
-    - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:$TAG_REPO_FOLDER
-    - cd $TAG_REPO_FOLDER
-    - git checkout master
-    - git pull
-    - git add .
-    - git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG"
-    - git push origin master
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.tiesheng.springboot-parent</groupId>
    <artifactId>springboot-parent</artifactId>
-    <version>1.0.13</version>
+    <version>1.1.6</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.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-login</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-web</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-util</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-platform</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-message</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-encrypt</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-annotation</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-poi</artifactId>
-                <version>1.0.13</version>
+                <version>1.1.6</version>
            </dependency>

            <dependency>
@@ -125,11 +125,18 @@

    <pluginRepositories>
        <pluginRepository>
-            <id>kepai-repo-plugin</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <id>gitea</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
        </pluginRepository>
    </pluginRepositories>

+    <distributionManagement>
+        <repository>
+            <id>gitea</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+        </repository>
+    </distributionManagement>
+
    <build>
        <pluginManagement>
            <plugins>
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,11 +6,11 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>1.0.13</version>
+    <version>1.1.6</version>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/config/JWTAuthenticationFilter.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/config/JWTAuthenticationFilter.java
@@ -0,0 +1,43 @@
+//package com.tiesheng.demo.config;
+//
+//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+//import org.springframework.security.core.GrantedAuthority;
+//import org.springframework.security.core.authority.SimpleGrantedAuthority;
+//import org.springframework.security.core.context.SecurityContextHolder;
+//import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+//import org.springframework.web.filter.OncePerRequestFilter;
+//
+//import javax.servlet.FilterChain;
+//import javax.servlet.ServletException;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//public class JWTAuthenticationFilter extends OncePerRequestFilter {
+//
+//    public JWTAuthenticationFilter(JwtTokenProvider tokenProvider) {
+//        this.tokenProvider = tokenProvider;
+//    }
+//
+//    @Override
+//    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+//        String authHeader = request.getHeader("Authorization");
+//        if (authHeader != null && authHeader.startsWith("Bearer ")) {
+//            String token = authHeader.substring(7);
+//            String username = tokenProvider.getUsername(token);
+//            if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
+//                if (tokenProvider.validateToken(token)) {
+//                    List<GrantedAuthority> authorities = new ArrayList<>();
+//                    // 根据你的应用程序需求设置权限
+//                    authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+//                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, null, authorities);
+//                    authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+//                    SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+//                }
+//            }
+//        }
+//        filterChain.doFilter(request, response);
+//    }
+//}
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/config/TieshengSecurityAdapter.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/config/TieshengSecurityAdapter.java
@@ -0,0 +1,29 @@
+//package com.tiesheng.demo.config;
+//
+//import cn.hutool.extra.spring.SpringUtil;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+//
+//import javax.servlet.http.HttpServletResponse;
+//
+//@Configuration
+//@EnableWebSecurity
+//public class TieshengSecurityAdapter extends WebSecurityConfigurerAdapter {
+//
+//    @Override
+//    protected void configure(HttpSecurity http) throws Exception {
+//        SpringUtil.getBeanFactory().getA
+//        http.csrf().disable() // JWT 通常与状态无关，因此 CSRF 保护不适用
+//                .authorizeRequests()
+//                .antMatchers("/login").permitAll() // 登录接口允许所有人访问
+//                .anyRequest().authenticated() // 其他所有请求需要认证
+//                .and()
+//                .exceptionHandling()
+//                .authenticationEntryPoint((request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED))
+//                .and()
+//                .addFilterBefore(new JWTAuthenticationFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class);
+//    }
+//}
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
@@ -58,7 +58,6 @@ public class TestController {

    @RequestMapping("/index")
    public ApiResp<String> index() {
-        dbBackupConfig.dbBackup();
        return ApiResp.respOK("hello world");
    }

@@ -94,7 +93,7 @@ public class TestController {
    public ApiResp<MessageReqResp> sendMessage() {

        MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"),
-                JSONUtil.createObj().putOpt("code", "123456").putOpt("template_code", "SMS_154950909"));
+                JSONUtil.createObj().putOpt("action", "sms-visitor-invite"));

        return ApiResp.respOK(reqResp);
    }
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/service/DemoSmsHandler.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/service/DemoSmsHandler.java
@@ -0,0 +1,32 @@
+package com.tiesheng.demo.service;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.tiesheng.message.config.aliyun.AliyunSmsHandler;
+import com.tiesheng.message.pojos.AliyunTempParam;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+public class DemoSmsHandler implements AliyunSmsHandler {
+
+    @Override
+    public AliyunTempParam handler(JSONObject obj) {
+
+        String action = obj.getStr("action");
+
+        AliyunTempParam param = new AliyunTempParam();
+        param.setSignName("智慧校园");
+
+        if (Objects.equals(action, "sms-visitor-invite")) {
+            param.setTemplateCode("SMS_276125463");
+            param.setTemplateParam(JSONUtil.createObj()
+                    .putOpt("date", DateUtil.today())
+            );
+        }
+
+        return param;
+    }
+}
--- a/springboot-ademo/src/main/resources/application-test.yml
+++ b/springboot-ademo/src/main/resources/application-test.yml
@@ -25,4 +25,5 @@ tiesheng:
  aliyun:
    access-key-id: LTAI5tJtbgBCnTY5eS4SmrTf
    access-key-secret: JIHqpRUFffCHhXaJEVvWN31WcexWqG
-    sign-name: 阿里云短信测试
+  encrypt:
+    body: true
--- a/springboot-ademo/src/main/resources/application.yml
+++ b/springboot-ademo/src/main/resources/application.yml
@@ -9,6 +9,7 @@ spring:
  servlet:
    multipart:
      max-file-size: 20MB
+      max-request-size: 20MB
  web:
    resources:
      static-locations: classpath:/static/,file:static/
@@ -24,3 +25,4 @@ tiesheng:
  token:
    ignore-paths:
      - /test/index
+
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-annotation</artifactId>
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-database</artifactId>
--- a/springboot-encrypt/pom.xml
+++ b/springboot-encrypt/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-encrypt</artifactId>
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-login</artifactId>
--- a/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java
@@ -27,7 +27,7 @@ public class TsTokenConfig {
    private String encryptKey = "%kIp9frQCu";
    private Integer expireHours = 48;
    private String[] ignorePaths;
-    private boolean validLoginSign = false;
+    private boolean validLoginSign = true;


    /**
--- a/springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java
@@ -16,6 +16,7 @@ import com.tiesheng.login.service.TieshengLoginConfigurer;
 import com.tiesheng.platform.config.ding.PlatformDingConfig;
 import com.tiesheng.platform.config.ding.bean.DingJsapiSignature;
 import com.tiesheng.platform.config.ding.bean.DingUserInfo;
+import com.tiesheng.platform.config.ding.bean.DingUserSimple;
 import com.tiesheng.platform.config.wxmini.PlatformWxminiConfig;
 import com.tiesheng.platform.config.wxmp.PlatformWxmpConfig;
 import com.tiesheng.platform.config.wxmp.bean.WxConfigBean;
@@ -85,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());
@@ -113,6 +114,7 @@ public class LoginController {
        map.put("corpId", platformDingConfig.getConfigBean(service).getCorpId());
        map.put("service", service);
        map.put("extra", extra);
+        map.put("context", globalConfig.getContextPath());
        String query = URLUtil.buildQuery(map, Charset.defaultCharset());
        String configUrl = globalConfig.buildPath("/ding/index.html?" + query);
        try {
@@ -130,8 +132,8 @@ public class LoginController {
    @RequestMapping("/ding/oauth2/{service}")
    @OperationIgnore
    public void dingOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
-        String ddUserId = platformDingConfig.getUserIdByCode(service, dto.getCode());
-        DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, ddUserId);
+        DingUserSimple userSimple = platformDingConfig.getUserIdByCode(service, dto.getCode());
+        DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, userSimple.getUserid());
        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(dingUserInfo.getAppId(),
                dingUserInfo.getUserid(), "ding", JSON.toJSONString(dingUserInfo)));
        tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
--- a/springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java
+++ b/springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java
@@ -23,7 +23,7 @@ public class UniqueIndexDTO extends LoginToInfo {
        if (StrUtil.isEmpty(getNo()) || getTimestamp() == null) {
            return false;
        }
-        if ((DateUtil.currentSeconds() - getTimestamp()) > 60) {
+        if ((DateUtil.currentSeconds() - getTimestamp()) > 10) {
            return false;
        }
        String mySign = getNo() + getTimestamp();
--- a/springboot-login/src/main/resources/static/ding/index.html
+++ b/springboot-login/src/main/resources/static/ding/index.html
@@ -24,10 +24,10 @@
    corpId: getQueryString("corpId"),
    onSuccess: function (result) {
      let search = window.location.search + "&code=" + result.code;
-      window.location.href = "/login/ding/oauth2/" + getQueryString("service") + search;
+      window.location.replace(getQueryString("context") +  "/login/ding/oauth2/" + getQueryString("service") + search);
    },
    onFail: function (err) {
-      window.location.href = "./error.html?message=" + JSON.stringify(err);
+      window.location.replace("./error.html?message=" + JSON.stringify(err));
    }
  })

--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-message</artifactId>
--- a/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsHandler.java
+++ b/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsHandler.java
@@ -0,0 +1,16 @@
+package com.tiesheng.message.config.aliyun;
+
+import cn.hutool.json.JSONObject;
+import com.tiesheng.message.pojos.AliyunTempParam;
+
+public interface AliyunSmsHandler {
+
+
+    /**
+     * 数据处理
+     *
+     * @param obj
+     */
+    AliyunTempParam handler(JSONObject obj);
+
+}
--- a/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java
+++ b/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java
@@ -1,14 +1,18 @@
 package com.tiesheng.message.config.aliyun;

 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.tiesheng.message.pojos.AliyunTempParam;
 import com.tiesheng.message.pojos.MessageReqResp;
 import com.tiesheng.message.service.TieshengMessageSender;
+import com.tiesheng.util.exception.ApiException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

@@ -36,7 +40,9 @@ public class AliyunSmsSender implements TieshengMessageSender {

    private String accessKeyId;
    private String accessKeySecret;
-    private String signName;
+
+    @Autowired(required = false)
+    AliyunSmsHandler aliyunSmsHandler;

    /**
     * 特殊字符替换
@@ -94,7 +100,16 @@ public class AliyunSmsSender implements TieshengMessageSender {
        String signature = specialUrlEncode(digest);
        queryMap.put("Signature", signature);

-        return HttpUtil.get(ENDPOINT + "?Signature=" + signature + sortQueryStringTmp, 10 * 1000);
+        String respBody = "";
+        try {
+            respBody = HttpUtil.get(ENDPOINT + "?Signature=" + signature + sortQueryStringTmp, 10 * 1000);
+        } catch (Exception e) {
+            respBody = JSONUtil.createObj()
+                    .putOpt("Code", "Error")
+                    .putOpt("Message", "消息通道异常")
+                    .toString();
+        }
+        return respBody;
    }


@@ -102,29 +117,28 @@ public class AliyunSmsSender implements TieshengMessageSender {
     * 创建发送请求
     *
     * @param phoneNumbers 手机号，多个用,隔开
-     * @param templateCode 短信模板
-     * @param params       模板参数
+     * @param tempParam    短信模板
     * @return
     */
-    public MessageReqResp sendSms(String phoneNumbers, String templateCode, JSONObject params) {
+    public MessageReqResp sendSms(String phoneNumbers, AliyunTempParam tempParam) {

        MessageReqResp reqResp = new MessageReqResp("阿里云短信");
        reqResp.setTarget(phoneNumbers);
        reqResp.setResult(1);
        reqResp.setContent(JSONUtil.createObj()
                .putOpt("PhoneNumbers", phoneNumbers)
-                .putOpt("SignName", getSignName())
-                .putOpt("TemplateCode", templateCode)
-                .putOpt("TemplateParam", params)
+                .putOpt("SignName", tempParam.getSignName())
+                .putOpt("TemplateCode", tempParam.getTemplateCode())
+                .putOpt("TemplateParam", tempParam.getTemplateParam())
                .toString());

        // 业务API参数
        ConcurrentHashMap<String, String> queryMap = new ConcurrentHashMap<>();
        queryMap.put("PhoneNumbers", phoneNumbers);
-        queryMap.put("SignName", getSignName());
-        queryMap.put("TemplateCode", templateCode);
-        if (params != null) {
-            queryMap.put("TemplateParam", params.toString());
+        queryMap.put("SignName", tempParam.getSignName());
+        queryMap.put("TemplateCode", tempParam.getTemplateCode());
+        if (tempParam.getTemplateParam() != null) {
+            queryMap.put("TemplateParam", tempParam.getTemplateParam().toString());
        }

        reqResp.setRespBody(request("SendSms", queryMap));
@@ -139,7 +153,21 @@ public class AliyunSmsSender implements TieshengMessageSender {

    @Override
    public MessageReqResp send(String user, JSONObject body) {
-        return sendSms(user, body.getStr("template_code"), body);
+        boolean mobile = Validator.isMobile(user);
+        if (!mobile) {
+            return null;
+        }
+
+        if (aliyunSmsHandler == null) {
+            throw new ApiException("未注册短信参数处理器");
+        }
+
+        AliyunTempParam tempParam = aliyunSmsHandler.handler(body);
+        if (tempParam == null) {
+            throw new ApiException("未配置短信参数处理器");
+        }
+
+        return sendSms(user, tempParam);
    }

    @Override
@@ -149,7 +177,7 @@ public class AliyunSmsSender implements TieshengMessageSender {

    @Override
    public boolean support() {
-        return StrUtil.isAllNotEmpty(accessKeyId, accessKeySecret, signName);
+        return StrUtil.isAllNotEmpty(accessKeyId, accessKeySecret);
    }

    ///////////////////////////////////////////////////////////////////////////
@@ -172,12 +200,5 @@ public class AliyunSmsSender implements TieshengMessageSender {
        this.accessKeySecret = accessKeySecret;
    }

-    public String getSignName() {
-        return signName;
-    }
-
-    public void setSignName(String signName) {
-        this.signName = signName;
-    }

 }
--- a/springboot-message/src/main/java/com/tiesheng/message/pojos/AliyunTempParam.java
+++ b/springboot-message/src/main/java/com/tiesheng/message/pojos/AliyunTempParam.java
@@ -0,0 +1,38 @@
+package com.tiesheng.message.pojos;
+
+import cn.hutool.json.JSONObject;
+
+public class AliyunTempParam {
+
+    private String signName;
+    private String templateCode;
+    private JSONObject templateParam;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getSignName() {
+        return signName;
+    }
+
+    public void setSignName(String signName) {
+        this.signName = signName;
+    }
+
+    public String getTemplateCode() {
+        return templateCode;
+    }
+
+    public void setTemplateCode(String templateCode) {
+        this.templateCode = templateCode;
+    }
+
+    public JSONObject getTemplateParam() {
+        return templateParam;
+    }
+
+    public void setTemplateParam(JSONObject templateParam) {
+        this.templateParam = templateParam;
+    }
+}
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-platform</artifactId>
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java
+++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/PlatformDingConfig.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
@@ -49,6 +48,40 @@ public class PlatformDingConfig {
        return bean;
    }

+
+    /**
+     * 发送get请求
+     * 会自动增加accessToken在url上面
+     *
+     * @param service
+     * @return
+     */
+    public <T> DingResponse<T> doRequest(String service, String url, JSONObject body, TypeReference<DingResponse<T>> typeReference) {
+        if (StrUtil.contains(url, "?")) {
+            url = url + "&access_token=" + getAccessToken(service);
+        } else {
+            url = url + "?access_token=" + getAccessToken(service);
+        }
+
+        HttpResponse execute;
+        if (body == null) {
+            execute = HttpUtil.createGet(url).execute();
+        } else {
+            execute = HttpUtil.createPost(url).body(body.toString()).execute();
+        }
+
+        if (execute.isOk()) {
+            DingResponse<T> bean = JSONUtil.toBean(execute.body(), typeReference, true);
+            if (!bean.isOk()) {
+                LogFactory.get().info(bean.getErrmsg());
+            }
+            return bean;
+        }
+
+        return null;
+    }
+
+
    ///////////////////////////////////////////////////////////////////////////
    // 逻辑方法
    ///////////////////////////////////////////////////////////////////////////
@@ -89,14 +122,15 @@ public class PlatformDingConfig {
        DingConfigBean dingConfigBean = getConfigBean(service);
        String jsapiTicket = TimedCacheHelper.getTimedCache().get(CACHE_JSAPI_TICKET + dingConfigBean.getAppKey(), false);
        if (StrUtil.isEmpty(jsapiTicket)) {
-            String response = HttpUtil.get("https://oapi.dingtalk.com/get_jsapi_ticket?access_token=" + getAccessToken(service));
-            LogFactory.get().info("getJsapiTicket: " + response);
-            JSONObject respJson = JSONUtil.parseObj(response);
-            if (!Objects.equals(respJson.getStr("errcode"), "0")) {
-                throw new ApiException(respJson.getStr("errmsg"));
+            DingResponse<String> respJson = doRequest(service, "https://oapi.dingtalk.com/get_jsapi_ticket", null,
+                    new TypeReference<DingResponse<String>>() {
+                    });
+            if (!respJson.isOk()) {
+                throw new ApiException(respJson.getErrmsg());
            }
-            jsapiTicket = respJson.getStr("ticket");
-            TimedCacheHelper.getTimedCache().put(CACHE_JSAPI_TICKET + dingConfigBean.getAppKey(), jsapiTicket, respJson.getLong("expires_in"));
+            jsapiTicket = respJson.getTicket();
+            TimedCacheHelper.getTimedCache().put(CACHE_JSAPI_TICKET + dingConfigBean.getAppKey(),
+                    jsapiTicket, respJson.getExpiresIn());
        }
        return jsapiTicket;
    }
@@ -125,12 +159,11 @@ public class PlatformDingConfig {
     * @return
     * @see <a href="https://open.dingtalk.com/document/isvapp-server/obtain-the-userid-of-a-user-by-using-the-log-free"></a>
     */
-    public String getUserIdByCode(String service, String code) {
-        HttpRequest request = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo?access_token=" + getAccessToken(service))
-                .body(JSONUtil.createObj().putOpt("code", code).toString());
-        try (HttpResponse response = request.execute()) {
-            return JSONUtil.parseObj(response.body()).getJSONObject("result").getStr("userid");
-        }
+    public DingUserSimple getUserIdByCode(String service, String code) {
+        DingResponse<DingUserSimple> resp = doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/getuserinfo",
+                JSONUtil.createObj().putOpt("code", code), new TypeReference<DingResponse<DingUserSimple>>() {
+                });
+        return resp.getResult();
    }


@@ -144,16 +177,14 @@ public class PlatformDingConfig {
     */
    public DingUserInfo topapiV2UserGet(String service, String ddUserId) {
        DingConfigBean dingConfigBean = getConfigBean(service);
-        try (HttpResponse response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/get?access_token="
-                        + getAccessToken(service))
-                .body(JSONUtil.createObj().putOpt("userid", ddUserId).toString()).execute()) {
-            JSONObject resultJson = JSONUtil.parseObj(response.body()).getJSONObject("result");
-            DingUserInfo userInfo = JSONUtil.toBean(resultJson, DingUserInfo.class);
-            // 设置一下job_number
-            userInfo.setJobNumber(resultJson.getStr("job_number"));
-            userInfo.setAppId(dingConfigBean.getAppKey());
-            return userInfo;
-        }
+
+        DingUserInfo userInfo = doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/get",
+                JSONUtil.createObj().putOpt("userid", ddUserId), new TypeReference<DingResponse<DingUserInfo>>() {
+                }).getResult();
+        // 设置一下job_number
+        userInfo.setJobNumber(userInfo.getJobNumber());
+        userInfo.setAppId(dingConfigBean.getAppKey());
+        return userInfo;
    }

    /**
@@ -168,16 +199,10 @@ public class PlatformDingConfig {
        if (StrUtil.isEmpty(token)) {
            return new ArrayList<>();
        }
-        try (HttpResponse response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/department/listsub?access_token=" + token)
-                .body(JSONUtil.createObj().putOpt("dept_id", deptId).toString()).execute()) {
-            DingResponse<List<DingDeptVo>> result = JSONUtil.toBean(response.body(), new TypeReference<DingResponse<List<DingDeptVo>>>() {
-            }.getType(), true);

-            if (!result.isOk()) {
-                result.setResult(new ArrayList<>());
-            }
-            return result.getResult();
-        }
+        return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/department/listsub",
+                JSONUtil.createObj().putOpt("dept_id", deptId), new TypeReference<DingResponse<List<DingDeptVo>>>() {
+                }).getResult();
    }


@@ -192,20 +217,17 @@ public class PlatformDingConfig {
        if (StrUtil.isEmpty(token)) {
            return DingUserListVo.fail();
        }
-        try (HttpResponse response = HttpRequest.post("https://oapi.dingtalk.com/topapi/v2/user/list?access_token=" + token)
-                .body(JSONUtil.createObj().putOpt("dept_id", deptId).putOpt("cursor", cursor).putOpt("size", 100).toString())
-                .execute()) {
-            DingResponse<DingUserListVo> result = JSONUtil.toBean(response.body(), new TypeReference<DingResponse<DingUserListVo>>() {
-            }.getType(), true);
-            if (!result.isOk()) {
-                result.setResult(DingUserListVo.fail());
-            }
-            return result.getResult();
-        }
+
+        return doRequest(service, "https://oapi.dingtalk.com/topapi/v2/user/list",
+                JSONUtil.createObj().putOpt("dept_id", deptId).putOpt("cursor", cursor).putOpt("size", 100),
+                new TypeReference<DingResponse<DingUserListVo>>() {
+                }).getResult();
    }

    /**
     * 同步钉钉的通讯录
+     * <br />
+     * PS：如果需要钉钉用户手机号，需要开通权限：企业员工手机号信息
     *
     * @param deptVo   为null时从第一级获取
     * @param consumer 回调
@@ -244,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);

@@ -263,17 +286,18 @@ public class PlatformDingConfig {
        msg.set("msgtype", "action_card");
        msg.set("action_card", actionCard);

-        HashMap<String, Object> body = new HashMap<>(10);
-        body.put("agent_id", configBean.getAgentId());
-        body.put("userid_list", CollUtil.join(userIds, ","));
-        body.put("msg", msg);
-        String resp = HttpUtil.post("https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2?access_token=" + getAccessToken(service),
-                JSONUtil.toJsonStr(body));
+        JSONObject body = new JSONObject();
+        body.putOpt("agent_id", configBean.getAgentId());
+        body.putOpt("userid_list", CollUtil.join(userIds, ","));
+        body.putOpt("msg", msg);
+        return doRequest(service, "https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2", body,
+                new TypeReference<DingResponse<String>>() {
+                });
    }

-    ///////////////////////////////////////////////////////////////////////////
-    // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+// setter\getter
+///////////////////////////////////////////////////////////////////////////

    public Map<String, DingConfigBean> getConfigs() {
        return configs;
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingResponse.java
+++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingResponse.java
@@ -6,6 +6,8 @@ public class DingResponse<T> {

    private String errcode;
    private String errmsg;
+    private String ticket;
+    private Long expiresIn;
    private T result;

    ///////////////////////////////////////////////////////////////////////////
@@ -43,4 +45,20 @@ public class DingResponse<T> {
    public void setResult(T result) {
        this.result = result;
    }
+
+    public String getTicket() {
+        return ticket;
+    }
+
+    public void setTicket(String ticket) {
+        this.ticket = ticket;
+    }
+
+    public Long getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(Long expiresIn) {
+        this.expiresIn = expiresIn;
+    }
 }
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingUserInfo.java
+++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingUserInfo.java
@@ -6,10 +6,8 @@ import java.util.List;
 /**
 * @author hao
 */
-public class DingUserInfo {
+public class DingUserInfo extends DingUserSimple {

-    private String name;
-    private String userid;
    private String avatar;
    private String mobile;
    private String email;
@@ -17,7 +15,6 @@ public class DingUserInfo {
    private String nickname;
    private String title;
    private String remark;
-    private String unionid;
    private String appId;
    private List<String> deptIdList;
    private boolean leader;
@@ -34,30 +31,6 @@ public class DingUserInfo {
    // setter\getter
    ///////////////////////////////////////////////////////////////////////////

-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUnionid() {
-        return unionid;
-    }
-
-    public void setUnionid(String unionid) {
-        this.unionid = unionid;
-    }
-
-    public String getUserid() {
-        return userid;
-    }
-
-    public void setUserid(String userid) {
-        this.userid = userid;
-    }
-
    public String getAvatar() {
        return avatar;
    }
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingUserSimple.java
+++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/ding/bean/DingUserSimple.java
@@ -0,0 +1,32 @@
+package com.tiesheng.platform.config.ding.bean;
+
+public class DingUserSimple {
+
+    private String unionid;
+    private String name;
+    private String userid;
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+}
--- a/springboot-poi/pom.xml
+++ b/springboot-poi/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-poi</artifactId>
--- a/springboot-util/.DS_Store
+++ b/springboot-util/.DS_Store
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-util</artifactId>
--- a/springboot-util/src/main/.DS_Store
+++ b/springboot-util/src/main/.DS_Store
--- a/springboot-util/src/main/java/com/tiesheng/util/config/GlobalConfig.java
+++ b/springboot-util/src/main/java/com/tiesheng/util/config/GlobalConfig.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.comparator.VersionComparator;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.HttpGlobalConfig;
 import cn.hutool.log.LogFactory;
@@ -116,7 +117,8 @@ public class GlobalConfig {
            if (FileUtil.exist(folder)) {
                File[] files = FileUtil.ls(folder);
                for (File file : files) {
-                    versions.add(StrUtil.subAfter(file.getAbsolutePath(), htmlDir, true));
+                    String normalize = FileUtil.normalize(file.getAbsolutePath());
+                    versions.add(StrUtil.subAfter(normalize, htmlDir, true));
                }
            }

--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>1.0.13</version>
+        <version>1.1.6</version>
    </parent>

    <artifactId>springboot-web</artifactId>
@@ -85,7 +85,7 @@
        <dependency>
            <groupId>com.tiesheng.springboot-parent</groupId>
            <artifactId>springboot-encrypt</artifactId>
-        </dependency>
+        </dependency><dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>3.1.0</version><scope>compile</scope></dependency>

    </dependencies>

--- a/springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisTimeMetaHandler.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisTimeMetaHandler.java
@@ -19,7 +19,11 @@ public class MybatisTimeMetaHandler implements MetaObjectHandler {
    @Override
    public void insertFill(MetaObject metaObject) {
        // 其中方法参数中第一个是前面自动填充所对应的字段，第二个是要自动填充的值。第三个是指定实体类的对象
-        this.setFieldValByName("createTime", DateUtil.date(), metaObject);
+        Object createTime = getFieldValByName("createTime", metaObject);
+        if (createTime == null) {
+            createTime = DateUtil.date();
+        }
+        this.setFieldValByName("createTime", createTime, metaObject);
        this.setFieldValByName("updateTime", DateUtil.date(), metaObject);
    }

--- a/springboot-web/src/main/java/com/tiesheng/core/config/template/TieshengTemplateHandler.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/config/template/TieshengTemplateHandler.java
@@ -0,0 +1,34 @@
+package com.tiesheng.core.config.template;
+
+import com.tiesheng.core.pojos.dto.TemplateDealDTO;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TieshengTemplateHandler implements ToolTemplateHandler {
+    @Override
+    public String handler(TemplateDealDTO dto) {
+        return "";
+    }
+
+    @Override
+    public String getTemplateUrl() {
+        return "";
+    }
+
+    @Override
+    public Object getParms(Object params) {
+        return "";
+    }
+
+
+    @Override
+    public String getAction() {
+        return "";
+    }
+
+    @Override
+    public int getSort() {
+        return 0;
+    }
+
+}
--- a/springboot-web/src/main/java/com/tiesheng/core/config/template/ToolTemplateHandler.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/config/template/ToolTemplateHandler.java
@@ -0,0 +1,54 @@
+package com.tiesheng.core.config.template;
+
+import cn.hutool.core.util.StrUtil;
+import com.tiesheng.core.pojos.dto.TemplateDealDTO;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface ToolTemplateHandler {
+
+
+    /**
+     * 处理对象
+     *
+     * @param dto
+     * @return
+     */
+    String handler(TemplateDealDTO dto);
+
+
+    /**
+     * 获取模版地址
+     *
+     * @return
+     */
+    String getTemplateUrl();
+
+    Object getParms(Object params);
+
+
+    /**
+     * 动作说明（唯一）
+     *
+     * @return
+     */
+    String getAction();
+
+
+    /**
+     * 排序，如果action相同，只会使用sort大的来处理
+     *
+     * @return
+     */
+    int getSort();
+
+    /**
+     * 获取模版ID
+     *
+     * @return
+     */
+    default String getTeamplateId() {
+        return StrUtil.format("{}_{}", getAction(), getSort());
+    }
+
+}
--- a/springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java
@@ -2,20 +2,26 @@ package com.tiesheng.core.controller;


 import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
-import com.tiesheng.core.pojos.dto.ChunkCheckDTO;
-import com.tiesheng.core.pojos.dto.ChunkMergeDTO;
-import com.tiesheng.core.pojos.dto.ChunkStartDTO;
-import com.tiesheng.core.pojos.dto.ImageCodeDTO;
+import com.tiesheng.core.config.template.ToolTemplateHandler;
+import com.tiesheng.core.pojos.dto.*;
+import com.tiesheng.core.pojos.vo.TemplateInfoVO;
 import com.tiesheng.core.pojos.vo.PicVerifyVo;
 import com.tiesheng.core.service.FileUploadService;
 import com.tiesheng.core.service.TimedCacheService;
+import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
 * 工具类
 *
@@ -29,6 +35,8 @@ public class ToolController {
    TimedCacheService timedCacheService;
    @Autowired
    FileUploadService fileUploadService;
+    @Autowired
+    List<ToolTemplateHandler> templateHandlerList;


    /**
@@ -117,4 +125,40 @@ public class ToolController {
    }


+    @TokenIgnore
+    @GetMapping("/template/info")
+    public ApiResp<TemplateInfoVO> templateInfo(TemplateInfoDTO dto) {
+
+        List<ToolTemplateHandler> collect = templateHandlerList.stream()
+                .filter(it -> Objects.equals(it.getAction(), dto.getAction()))
+                .sorted((it, it2) -> it2.getSort() - it.getSort())
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(collect)) {
+            throw new ApiException("没有找到对应的模版");
+        }
+
+        ToolTemplateHandler toolTemplateHandler = collect.get(0);
+
+        TemplateInfoVO template = new TemplateInfoVO();
+        template.setTemplateUrl(toolTemplateHandler.getTemplateUrl());
+        template.setParams(toolTemplateHandler.getParms(dto.getParams()));
+        template.setTemplateId(toolTemplateHandler.getTeamplateId());
+
+        return ApiResp.respOK(template);
+    }
+
+    @TokenIgnore
+    @PostMapping("/template/deal")
+    public ApiResp<String> templateDeal(@RequestBody TemplateDealDTO dto) {
+
+        List<ToolTemplateHandler> collect = templateHandlerList.stream().
+                filter(it -> Objects.equals(it.getTeamplateId(), dto.getTemplateId()))
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(collect)) {
+            throw new ApiException("模版ID不存在");
+        }
+
+        return ApiResp.respOK(collect.get(0).handler(dto));
+    }
+
 }
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateDealDTO.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateDealDTO.java
@@ -0,0 +1,40 @@
+package com.tiesheng.core.pojos.dto;
+
+import javax.validation.constraints.NotEmpty;
+
+public class TemplateDealDTO {
+
+    @NotEmpty(message = "模版ID")
+    private String templateId;
+    @NotEmpty(message = "文件路径必填")
+    private String file;
+    private Object params;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+}
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateInfoDTO.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateInfoDTO.java
@@ -0,0 +1,28 @@
+package com.tiesheng.core.pojos.dto;
+
+
+public class TemplateInfoDTO {
+
+    private String action;
+    private Object params;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+}
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/TemplateInfoVO.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/TemplateInfoVO.java
@@ -0,0 +1,37 @@
+package com.tiesheng.core.pojos.vo;
+
+
+public class TemplateInfoVO {
+
+    private String templateId;
+    private String templateUrl;
+    private Object params;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateUrl() {
+        return templateUrl;
+    }
+
+    public void setTemplateUrl(String templateUrl) {
+        this.templateUrl = templateUrl;
+    }
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+}
--- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java
+++ b/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;
+    }
+
+
    /**
     * 刷新功能点
     *
--- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreMessageService.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/service/CoreMessageService.java
@@ -28,10 +28,38 @@ public class CoreMessageService {
    CoreLogMessageMapper coreLogMessageMapper;


+    /**
+     * 插入数据
+     *
+     * @param reqResp
+     */
+    private void insertMessageLog(MessageReqResp reqResp) {
+        if (reqResp == null) {
+            return;
+        }
+        coreLogMessageMapper.insert(BeanUtil.copyProperties(reqResp, CoreLogMessage.class));
+    }
+
+    /**
+     * 发送所有消息
+     *
+     * @param userIds
+     * @param body
+     */
+    public void all(List<String> userIds, JSONObject body) {
+        messageSenderList.stream().filter(TieshengMessageSender::support)
+                .forEach(sender -> {
+                    for (String user : userIds) {
+                        insertMessageLog(sender.send(user, body));
+                    }
+                });
+    }
+
+
    /**
     * 发送消息
     *
-     * @param title
+     * @param channels
     * @param body
     * @param channels 消息通道，如果为all时，表示发送全部通道
     */
@@ -41,12 +69,8 @@ public class CoreMessageService {
        }

        messageSenderList.stream().filter(TieshengMessageSender::support)
-                .forEach(sender -> {
-                    channels.stream().filter(it -> Objects.equals(it.getChannel(), sender.getChannel())).forEach(it -> {
-                        MessageReqResp reqResp = sender.send(it.getUser(), body);
-                        coreLogMessageMapper.insert(BeanUtil.copyProperties(reqResp, CoreLogMessage.class));
-                    });
-                });
+                .forEach(sender -> channels.stream().filter(it -> Objects.equals(it.getChannel(), sender.getChannel()))
+                        .forEach(it -> insertMessageLog(sender.send(it.getUser(), body))));
    }


@@ -54,7 +78,6 @@ public class CoreMessageService {
     * 发送消息
     *
     * @param userChannel
-     * @param title
     * @param body
     */
    public MessageReqResp send(UserChannel userChannel, JSONObject body) {
@@ -67,7 +90,7 @@ public class CoreMessageService {
                sender -> Objects.equals(sender.getChannel(), userChannel.getChannel()) && sender.support());
        if (messageSender != null) {
            MessageReqResp reqResp = messageSender.send(userChannel.getUser(), body);
-            coreLogMessageMapper.insert(BeanUtil.copyProperties(reqResp, CoreLogMessage.class));
+            insertMessageLog(reqResp);
            return reqResp;
        }
        return null;
--- a/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java
+++ b/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)
-        );
-    }
-

 }
--- a/springboot-web/src/main/java/com/tiesheng/core/util/CharacterUtils.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/util/CharacterUtils.java
@@ -0,0 +1,44 @@
+package com.tiesheng.core.util;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+
+import java.util.Map;
+
+public class CharacterUtils {
+
+
+    /**
+     * 移除特殊字符
+     *
+     * @param o 类
+     */
+    public static void removeSymbol(Object o) {
+        removeSymbol(o, "\n|\r|\t| ");
+    }
+
+    /**
+     * 移除特殊字符
+     *
+     * @param o 类
+     * @param searchStr 规则
+     */
+    public static void removeSymbol(Object o, String searchStr) {
+        JSONObject object = JSONUtil.parseObj(o, false);
+        for (Map.Entry<String, Object> entry : object) {
+            if (ObjectUtil.isEmpty(entry.getValue()) || StrUtil.equals("null", String.valueOf(entry.getValue()))) {
+                entry.setValue("");
+                continue;
+            }
+            if (StrUtil.isNotEmpty(entry.getKey())) {
+                entry.setValue(StrUtil.trim(StrUtil.replace(entry.getValue().toString(), searchStr, "")));
+            }
+        }
+        BeanUtil.copyProperties(object, o);
+    }
+
+}
Author	SHA1	Message	Date
曾文豪	ca96685022	publish 1.1.6 All checks were successful / local-deploy (push) Successful in 20s Details	2025-05-27 13:20:03 +08:00
曾文豪	0e6bee4714	publish 1.1.5	2024-06-19 13:54:11 +08:00
曾文豪	ae67cc53ec	Merge branch 'new_characterUtils' into 'master' 优化移除特殊字符方法 See merge request tiesheng/tiesheng!5	2024-06-19 05:53:24 +00:00
‘毛文春’	419cb06ff6	feat:新增字符串处理工具类	2024-06-19 13:53:01 +08:00
曾文豪	384ac928e3	publish 1.1.4	2024-06-19 13:46:50 +08:00
曾文豪	130cd45de2	Merge branch 'new_CharacterUtil' into 'master' 新增字符串处理工具类 See merge request tiesheng/tiesheng!4	2024-06-19 05:45:11 +00:00
‘毛文春’	6840faa9d8	feat:新增字符串处理工具类	2024-06-19 13:44:53 +08:00
曾文豪	b6caecf140	publish 1.1.3	2024-06-11 16:11:14 +08:00
曾文豪	fdcb1614cc	test：测试一下接口	2024-04-22 14:22:43 +08:00
曾文豪	88bc553213	publish 1.1.2	2024-04-17 13:56:38 +08:00
曾文豪	5942c4cea4	publish 1.1.1	2024-04-17 13:46:51 +08:00
曾文豪	ef34146563	publish 1.1.0	2024-04-16 20:00:41 +08:00
曾文豪	1c8bc648ea	Revert "publish 1.0.24-test2" This reverts commit `b4334f4a5b`.	2024-04-15 13:57:07 +08:00
曾文豪	144ca50fea	Revert "publish 1.0.24-test3" This reverts commit `1d2cabb048`.	2024-04-15 13:56:55 +08:00
曾文豪	1d2cabb048	publish 1.0.24-test3	2024-04-15 13:36:50 +08:00
曾文豪	b4334f4a5b	publish 1.0.24-test2	2024-04-15 13:09:00 +08:00
曾文豪	ce44e4a05a	Revert "publish 1.0.24-test" This reverts commit `a7024f7a8d`.	2024-04-15 12:34:59 +08:00
曾文豪	a7024f7a8d	publish 1.0.24-test	2024-04-15 12:31:15 +08:00
曾文豪	c2fe494ed9	publish 1.0.24	2024-04-13 10:51:03 +08:00
曾文豪	07de3f6ba7	feat：获取系统配置增加一个方法	2024-04-13 10:50:37 +08:00
曾文豪	1c521e5378	fix：修复token是否有效的判定条件	2024-04-13 10:45:57 +08:00
曾文豪	e98e98d659	publish 1.0.23	2024-02-28 09:36:58 +08:00
曾文豪	75d052bd0c	perf：钉钉工作通知的内容完全自定义	2024-02-28 09:36:21 +08:00
曾文豪	3758826987	perf：更新一个文案	2024-02-23 16:17:17 +08:00
曾文豪	8a4cf8e439	publish 1.0.22	2024-01-31 17:34:25 +08:00
曾文豪	09203ac78d	publish 1.0.21	2024-01-31 17:06:54 +08:00
曾文豪	ef5861327c	publish 1.0.20	2024-01-24 13:42:17 +08:00
曾文豪	23faaa8f67	publish 1.0.19	2024-01-11 11:29:45 +08:00
曾文豪	341c82e0bc	perf：创建时间可以自行设置	2024-01-11 11:29:03 +08:00
曾文豪	d2d53523a8	publish 1.0.18	2024-01-09 17:51:27 +08:00
曾文豪	fc00bad49a	publish 1.0.17	2023-12-27 15:46:16 +08:00
曾文豪	6dd4e19e39	publish 1.0.16	2023-12-06 16:43:31 +08:00
曾文豪	4373ec7c0e	publish 1.0.15	2023-11-20 16:23:18 +08:00
曾文豪	5cc135d8e2	fix：兼容windows服务器的路径问题	2023-11-20 16:22:49 +08:00
曾文豪	69a9681b48	publish 1.0.14	2023-08-22 09:29:12 +08:00
曾文豪	6c39dc24bd	chore：更新ci	2023-08-22 09:28:06 +08:00