publish 1.0.8

可根据情况存放如OSS之类的

CHANGELOG.md

@@ -1,9 +1,20 @@
+## 1.0.7
+
+## 新增
+
+> feat(web): 增加uploadFileCustomize方法，允许自定义文件存放情况  
+> feat(database): 增加db/data目录，存放初始化数据的sql  
+
+## 优化
+
+> perf(login): 增加默认值，防止token解析异常
+
 ## 1.0.6
 
 ### 新增
 
 > 1，新增 **OperationIgnore** 注解，可以指定接口忽略操作日志的收集。  
-> 2，**OperationLog** 增加 desensitize 属性，用来脱敏指定的字段。  
+> 2，**OperationLog** 增加 desensitize 属性，用来脱敏指定的字段。
 
 ## 1.0.2
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.8</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.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>1.0.6</version>
+                <version>1.0.8</version>
             </dependency>
 
             <dependency>
@@ -136,7 +136,7 @@
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
                     <artifactId>tiesheng-maven-plugin</artifactId>
-                    <version>0.0.5</version>
+                    <version>0.0.6</version>
                     <executions>
                         <execution>
                             <goals>

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>

springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java

@@ -25,10 +25,7 @@ import com.tiesheng.util.config.Ip2regionConfig;
 import com.tiesheng.util.pojos.ApiResp;
 import com.tiesheng.util.pojos.FileUploadPath;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -92,11 +89,11 @@ public class TestController {
     }
 
 
