publish 0.2.6

.gitignore

@@ -4,4 +4,4 @@ rebel.xml
 /.idea/
 *.iml
 /static/
-/ipdb/
+/config/

.gitlab-ci.yml

@@ -9,6 +9,9 @@ deploy-jar:
   rules:
     - if: $CI_COMMIT_TAG
   script:
+    - cd springboot-launcher
+    - mvn clean install
+    - cd ..
     - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:/usr/local/nginx/html/kepai-repo
     - cd /usr/local/nginx/html/kepai-repo
     - git checkout master

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.1.2</version>
+    <version>0.2.6</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -28,6 +28,7 @@
         <module>springboot-message</module>
         <module>springboot-encrypt</module>
         <module>springboot-annotation</module>
+        <module>springboot-launcher</module>
     </modules>
 
     <properties>
@@ -57,55 +58,55 @@
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-db-migration</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.1.2</version>
+                <version>0.2.6</version>
             </dependency>
 
             <dependency>
@@ -120,8 +121,47 @@
                 <version>3.5.1</version>
             </dependency>
 
-
         </dependencies>
     </dependencyManagement>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>kepai-repo-plugin</id>
+            <url>http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.tiesheng</groupId>
+                    <artifactId>launcher-maven-plugin</artifactId>
+                    <version>0.0.2</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>initScript</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <configuration>
+                        <!--  把外部jar打包进入项目中   -->
+                        <includeSystemScope>true</includeSystemScope>
+                        <!--  打包后的jar可直接执行   -->
+                        <executable>true</executable>
+                        <embeddedLaunchScript>${basedir}/target/launchScript</embeddedLaunchScript>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
@@ -37,6 +37,10 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>com.tiesheng</groupId>
+                <artifactId>launcher-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java

