publish 2.0.14

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.13</version>
+    <version>2.0.14</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.13</version>
+                <version>2.0.14</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

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

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

@@ -67,7 +67,7 @@ public class TestController {
     @RequestMapping("/index")
     @TokenIgnore
     public void index(HttpServletResponse response) {
-        globalConfig.redirect("mobile", "/test", response);
+        globalConfig.redirectWithVer("mobile", "/test", response);
     }
 
     @RequestMapping("/redirect")
@@ -75,7 +75,8 @@ public class TestController {
     @RoleAuthority("redirect")
     public ApiResp<JsonTest> redirect(HttpServletResponse response) {
 
-        encryptConfig.passwdCreate("111111@Zz", "");
+        String s1 = encryptConfig.passwdCreate("qU3?wE3{bX", "");
+        LogFactory.get().info(s1);
 
         JsonTest jsonTest = new JsonTest();
         jsonTest.setNow(DateUtil.date());

springboot-annotation/pom.xml

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

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.13</version>
+        <version>2.0.14</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-login/src/main/resources/db/migration/core_login_init.sql

@@ -17,7 +17,8 @@ CREATE TABLE `core_log_login`
     `address`     varchar(255)         DEFAULT NULL COMMENT 'ip地址',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='日志-登录';
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='日志-登录';
 
 -- ----------------------------
 -- Table structure for core_platform_unique
@@ -35,6 +36,7 @@ CREATE TABLE `core_platform_unique`
     `info`        text COMMENT '其他参数',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='平台-唯一值';
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='平台-唯一值';
 
 SET FOREIGN_KEY_CHECKS = 1;

springboot-message/pom.xml

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

springboot-role/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.13</version>
+        <version>2.0.14</version>
     </parent>
 
     <artifactId>springboot-role</artifactId>

springboot-role/src/main/resources/db/migration/tiesheng_init_role.sql

@@ -24,6 +24,7 @@ create table core_role_authority
     ext3        varchar(500)               null comment '扩展3'
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci
     comment '角色-权限';
 
 create table core_role_group
@@ -43,6 +44,7 @@ create table core_role_group
     ext3        varchar(500)     null comment '扩展3'
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci
     comment '角色-分组';
 
 create table core_role_group_rx
@@ -56,6 +58,7 @@ create table core_role_group_rx
     menu_id     varchar(50)      not null comment '菜单id'
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci
     comment '角色-分组-关系';
 
 create table core_role_server
@@ -76,6 +79,7 @@ create table core_role_server
     ext3        varchar(500)     null comment '扩展3'
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci
     comment '角色-服务';
 
 create table core_role_user
@@ -94,6 +98,7 @@ create table core_role_user
     ext3        varchar(500)     null comment '扩展3'
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci
     comment '角色-用户';
 
 alter table core_role_authority

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.13</version>
+        <version>2.0.14</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-util/src/main/java/com/tiesheng/util/config/GlobalConfig.java

@@ -95,12 +95,13 @@ public class GlobalConfig {
 
 
     /**
-     * 重定向
+     * 构建待版本号的路径
      *
-     * @param htmlDir 资源目录
+     * @param htmlDir
      * @param route
+     * @return
      */
-    public void redirect(String htmlDir, String route, HttpServletResponse response) {
+    public String buildByVersion(String htmlDir, String route) {
         if (!StrUtil.endWith(htmlDir, "/")) {
             htmlDir = htmlDir + "/";
         }
@@ -129,16 +130,32 @@ public class GlobalConfig {
                 throw new ApiException("无法重定向，请检查资源");
             }
             CollUtil.sort(versions, (o1, o2) -> -VersionComparator.INSTANCE.compare(o1, o2));
-            String path = buildPath(String.format("/%s%s/index.html#%s", htmlDir, versions.get(0), route));
-            response.sendRedirect(path);
+            return buildPath(String.format("/%s%s/index.html#%s", htmlDir, versions.get(0), route));
         } catch (IOException e) {
             LogFactory.get().info(e);
         }
+        return "";
     }
 
+
+    /**
+     * 重定向
+     *
+     * @param htmlDir 资源目录
+     * @param route
+     */
+    public void redirectWithVer(String htmlDir, String route, HttpServletResponse response) {
+        try {
+            response.sendRedirect(buildByVersion(htmlDir, route));
+        } catch (Exception ignored) {
+        }
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
 
     public String getUploadDir() {

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.13</version>
+        <version>2.0.14</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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

@@ -13,7 +13,8 @@ CREATE TABLE `core_config_enum`
     `ext`         varchar(255)         DEFAULT NULL COMMENT '扩展字段',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='配置-枚举';
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='配置-枚举';
 
 
 CREATE TABLE `core_config_system`
@@ -31,7 +32,8 @@ CREATE TABLE `core_config_system`
     PRIMARY KEY (`id`),
     UNIQUE KEY `uni_key` (`config_key`(50)) USING BTREE
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='配置-系统';
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='配置-系统';
 
 alter table core_config_enum
     add sort int(10) not null default 0 comment '排序' after name;

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

@@ -18,6 +18,7 @@ CREATE TABLE `core_log_api`
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci
   ROW_FORMAT = DYNAMIC COMMENT ='日志-调用';
 
 -- ----------------------------
@@ -69,7 +70,8 @@ CREATE TABLE `core_log_operation`
     `params`      longtext COMMENT '其他参数',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='日志-操作';
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='日志-操作';
 
 
 alter table core_log_process