-    @PostMapping("/send")
+    @GetMapping("/send")
-    @OperationLog(desensitize = "fdyNo")
+    @TokenIgnore
-    public ApiResp<MessageReqResp> sendMessage(@RequestBody @Valid PoiBean dto) {
+    public ApiResp<MessageReqResp> sendMessage() {
 
-        MessageReqResp reqResp = coreMessageService.send(new UserChannel(dto.getFdyNo(), "sms"),
+        MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"),
                 JSONUtil.createObj().putOpt("code", "123456").putOpt("template_code", "SMS_154950909"));
 
         return ApiResp.respOK(reqResp);

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</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.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-database/src/main/java/com/tiesheng/database/config/DbMigrationConfig.java

@@ -20,7 +20,8 @@ import java.util.List;
 public class DbMigrationConfig {
 
     private String table = "core_config_db";
-    private List<String> locations = CollUtil.newArrayList("classpath*:db/migration/*.sql");
+    private List<String> migrations = CollUtil.newArrayList("classpath*:db/migration/*.sql");
+    private List<String> datas = CollUtil.newArrayList("classpath*:db/data/*.sql");
     private String ignoreSqls = "drop table,delete from";
 
     /**
@@ -57,12 +58,20 @@ public class DbMigrationConfig {
         this.table = table;
     }
 
-    public List<String> getLocations() {
+    public List<String> getMigrations() {
-        return locations;
+        return migrations;
     }
 
-    public void setLocations(List<String> locations) {
+    public void setMigrations(List<String> migrations) {
-        this.locations = locations;
+        this.migrations = migrations;
+    }
+
+    public List<String> getDatas() {
+        return datas;
+    }
+
+    public void setDatas(List<String> datas) {
+        this.datas = datas;
     }
 
     public String getIgnoreSqls() {

springboot-database/src/main/java/com/tiesheng/database/service/DbMigrationInitializer.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Db;
 import cn.hutool.db.Entity;
-import cn.hutool.log.LogFactory;
 import com.tiesheng.database.config.DbMigrationConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
@@ -38,17 +37,24 @@ public class DbMigrationInitializer implements ServletContextInitializer {
     DataSource dataSource;
     @Autowired
     DbMigrationConfig dbMigrationConfig;
-    @Autowired(required = false)
+    @Autowired
     List<DbDataInitializer> dbDataInitializerList;
 
 
     @Override
     public void onStartup(ServletContext servletContext) {
         try {
-            startDeal();
+
-            if (dbDataInitializerList != null) {
+            // 初始化
-                dbDataInitializerList.forEach(DbDataInitializer::init);
+            Db coreDb = Db.use(dataSource);
-            }
+            dbMigrationConfig.checkDbExists(coreDb);
+
+            startDeal(coreDb, dbMigrationConfig.getMigrations());
+            startDeal(coreDb, dbMigrationConfig.getDatas());
+
+            // 其他数据初始化
+            dbDataInitializerList.forEach(DbDataInitializer::init);
+
         } catch (Exception ignore) {
         }
     }
@@ -59,18 +65,13 @@ public class DbMigrationInitializer implements ServletContextInitializer {
      *
      * @throws Exception
      */
-    private void startDeal() throws Exception {
+    private void startDeal(Db coreDb, List<String> locations) throws Exception {
-        Db coreDb = Db.use(dataSource);
-        dbMigrationConfig.checkDbExists(coreDb);
-
         PathMatchingResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver();
         List<Resource> resourceList = new ArrayList<>();
-        for (String location : dbMigrationConfig.getLocations()) {
+        for (String location : locations) {
             Resource[] resources = patternResolver.getResources(location);
             resourceList.addAll(Arrays.asList(resources));
         }
-
-        // 排序后执行sql
         resourceList.sort((o1, o2) -> StrUtil.compare(o1.getFilename(), o2.getFilename(), true));
         for (Resource resource : resourceList) {
             migrationByResource(resource, coreDb);
@@ -94,8 +95,8 @@ public class DbMigrationInitializer implements ServletContextInitializer {
         if (entity == null) {
             return;
         }
-        AtomicReference<Integer> success= new AtomicReference<>(0);
+        AtomicReference<Integer> success = new AtomicReference<>(0);
-        AtomicReference<Integer> fail= new AtomicReference<>(0);
+        AtomicReference<Integer> fail = new AtomicReference<>(0);
         db.tx((VoidFunc1<Db>) parameter -> {
             List<String> split = StrUtil.split(readUtf8, ";");
             for (String sql : split) {
@@ -114,7 +115,6 @@ public class DbMigrationInitializer implements ServletContextInitializer {
                 }
             }
         });
-        LogFactory.get().info("执行sql文件{},成功数：{}，失败数：{}。",filename,success.get(),fail.get());
         entity.set("checksum", checksum.getValue());
         entity.set("update_time", DateUtil.date());
         db.update(entity, Entity.create(dbMigrationConfig.getTable()).set("id", entity.get("id")));

springboot-database/src/main/java/com/tiesheng/database/service/impl/DefaultDbDataInitializer.java

@@ -0,0 +1,13 @@
+package com.tiesheng.database.service.impl;
+
+import com.tiesheng.database.service.DbDataInitializer;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DefaultDbDataInitializer implements DbDataInitializer {
+    
+    @Override
+    public void init() {
+
+    }
+}

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</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.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-login/src/main/java/com/tiesheng/login/config/token/bean/TokenBean.java

@@ -1,6 +1,7 @@
 package com.tiesheng.login.config.token.bean;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.jwt.JWT;
 import com.tiesheng.login.config.token.TsTokenConfig;
@@ -34,9 +35,9 @@ public class TokenBean {
         return JWT.create()
                 .setExpiresAt(DateUtil.offsetHour(DateUtil.date(), tsTokenConfig.getExpireHours()))
                 .setPayload("id", getId())
-                .setPayload("environmentType", getEnvironmentType())
+                .setPayload("environmentType", StrUtil.emptyToDefault(getEnvironmentType(), ""))
-                .setPayload("service", getService())
+                .setPayload("service", StrUtil.emptyToDefault(getService(), ""))
-                .setPayload("extra", getExtra())
+                .setPayload("extra", StrUtil.emptyToDefault(getExtra(), ""))
                 .setKey(tsTokenConfig.getEncryptKey().getBytes())
                 .sign();
     }

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

@@ -159,7 +159,7 @@ public class LoginController {
         if (StrUtil.isEmpty(extra)) {
             extra = "";
         }
-        String configUrl = globalConfig.buildPath("/auth/wxmp/oauth2/" + service + "?extra=" + extra);
+        String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
         String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
         response.sendRedirect(authorizationUrl);
     }

springboot-login/src/main/resources/static/ding/index.html

@@ -24,7 +24,7 @@
     corpId: getQueryString("corpId"),
     onSuccess: function (result) {
       let search = window.location.search + "&code=" + result.code;
-      window.location.href = "/auth/ding/oauth2/" + getQueryString("service") + search;
+      window.location.href = "/login/ding/oauth2/" + getQueryString("service") + search;
     },
     onFail: function (err) {
       window.location.href = "./error.html?message=" + JSON.stringify(err);

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</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.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</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.6</version>
+        <version>1.0.8</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.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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

@@ -3,6 +3,7 @@ package com.tiesheng.core.service;
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.pojos.FileUploadPath;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,11 @@ public class FileUploadService {
     public String saveMultipartFile(MultipartFile file) {
         try {
 
+            String fileHttpPath = tieshengWebConfigurer.uploadFileCustomize(file);
+            if (!StrUtil.isEmpty(fileHttpPath)) {
+                return fileHttpPath;
+            }
+
             String fileType = FileTypeUtil.getType(file.getInputStream(), file.getOriginalFilename());
             tieshengWebConfigurer.uploadFileCheck(fileType);
 

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

@@ -7,6 +7,7 @@ import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.util.exception.ApiRespEnum;
 import com.tiesheng.util.pojos.ApiResp;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -45,6 +46,16 @@ public interface TieshengWebConfigurer {
     default void uploadFileCheck(String fileExt) {
     }
 
+
+    /**
+     * 自定义文件上传
+     *
+     * @return
+     */
+    default String uploadFileCustomize(MultipartFile file) {
+        return "";
+    }
+
     /**
      * 上传文件后处理文件
      *

springboot-web/src/main/resources/db/data/core_config_system_data.sql

@@ -0,0 +1,18 @@
+-- ----------------------------
+-- Table for data
+-- ----------------------------
+
+INSERT INTO `core_config_system`(`id`, `create_time`, `update_time`, `is_deleted`, `config_key`, `config_val`,
+                                 `config_type`, `remark`, `extra`, `read_only`)
+VALUES ('manager_web_copyright', '2022-02-23 16:52:48', '2022-02-23 16:52:49', 0, 'manager_web_copyright',
+        '杭州铁晟提供技术支持', 0, '网站底部版权信息', '', 0);
+
+INSERT INTO `core_config_system`(`id`, `create_time`, `update_time`, `is_deleted`, `config_key`, `config_val`,
+                                 `config_type`, `remark`, `extra`, `read_only`)
+VALUES ('manager_web_title', '2022-02-24 11:56:53', '2022-02-24 11:56:53', 0, 'manager_web_title', '网站名称', 0,
+        '网站名称', '', 0);
+
+INSERT INTO `core_config_system`(`id`, `create_time`, `update_time`, `is_deleted`, `config_key`, `config_val`,
+                                 `config_type`, `remark`, `extra`, `read_only`)
+VALUES ('manager_web_logo', '2022-02-24 11:56:53', '2022-02-24 11:56:53', 0, 'manager_web_logo', '', 1,
+        '网站LOGO', '', 0);

springboot-web/src/main/resources/db/migration/tiesheng_init_config.sql

@@ -50,23 +50,4 @@ CREATE TABLE `core_config_func`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='职位-功能点';
 
--- ----------------------------
--- Table for data
--- ----------------------------
-
-INSERT INTO `core_config_system`(`id`, `create_time`, `update_time`, `is_deleted`, `config_key`, `config_val`,
-                                 `config_type`, `remark`, `extra`, `read_only`)
-VALUES ('manager_web_copyright', '2022-02-23 16:52:48', '2022-02-23 16:52:49', 0, 'manager_web_copyright',
-        '杭州铁晟提供技术支持', 0, '网站底部版权信息', '', 0);
-
-INSERT INTO `core_config_system`(`id`, `create_time`, `update_time`, `is_deleted`, `config_key`, `config_val`,
-                                 `config_type`, `remark`, `extra`, `read_only`)
-VALUES ('manager_web_title', '2022-02-24 11:56:53', '2022-02-24 11:56:53', 0, 'manager_web_title', '网站名称', 0,
-        '网站名称', '', 0);
-
-INSERT INTO `core_config_system`(`id`, `create_time`, `update_time`, `is_deleted`, `config_key`, `config_val`,
-                                 `config_type`, `remark`, `extra`, `read_only`)
-VALUES ('manager_web_logo', '2022-02-24 11:56:53', '2022-02-24 11:56:53', 0, 'manager_web_logo', '', 1,
-        '网站LOGO', '', 0);
-
 SET FOREIGN_KEY_CHECKS = 1;