publish icbc-sandbox-1.0.0

.gitea/workflows/mvn-deploy-icbc-sandbox.yml

@@ -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                    

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.0.16</version>
+    <version>icbc-sandbox-1.0.0</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.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>1.0.16</version>
+                <version>icbc-sandbox-1.0.0</version>
             </dependency>
 
             <dependency>
@@ -130,6 +130,13 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <distributionManagement>
+        <repository>
+            <id>gitea</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+        </repository>
+    </distributionManagement>
+
     <build>
         <pluginManagement>
             <plugins>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.16</version>
+        <version>icbc-sandbox-1.0.0</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>1.0.16</version>
+    <version>icbc-sandbox-1.0.0</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.16</version>
+        <version>icbc-sandbox-1.0.0</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.16</version>
+        <version>icbc-sandbox-1.0.0</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.16</version>
+        <version>icbc-sandbox-1.0.0</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.16</version>
+        <version>icbc-sandbox-1.0.0</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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());
@@ -131,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);

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.16</version>
+        <version>icbc-sandbox-1.0.0</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java

@@ -1,9 +1,12 @@
 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.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
+import cn.hutool.extra.validation.ValidationUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -139,7 +142,15 @@ 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;
+        }
+        String templateCode = body.getStr("template_code");
+        if (StrUtil.isEmpty(templateCode)) {
+            return null;
+        }
+        return sendSms(user, templateCode, body);
     }
 
     @Override

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.16</version>
+        <version>icbc-sandbox-1.0.0</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

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;

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;
+    }
 }

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;
     }

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;
+    }
+}

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.16</version>
+        <version>icbc-sandbox-1.0.0</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.16</version>
+        <version>icbc-sandbox-1.0.0</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java

@@ -17,7 +17,6 @@ public class ApiResp<T> {
 
     private int code;
     private String message;
-    private Throwable exception;
     private T data;
     private long recordsTotal = 0;
     private boolean encrypt = false;
@@ -182,11 +181,4 @@ public class ApiResp<T> {
         this.encrypt = encrypt;
     }
 
-    public Throwable getException() {
-        return exception;
-    }
-
-    public void setException(Throwable exception) {
-        this.exception = exception;
-    }
 }

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.16</version>
+        <version>icbc-sandbox-1.0.0</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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);
     }
 

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/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;

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)
-        );
-    }
-
 
 }

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

@@ -115,6 +115,8 @@ public class FileUploadService {
      * @param fileMd5
      */
     public String chunkMerge(String fileMd5, String fileExt) {
+        // 0，校验文件类型是否合法
+        tieshengWebConfigurer.uploadFileCheck(fileExt);
 
         // 1，获取文件块的目录
         FileUploadPath folder = FileUploadPath.folder(fileMd5);

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

@@ -35,8 +35,7 @@ public interface TieshengWebConfigurer {
      */
     default ApiResp<String> addExceptionHandler(Exception e) {
         ApiResp<String> apiResp = ApiResp.respCust(ApiRespEnum.ServerError);
-        apiResp.setException(e);
-        LogFactory.get().info(apiResp.getException());
+        LogFactory.get().info(e);
         return apiResp;
     }