@@ -1,19 +1,53 @@
 package com.tiesheng.demo.config;
 
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.core.service.TieshengWebConfigurer;
+import com.tiesheng.login.config.token.bean.TokenBean;
+import com.tiesheng.util.config.GlobalConfig;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.Objects;
+
 @Component
 public class DemoWebConfigurer implements TieshengWebConfigurer {
 
+    @Autowired
+    GlobalConfig globalConfig;
+
     @Override
-    public CurrentWebUser getCurrentUserName(String userId) {
+    public CurrentWebUser getCurrentUserName(TokenBean tokenBean) {
         return null;
     }
 
     @Override
     public LoginConfigurer loginConfigurer() {
-        return null;
+        return new LoginConfigurer() {
+            @Override
+            public TokenBean doLogin(CorePlatformUnique platformUnique, String to) {
+
+                // 默认跳转到mobile
+                to = StrUtil.emptyToDefault(to, "mobile");
+
+                TokenBean tokenBean = null;
+                if (!StrUtil.isEmpty(platformUnique.getUserId())) {
+                    tokenBean = new TokenBean(platformUnique.getUserId(), to, globalConfig.getService());
+                } else {
+                    // 获取用户信息判断是否可登录
+                }
+
+                return tokenBean;
+            }
+
+            @Override
+            public void redirect(TokenBean bean, String to, String extra, HttpServletResponse response) {
+                if (Objects.equals(bean.getEnvironmentType(), "mobile")) {
+                    globalConfig.redirect("mobile", "/?token=" + bean.toToken(), response);
+                }
+            }
+        };
     }
 }

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

@@ -1,7 +1,10 @@
 package com.tiesheng.demo.controller;
 
 import cn.hutool.json.JSONUtil;
+import cn.hutool.log.LogFactory;
 import com.tiesheng.annotation.token.TokenIgnore;
+import com.tiesheng.login.config.token.TsTokenConfig;
+import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.message.config.aliyun.AliyunSmsConfig;
 import com.tiesheng.message.pojos.MessageReqResp;
 import com.tiesheng.util.config.GlobalConfig;
@@ -24,17 +27,24 @@ public class TestController {
     GlobalConfig globalConfig;
     @Autowired
     AliyunSmsConfig aliyunSmsConfig;
+    @Autowired
+    TsTokenConfig tsTokenConfig;
 
     @RequestMapping("/index")
     @TokenIgnore
     public ApiResp<String> index() {
+
+        TokenBean tokenBean = new TokenBean("11", "", "fdfd");
+        LogFactory.get().info(tokenBean.toToken());
+
         return ApiResp.respOK("hello world");
     }
 
     @RequestMapping("/redirect")
     @TokenIgnore
     public void redirect(HttpServletResponse response) {
-        globalConfig.redirect("mobile", "/test", response);
+        tsTokenConfig.validToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2NzYwMDY4NzUsImlkIjoiMSIsImVudmlyb25tZW50VHlwZSI6Im1vYmlsZSIsInNlcnZpY2UiOiJjb250ZXN0LXJlc2VydmUiLCJleHRyYSI6IiJ9.nsfxEFpCNHC7eNCS5DJXdu1VDdnHrTjSfgrozND70Lc", true);
+//        globalConfig.redirect("mobile", "/test", response);
     }
 
 
@@ -66,7 +76,7 @@ public class TestController {
     @RequestMapping("/uploadPath")
     @TokenIgnore
     public ApiResp<String> uploadPath() {
-        FileUploadPath uploadPath = FileUploadPath.get("http://scv6.tmp.kepai365.ltd/upload/2023-01/2b4b6b7b-70d0-4683-859a-f799adc4f04c.xls");
+        FileUploadPath uploadPath = FileUploadPath.file("http://scv6.tmp.kepai365.ltd/upload/2023-01/2b4b6b7b-70d0-4683-859a-f799adc4f04c.xls");
         return ApiResp.respOK(uploadPath.getAbsolutePath());
     }
 

springboot-ademo/src/main/resources/application-test.yml

@@ -0,0 +1,28 @@
+## Spring配置
+spring:
+
+  ## 数据库配置
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://47.96.30.85:3306/com_tiesheng_web?useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&queryTimeout=5400&allowMultiQueries=true&serverTimezone=GMT%2B8
+    username: com_tiesheng_web
+    password: 4Xo$XheGFc
+
+platform:
+  wxmp:
+    global:
+      app-id: wxa0343fe519824651
+      app-secret: 776f089ba70bcd66455a7c7893f810b9
+
+tiesheng:
+  token:
+    ignores:
+      "1111":
+        id: "1111"
+  global:
+    version: 2
+    host: http://localhost:8080
+  aliyun:
+    access-key-id: LTAI5tJtbgBCnTY5eS4SmrTf
+    access-key-secret: JIHqpRUFffCHhXaJEVvWN31WcexWqG
+    sign-name: 阿里云短信测试

springboot-ademo/src/main/resources/application.yml

@@ -1,28 +1,21 @@
+server:
+  compression:
+    enabled: true
+
 ## Spring配置
 spring:
 
-  ## 数据库配置
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.96.30.85:3306/com_tiesheng_web?useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&queryTimeout=5400&allowMultiQueries=true&serverTimezone=GMT%2B8
-    username: com_tiesheng_web
-    password: 4Xo$XheGFc
+  servlet:
+    multipart:
+      max-file-size: 20MB
+  web:
+    resources:
+      static-locations: classpath:/static/,file:static/
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
 
-platform:
-  wxmp:
-    global:
-      app-id: wxa0343fe519824651
-      app-secret: 776f089ba70bcd66455a7c7893f810b9
-
-tiesheng:
-  token:
-    ignores:
-      "1111":
-        id: "1111"
-  global:
-    version: 2
-    host: http://localhost:8080
-  aliyun:
-    access-key-id: LTAI5tJtbgBCnTY5eS4SmrTf
-    access-key-secret: JIHqpRUFffCHhXaJEVvWN31WcexWqG
-    sign-name: 阿里云短信测试
+## 日志
+logging:
+  file:
+    name: logs/tiesheng.log

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-db-migration/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>springboot-db-migration</artifactId>

springboot-db-migration/src/main/java/com/tiesheng/migration/config/DbMigrationConfig.java

@@ -19,7 +19,7 @@ import java.util.List;
 @ConfigurationProperties(prefix = "tiesheng.db-migration")
 public class DbMigrationConfig {
 
-    private String table = "core_db_migration";
+    private String table = "core_config_db";
     private List<String> locations = CollUtil.newArrayList("classpath*:db/migration/*.sql");
     private String ignoreSqls = "drop,delete";
 
@@ -41,7 +41,7 @@ public class DbMigrationConfig {
                     "  `file` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名称',\n" +
                     "  `checksum` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件checksum',\n" +
                     "  PRIMARY KEY (`id`) USING BTREE\n" +
-                    ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'db-合并' ROW_FORMAT = Dynamic;");
+                    ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '配置-数据库' ROW_FORMAT = Dynamic;");
         }
     }
 

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-launcher/pom.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.tiesheng</groupId>
+    <artifactId>launcher-maven-plugin</artifactId>
+    <packaging>maven-plugin</packaging>
+    <version>0.0.2</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+    </dependencies>
+
+</project>

springboot-launcher/src/main/java/com/tiesheng/launcher/CopyLauncherScriptMojo.java

@@ -0,0 +1,73 @@
+package com.tiesheng.launcher;
+
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 指定调用本类execute()方法的目标
+ **/
+@Mojo(name = "initScript", defaultPhase = LifecyclePhase.PREPARE_PACKAGE)
+public class CopyLauncherScriptMojo extends AbstractMojo {
+
+    @Parameter(defaultValue = "${basedir}/target", required = true)
+    private File outputDirectory;
+
+    public void setOutputDirectory(File outputDirectory) {
+        this.outputDirectory = outputDirectory;
+    }
+
+
+    @Override
+    public void execute() throws MojoExecutionException {
+        try {
+            copy("launchScript");
+            System.out.println("initScript success.");
+        } catch (IOException e) {
+            throw new MojoExecutionException("copy launchScript error！");
+        }
+    }
+
+
+    /**
+     * 复制脚本
+     *
+     * @param filename
+     * @throws IOException
+     */
+    private void copy(String filename) throws IOException {
+        InputStream inputStream = getClass().getResourceAsStream("/" + filename);
+        BufferedWriter writer = null;
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+            File target = new File(outputDirectory + "/" + filename);
+            target.setExecutable(true, false);
+            target.setWritable(true, false);
+            target.setReadable(true, false);
+            writer = new BufferedWriter(new FileWriter(target));
+            while (true) {
+                String line = reader.readLine();
+                if (line == null) {
+                    break;
+                }
+                writer.write(line);
+                writer.newLine();
+            }
+            writer.flush();
+        } finally {
+            if (inputStream != null) {
+                inputStream.close();
+            }
+            if (writer != null) {
+                writer.close();
+            }
+        }
+    }
+
+}

springboot-launcher/src/main/resources/launchScript

@@ -0,0 +1,99 @@
+#!/bin/bash
+#
+#    .   ____          _            __ _ _
+#   /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
+#  ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
+#   \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
+#    '  |____| .__|_| |_|_| |_\__, | / / / /
+#   =========|_|==============|___/=/_/_/_/
+#   :: Spring Boot Startup Script ::
+#
+
+### BEGIN INIT INFO
+# Provides:          {{initInfoProvides:spring-boot-application}}
+# Required-Start:    {{initInfoRequiredStart:$remote_fs $syslog $network}}
+# Required-Stop:     {{initInfoRequiredStop:$remote_fs $syslog $network}}
+# Default-Start:     {{initInfoDefaultStart:2 3 4 5}}
+# Default-Stop:      {{initInfoDefaultStop:0 1 6}}
+# Short-Description: {{initInfoShortDescription:Spring Boot Application}}
+# Description:       {{initInfoDescription:Spring Boot Application}}
+# chkconfig:         {{initInfoChkconfig:2345 99 01}}
+### END INIT INFO
+
+[[ -n "$DEBUG" ]] && set -x
+
+# Initialize variables that cannot be provided by a .conf file
+WORKING_DIR="$(pwd)"
+# shellcheck disable=SC2153
+[[ -n "$JARFILE" ]] && jarfile="$JARFILE"
+[[ -n "$APP_NAME" ]] && identity="$APP_NAME"
+
+# Follow symlinks to find the real jar and detect init.d script
+cd "$(dirname "$0")" || exit 1
+[[ -z "$jarfile" ]] && jarfile=$(pwd)/$(basename "$0")
+while [[ -L "$jarfile" ]]; do
+  [[ "$jarfile" =~ init\.d ]] && init_script=$(basename "$jarfile")
+  jarfile=$(readlink "$jarfile")
+  cd "$(dirname "$jarfile")" || exit 1
+  jarfile=$(pwd)/$(basename "$jarfile")
+done
+jarfolder="$( (cd "$(dirname "$jarfile")" && pwd -P) )"
+cd "$WORKING_DIR" || exit 1
+
+# ANSI Colors
+echoRed() { echo $'\e[0;31m'"$1"$'\e[0m'; }
+echoGreen() { echo $'\e[0;32m'"$1"$'\e[0m'; }
+echoYellow() { echo $'\e[0;33m'"$1"$'\e[0m'; }
+
+# Determine the user to run as if we are root
+# shellcheck disable=SC2012
+[[ $(id -u) == "0" ]] && run_user=$(ls -ld "$jarfile" | awk '{print $3}')
+
+# Find Java
+if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
+    javaexe="$JAVA_HOME/bin/java"
+elif type -p java > /dev/null 2>&1; then
+    javaexe=$(type -p java)
+elif [[ -x "/usr/bin/java" ]];  then
+    javaexe="/usr/bin/java"
+else
+    echo "Unable to find Java"
+    exit 1
+fi
+
+
+## 配置service
+service() {
+
+  tempCahr='$'
+
+  ## 创建service文件
+  working_dir=$(dirname "$jarfile")
+  service_file="/etc/systemd/system/$1.service"
+
+  echo "[Unit]" > $service_file
+  echo "Description=$1" >> $service_file
+  echo "After=rc-local.service network.target remote-fs.target nss-lookup.target" >> $service_file
+
+  echo "" >> $service_file
+  echo "[Service]" >> $service_file
+  echo "Type=forking" >> $service_file
+  echo "WorkingDirectory=$working_dir" >> $service_file
+  echo "ExecStart=/bin/sh -c '$javaexe -Xms64m -Xmx128m -Dserver.port=$2 -Dspring.profiles.active=$3 -jar $jarfile > /dev/null 2>&1 &'" >> $service_file
+  echo "ExecReload=/bin/kill -s HUP ${tempCahr}MAINPID" >> $service_file
+  echo "ExecStop=/bin/kill -s QUIT ${tempCahr}MAINPID" >> $service_file
+
+  echo "" >> $service_file
+  echo "[Install]" >> $service_file
+  echo "WantedBy=multi-user.target" >> $service_file
+  systemctl daemon-reload
+
+  ## 自启动
+  systemctl enable $1
+
+  ## 配置成功
+  echoGreen "config success, use  'systemctl start $1 ' to start"
+
+}
+service "$@"
+exit 0

springboot-login/pom.xml

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

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

@@ -1,11 +1,13 @@
 package com.tiesheng.login.config.token;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.jwt.JWT;
+import cn.hutool.jwt.JWTValidator;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.util.ServletKit;
 import com.tiesheng.util.exception.ApiException;
@@ -66,10 +68,21 @@ public class TsTokenConfig {
     /**
      * 验证token
      *
+     * @param thrExp
      * @return
      */
     public TokenBean validToken(boolean thrExp) {
         String token = ServletUtil.getHeader(ServletKit.getRequest(), "token", "utf-8");
+        return validToken(token, thrExp);
+    }
+
+
+    /**
+     * 验证token
+     *
+     * @return
+     */
+    public TokenBean validToken(String token, boolean thrExp) {
         TokenBean tokenBean = isIgnored(token);
         if (tokenBean != null) {
             return tokenBean;
@@ -77,15 +90,11 @@ public class TsTokenConfig {
 
         try {
             JWT decode = JWT.of(token);
+            JWTValidator.of(decode).validateDate();
             String id = decode.getPayload("id").toString();
             String environmentType = decode.getPayload("environmentType").toString();
             String service = decode.getPayload("service").toString();
             String extra = decode.getPayload("extra").toString();
-            Long expireTime = decode.getPayloads().getLong("time");
-            if (expireTime != null && expireTime < System.currentTimeMillis()) {
-                throw new ApiException("登录过期，请重新登陆");
-            }
-
             tokenBean = new TokenBean(id, environmentType, service);
             tokenBean.setExtra(extra);
         } catch (Exception ignored) {

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

@@ -1,5 +1,6 @@
 package com.tiesheng.login.config.token.bean;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.jwt.JWT;
 import com.tiesheng.login.config.token.TsTokenConfig;
@@ -31,11 +32,11 @@ public class TokenBean {
     public String toToken() {
         TsTokenConfig tsTokenConfig = SpringUtil.getBean(TsTokenConfig.class);
         return JWT.create()
+                .setExpiresAt(DateUtil.offsetHour(DateUtil.date(), tsTokenConfig.getExpireHours()))
                 .setPayload("id", getId())
                 .setPayload("environmentType", getEnvironmentType())
                 .setPayload("service", getService())
                 .setPayload("extra", getExtra())
-                .setPayload("time", System.currentTimeMillis() + tsTokenConfig.getExpireHours() * 1000 * 60 * 60)
                 .setKey(tsTokenConfig.getEncryptKey().getBytes())
                 .sign();
     }

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

@@ -6,7 +6,9 @@ import cn.hutool.core.util.URLUtil;
 import com.alibaba.fastjson.JSON;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.login.config.token.bean.TokenBean;
-import com.tiesheng.login.pojos.dto.UniqueIndexDTO;
+import com.tiesheng.login.pojos.CodeExtraDTO;
+import com.tiesheng.login.pojos.DoLoginInfo;
+import com.tiesheng.login.pojos.UniqueIndexDTO;
 import com.tiesheng.login.service.TieshengLoginConfigurer;
 import com.tiesheng.platform.config.ding.PlatformDingConfig;
 import com.tiesheng.platform.config.ding.bean.DingJsapiSignature;
@@ -51,9 +53,9 @@ public class LoginController {
     @GetMapping("/unique/redirect")
     @TokenIgnore
     public void uniqueIndex(UniqueIndexDTO dto, HttpServletResponse response) {
-        TokenBean tokenBean = tieshengLoginConfigurer.doLogin("unique_index_" + dto.getPlatform(),
-                dto.getNo(), dto.getPlatform(), dto.getInfo());
-        tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getExtra(), response);
+        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("unique_index_web",
+                dto.getNo(), "web", dto.getTo(), dto.getInfo()));
+        tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
     }
 
 
@@ -66,8 +68,8 @@ public class LoginController {
     @PostMapping("/unique/index")
     @TokenIgnore
     public ApiResp<String> uniqueIndex(@RequestBody UniqueIndexDTO dto) {
-        TokenBean tokenBean = tieshengLoginConfigurer.doLogin("unique_index_" + dto.getPlatform(),
-                dto.getNo(), dto.getPlatform(), dto.getInfo());
+        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo("unique_index_web",
+                dto.getNo(), "web", dto.getTo(), dto.getInfo()));
         if (tokenBean == null) {
             throw new ApiException("登录失败");
         }
@@ -112,12 +114,13 @@ public class LoginController {
      */
     @RequestMapping("/ding/oauth2/{service}")
     @TokenIgnore
-    public void dingOauth2(@PathVariable String service, String code, String extra, HttpServletResponse response) {
-        String ddUserId = platformDingConfig.getUserIdByCode(service, code);
+    public void dingOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
+        String ddUserId = platformDingConfig.getUserIdByCode(service, dto.getCode());
         DingUserInfo dingUserInfo = platformDingConfig.topapiV2UserGet(service, ddUserId);
-        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(dingUserInfo.getAppId(), dingUserInfo.getUserid(), "ding",
-                JSON.toJSONString(dingUserInfo));
-        tieshengLoginConfigurer.onLoginRedirect(tokenBean, extra, response);
+        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(dingUserInfo.getAppId(),
+                dingUserInfo.getUserid(), "ding", dto.getTo(),
+                JSON.toJSONString(dingUserInfo)));
+        tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
     }
 
 
@@ -159,15 +162,14 @@ public class LoginController {
 
     /**
      * 微信授权回调
-     *
-     * @param code
      */
     @RequestMapping("/wxmp/oauth2/{service}")
     @TokenIgnore
-    public void wxmpOauth2(@PathVariable String service, String code, String extra, HttpServletResponse response) {
-        WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, code);
-        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(wxUserInfo.getAppId(), wxUserInfo.getOpenid(), "wxmp", JSON.toJSONString(wxUserInfo));
-        tieshengLoginConfigurer.onLoginRedirect(tokenBean, extra, response);
+    public void wxmpOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
+        WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
+        TokenBean tokenBean = tieshengLoginConfigurer.doLogin(new DoLoginInfo(wxUserInfo.getAppId(),
+                wxUserInfo.getOpenid(), "wxmp", dto.getTo(), JSON.toJSONString(wxUserInfo)));
+        tieshengLoginConfigurer.onLoginRedirect(tokenBean, dto.getTo(), dto.getExtra(), response);
     }
 
 

springboot-login/src/main/java/com/tiesheng/login/pojos/CodeExtraDTO.java

@@ -0,0 +1,28 @@
+package com.tiesheng.login.pojos;
+
+public class CodeExtraDTO extends LoginToInfo {
+
+    private String code;
+    private String extra;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+}

springboot-login/src/main/java/com/tiesheng/login/pojos/DoLoginInfo.java

@@ -0,0 +1,71 @@
+package com.tiesheng.login.pojos;
+
+public class DoLoginInfo {
+
+    private String appId;
+    private String unique;
+    private String platform;
+    private String to;
+    private String info;
+    private String extra;
+
+    public DoLoginInfo(String appId, String unique, String platform, String to, String info) {
+        this.appId = appId;
+        this.unique = unique;
+        this.platform = platform;
+        this.to = to;
+        this.info = info;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getUnique() {
+        return unique;
+    }
+
+    public void setUnique(String unique) {
+        this.unique = unique;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+}

springboot-login/src/main/java/com/tiesheng/login/pojos/LoginToInfo.java

@@ -0,0 +1,18 @@
+package com.tiesheng.login.pojos;
+
+public class LoginToInfo {
+
+    private String to;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+}

springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java

@@ -1,11 +1,10 @@
-package com.tiesheng.login.pojos.dto;
+package com.tiesheng.login.pojos;
 
 import cn.hutool.core.util.StrUtil;
 
-public class UniqueIndexDTO {
+public class UniqueIndexDTO extends LoginToInfo {
 
     private String no;
-    private String platform;
     private String extra;
     private String info;
 
@@ -21,14 +20,6 @@ public class UniqueIndexDTO {
         this.no = no;
     }
 
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
     public String getExtra() {
         if (StrUtil.isEmpty(extra)) {
             extra = "";

springboot-login/src/main/java/com/tiesheng/login/service/TieshengLoginConfigurer.java

@@ -1,6 +1,7 @@
 package com.tiesheng.login.service;
 
 import com.tiesheng.login.config.token.bean.TokenBean;
+import com.tiesheng.login.pojos.DoLoginInfo;
 import org.springframework.context.annotation.Configuration;
 
 import javax.servlet.http.HttpServletResponse;
@@ -16,7 +17,7 @@ public interface TieshengLoginConfigurer {
      *
      * @return
      */
-    TokenBean doLogin(String appId, String uniqueId, String platfrom, String info);
+    TokenBean doLogin(DoLoginInfo loginInfo);
 
 
     /**
@@ -24,7 +25,7 @@ public interface TieshengLoginConfigurer {
      *
      * @param tokenBean
      */
-    void onLoginRedirect(TokenBean bean, String extra, HttpServletResponse response);
+    void onLoginRedirect(TokenBean bean, String to, String extra, HttpServletResponse response);
 
 
 }

springboot-login/src/main/java/com/tiesheng/login/service/impl/DefaultLoginConfigurer.java

@@ -1,6 +1,7 @@
 package com.tiesheng.login.service.impl;
 
 import com.tiesheng.login.config.token.bean.TokenBean;
+import com.tiesheng.login.pojos.DoLoginInfo;
 import com.tiesheng.login.service.TieshengLoginConfigurer;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Configuration;
@@ -15,12 +16,12 @@ import javax.servlet.http.HttpServletResponse;
 public class DefaultLoginConfigurer implements TieshengLoginConfigurer {
 
     @Override
-    public TokenBean doLogin(String appId, String uniqueId, String platfrom, String info) {
+    public TokenBean doLogin(DoLoginInfo loginInfo) {
         return null;
     }
 
     @Override
-    public void onLoginRedirect(TokenBean bean, String extra, HttpServletResponse response) {
+    public void onLoginRedirect(TokenBean bean, String to, String extra, HttpServletResponse response) {
 
     }
 }

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.2.6</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-util/pom.xml

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

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

@@ -18,7 +18,7 @@ import java.io.RandomAccessFile;
 public class Ip2regionConfig {
 
     private String dbUrl = "http://git.kepai365.com/zeng_wenhao/kepai-repo/raw/master/ipdb/ip2region.db";
-    private String dbPath = System.getProperty("user.dir") + "/ipdb/ip2region.db";
+    private String dbPath = System.getProperty("user.dir") + "/config/ip2region.db";
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法

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

@@ -2,6 +2,7 @@ package com.tiesheng.util.pojos;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
@@ -29,19 +30,26 @@ public class FileUploadPath {
      * @param fileName
      * @return
      */
-    public static FileUploadPath get(String fileName) {
+    public static FileUploadPath file(String fileName) {
 
         // 下载文件
-        fileName = downloadFile(fileName);
+        fileName = fileDownload(fileName);
 
         FileUploadPath pathBean = new FileUploadPath();
 
         String tempPath = fileName;
+        if (!StrUtil.startWith(tempPath, CharUtil.SLASH)) {
+            tempPath = CharUtil.SLASH + tempPath;
+        }
         if (!StrUtil.startWith(tempPath, UPLOAD_FOLDER)) {
-            tempPath = UPLOAD_FOLDER + DateUtil.format(DateUtil.date(), "yyyy-MM") + "/" + fileName;
+            tempPath = UPLOAD_FOLDER + DateUtil.format(DateUtil.date(), "yyyy-MM") + CharUtil.SLASH + fileName;
         }
         pathBean.setHttpPath(tempPath);
-        pathBean.setAbsolutePath(String.format("%s/static%s", System.getProperty("user.dir"), tempPath));
+
+        String tempAbs = String.format("%s/static%s", System.getProperty("user.dir"), tempPath);
+        tempAbs = FileUtil.normalize(tempAbs);
+        pathBean.setAbsolutePath(tempAbs);
+
         FileUtil.mkParentDirs(pathBean.getAbsolutePath());
 
         return pathBean;
@@ -51,40 +59,33 @@ public class FileUploadPath {
     /**
      * 下载http文件
      *
-     * @param fileName
+     * @param httpUrl
      * @return
      */
-    public static String downloadFile(String fileName) {
-        if (!StrUtil.startWith(fileName, "http")) {
-            return fileName;
+    public static String fileDownload(String httpUrl) {
+        if (!StrUtil.startWith(httpUrl, "http")) {
+            return httpUrl;
         }
-        String newFileName = UPLOAD_FOLDER + StrUtil.subAfter(fileName, UPLOAD_FOLDER, true);
-        FileUploadPath uploadPath = get(newFileName);
+        String newFileName = UPLOAD_FOLDER + StrUtil.subAfter(httpUrl, UPLOAD_FOLDER, true);
+        FileUploadPath uploadPath = file(newFileName);
         if (!FileUtil.exist(uploadPath.getAbsolutePath())) {
-            HttpUtil.downloadFile(fileName, uploadPath.getAbsolutePath());
+            HttpUtil.downloadFile(httpUrl, uploadPath.getAbsolutePath());
         }
 
         return uploadPath.getHttpPath();
     }
 
-
-    /**
-     * 随机生成一个文件路径
-     *
-     * @return
-     */
-    public static FileUploadPath random() {
-        return get(IdUtil.simpleUUID());
-    }
-
-
     /**
      * 随机生成一个文件路径
      *
      * @return
      */
     public static FileUploadPath random(String fileExt) {
-        return get(IdUtil.simpleUUID() + "." + fileExt);
+        String fileName = IdUtil.simpleUUID();
+        if (!StrUtil.isEmpty(fileExt)) {
+            fileName = fileName + "." + fileExt;
+        }
+        return file(fileName);
     }
 
 
@@ -95,20 +96,9 @@ public class FileUploadPath {
      * @return
      */
     public static FileUploadPath folder(String folder) {
-        FileUploadPath pathBean = new FileUploadPath();
-
-        String tempFolder = folder;
-        if (!StrUtil.startWith(tempFolder, UPLOAD_FOLDER)) {
-            tempFolder = UPLOAD_FOLDER + tempFolder;
-        }
-        if (!StrUtil.endWith(folder, "/")) {
-            tempFolder = tempFolder + "/";
-        }
-        pathBean.setHttpPath(tempFolder);
-        pathBean.setAbsolutePath(String.format("%s/static%s", System.getProperty("user.dir"), tempFolder));
-        FileUtil.mkParentDirs(pathBean.getAbsolutePath());
-
-        return pathBean;
+        FileUploadPath file = file(folder);
+        FileUtil.mkdir(file.getAbsolutePath());
+        return file;
     }
 
 

springboot-web/pom.xml

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

springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java

@@ -108,8 +108,8 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping("/file/chunk_merge")
-    public ApiResp<String> fileChunkMerge(String fileMd5) {
-        String path = fileUploadService.chunkMerge(fileMd5);
+    public ApiResp<String> fileChunkMerge(String fileMd5, String fileExt) {
+        String path = fileUploadService.chunkMerge(fileMd5, fileExt);
         return ApiResp.respOK(path);
     }
 

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

@@ -12,6 +12,7 @@ import com.tiesheng.core.pojos.dao.CoreLogMessage;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.TsTokenConfig;
+import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.message.pojos.MessageReqResp;
 import com.tiesheng.message.service.TieshengMessageConfigurer;
 import com.tiesheng.util.ServletKit;
@@ -53,7 +54,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      */
     public void addOperationLog(String title, String subject, Object params) {
         CoreLogOperation operation = new CoreLogOperation();
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get().getId());
+        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get());
         operation.setUserId(currentWebUser.getId());
         operation.setUserName(currentWebUser.getName());
         operation.setTitle(title);
@@ -72,8 +73,9 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      * 添加登录日志
      *
      * @param platformUnique
+     * @param tokenBean
      */
-    public void addLoginLog(CorePlatformUnique platformUnique) {
+    public void addLoginLog(CorePlatformUnique platformUnique, TokenBean tokenBean) {
 
         HttpServletRequest request = ServletKit.getRequest();
         String ip = ServletUtil.getClientIP(request);
@@ -82,7 +84,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         login.setUserId(platformUnique.getUserId());
         login.setPlatform(platformUnique.getPlatform());
 
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(platformUnique.getUserId());
+        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(tokenBean);
         login.setUserName(currentWebUser.getName());
 
         login.setIp(ip);

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

@@ -4,8 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
-import com.tiesheng.login.service.TieshengLoginConfigurer;
 import com.tiesheng.login.config.token.bean.TokenBean;
+import com.tiesheng.login.pojos.DoLoginInfo;
+import com.tiesheng.login.service.TieshengLoginConfigurer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,49 +25,32 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
     CoreLogService coreLogService;
 
     @Override
-    public TokenBean doLogin(String appId, String uniqueId, String platfrom, String info) {
+    public TokenBean doLogin(DoLoginInfo loginInfo) {
 
-        CorePlatformUnique platformUnique = getByAppAndUnique(appId, uniqueId, platfrom);
-        platformUnique.setInfo(info);
-        TokenBean tokenBean = tieshengWebConfigurer.loginConfigurer().doLogin(platformUnique);
+        CorePlatformUnique platformUnique = getOneByColumn("unique_id", loginInfo.getUnique());
+        if (platformUnique == null) {
+            platformUnique = new CorePlatformUnique();
+            platformUnique.setAppId(loginInfo.getAppId());
+            platformUnique.setPlatform(loginInfo.getPlatform());
+            platformUnique.setUniqueId(loginInfo.getUnique());
+        }
+        platformUnique.setInfo(loginInfo.getInfo());
+
+        TokenBean tokenBean = tieshengWebConfigurer.loginConfigurer().doLogin(platformUnique, loginInfo.getTo());
         if (tokenBean != null) {
             platformUnique.setUserId(tokenBean.getId());
             platformUnique.setIsDeleted(0);
             saveOrUpdate(platformUnique);
 
             // 添加登录日志
-            coreLogService.addLoginLog(platformUnique);
+            coreLogService.addLoginLog(platformUnique,tokenBean);
         }
         return tokenBean;
     }
 
     @Override
-    public void onLoginRedirect(TokenBean bean, String extra, HttpServletResponse response) {
-        tieshengWebConfigurer.loginConfigurer().redirect(bean, extra, response);
-    }
-
-
-    /**
-     * 通过appId获取登录对象
-     *
-     * @param appId
-     * @param uniqueId
-     * @return
-     */
-    private CorePlatformUnique getByAppAndUnique(String appId, String uniqueId, String platform) {
-        QueryWrapper<CorePlatformUnique> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("app_id", appId);
-        queryWrapper.eq("unique_id", uniqueId);
-        queryWrapper.eq("platform", platform);
-        queryWrapper.last("limit 1");
-        CorePlatformUnique platformUnique = getOne(queryWrapper);
-        if (platformUnique == null) {
-            platformUnique = new CorePlatformUnique();
-            platformUnique.setAppId(appId);
-            platformUnique.setUniqueId(uniqueId);
-            platformUnique.setPlatform(platform);
-        }
-        return platformUnique;
+    public void onLoginRedirect(TokenBean bean, String to, String extra, HttpServletResponse response) {
+        tieshengWebConfigurer.loginConfigurer().redirect(bean, to, extra, response);
     }
 
 

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

@@ -40,7 +40,7 @@ public class FileUploadService {
             String fileType = FileTypeUtil.getType(file.getInputStream(), file.getOriginalFilename());
             tieshengWebConfigurer.uploadFileCheck(fileType);
 
-            FileUploadPath filePath = FileUploadPath.random();
+            FileUploadPath filePath = FileUploadPath.random(fileType);
 
             InputStream stream = file.getInputStream();
             FileUtil.writeFromStream(stream, filePath.getAbsolutePath());
@@ -107,7 +107,7 @@ public class FileUploadService {
      *
      * @param fileMd5
      */
-    public String chunkMerge(String fileMd5) {
+    public String chunkMerge(String fileMd5, String fileExt) {
 
         // 1，获取文件块的目录
         FileUploadPath folder = FileUploadPath.folder(fileMd5);
@@ -118,7 +118,7 @@ public class FileUploadService {
         }
 
         // 3，生成保存文件的路径
-        FileUploadPath uploadPath = FileUploadPath.random();
+        FileUploadPath uploadPath = FileUploadPath.random(fileExt);
 
         // 4，获取块文件，此列表是已经排好序的列表
         List<File> chunkFiles = getSortedChunkFiles(new File(folder.getAbsolutePath()));

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

@@ -22,7 +22,7 @@ public interface TieshengWebConfigurer {
      *
      * @return
      */
-    CurrentWebUser getCurrentUserName(String userId);
+    CurrentWebUser getCurrentUserName(TokenBean userId);
 
 
     /**
@@ -71,7 +71,7 @@ public interface TieshengWebConfigurer {
          * @param platformUnique
          * @return
          */
-        TokenBean doLogin(CorePlatformUnique platformUnique);
+        TokenBean doLogin(CorePlatformUnique platformUnique, String to);
 
 
         /**
@@ -81,7 +81,7 @@ public interface TieshengWebConfigurer {
          * @param extra
          * @param response
          */
-        void redirect(TokenBean bean, String extra, HttpServletResponse response);
+        void redirect(TokenBean bean, String to, String extra, HttpServletResponse response);
 
     }
 

springboot-web/src/main/resources/application.yml

@@ -1,21 +0,0 @@
-server:
-  compression:
-    enabled: true
-
-## Spring配置
-spring:
-
-  servlet:
-    multipart:
-      max-file-size: 20MB
-  web:
-    resources:
-      static-locations: classpath:/static/,file:static/
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-
-## 日志
-logging:
-  file:
-    name: logs/tiesheng.log