publish 0.1.8

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.8</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-db-migration</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.1.2</version>
+                <version>0.1.8</version>
             </dependency>
 
             <dependency>
@@ -120,8 +120,24 @@
                 <version>3.5.1</version>
             </dependency>
 
-
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <configuration>
+                        <!--  把外部jar打包进入项目中   -->
+                        <includeSystemScope>true</includeSystemScope>
+                        <!--  打包后的jar可直接执行   -->
+                        <executable>true</executable>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>

script/launchScript

@@ -0,0 +1,239 @@
+#!/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
+
+# Source any config file
+configfile="$(basename "${jarfile%.*}.conf")"
+
+# Initialize CONF_FOLDER location defaulting to jarfolder
+[[ -z "$CONF_FOLDER" ]] && CONF_FOLDER="{{confFolder:${jarfolder}}}"
+
+# shellcheck source=/dev/null
+[[ -r "${CONF_FOLDER}/${configfile}" ]] && source "${CONF_FOLDER}/${configfile}"
+
+# Initialize PID/LOG locations if they weren't provided by the config file
+[[ -z "$PID_FOLDER" ]] && PID_FOLDER="{{pidFolder:/var/run}}"
+[[ -z "$LOG_FOLDER" ]] && LOG_FOLDER="{{logFolder:/var/log}}"
+! [[ "$PID_FOLDER" == /* ]] && PID_FOLDER="$(dirname "$jarfile")"/"$PID_FOLDER"
+! [[ "$LOG_FOLDER" == /* ]] && LOG_FOLDER="$(dirname "$jarfile")"/"$LOG_FOLDER"
+! [[ -x "$PID_FOLDER" ]] && PID_FOLDER="/tmp"
+! [[ -x "$LOG_FOLDER" ]] && LOG_FOLDER="/tmp"
+
+# Set up defaults
+[[ -z "$MODE" ]] && MODE="{{mode:auto}}" # modes are "auto", "service" or "run"
+[[ -z "$USE_START_STOP_DAEMON" ]] && USE_START_STOP_DAEMON="{{useStartStopDaemon:true}}"
+
+# Create an identity for log/pid files
+if [[ -z "$identity" ]]; then
+  if [[ -n "$init_script" ]]; then
+    identity="${init_script}"
+  else
+    identity=$(basename "${jarfile%.*}")_${jarfolder//\//}
+  fi
+fi
+
+# Initialize log file name if not provided by the config file
+[[ -z "$LOG_FILENAME" ]] && LOG_FILENAME="{{logFilename:${identity}.log}}"
+
+# Initialize stop wait time if not provided by the config file
+[[ -z "$STOP_WAIT_TIME" ]] && STOP_WAIT_TIME="{{stopWaitTime:60}}"
+
+# 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'; }
+
+# Utility functions
+checkPermissions() {
+  touch "$pid_file" &> /dev/null || { echoRed "Operation not permitted (cannot access pid file)"; return 4; }
+  touch "$log_file" &> /dev/null || { echoRed "Operation not permitted (cannot access log file)"; return 4; }
+}
+
+isRunning() {
+  ps -p "$1" | grep -v "PID" &> /dev/null
+}
+
+await_file() {
+  end=$(date +%s)
+  let "end+=10"
+  while [[ ! -s "$1" ]]
+  do
+    now=$(date +%s)
+    if [[ $now -ge $end ]]; then
+      break
+    fi
+    sleep 1
+  done
+}
+
+# Determine the script mode
+action="run"
+if [[ "$MODE" == "auto" && -n "$init_script" ]] || [[ "$MODE" == "service" ]]; then
+  action="$1"
+  shift
+fi
+
+# Build the pid and log filenames
+PID_FOLDER="$PID_FOLDER/${identity}"
+pid_file="$PID_FOLDER/{{pidFilename:${identity}.pid}}"
+log_file="$LOG_FOLDER/$LOG_FILENAME"
+
+# 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
+
+arguments=(-Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar "$jarfile" $RUN_ARGS "$@")
+
+# Action functions
+start() {
+  if [[ -f "$pid_file" ]]; then
+    pid=$(cat "$pid_file")
+    isRunning "$pid" && { echoYellow "Already running [$pid]"; return 0; }
+  fi
+  do_start "$@"
+}
+
+do_start() {
+  working_dir=$(dirname "$jarfile")
+  pushd "$working_dir" > /dev/null
+  mkdir -p "$PID_FOLDER" &> /dev/null
+  if [[ -n "$run_user" ]]; then
+    checkPermissions || return $?
+    chown "$run_user" "$PID_FOLDER"
+    chown "$run_user" "$pid_file"
+    chown "$run_user" "$log_file"
+    if [ $USE_START_STOP_DAEMON = true ] && type start-stop-daemon > /dev/null 2>&1; then
+      start-stop-daemon --start --quiet \
+        --chuid "$run_user" \
+        --name "$identity" \
+        --make-pidfile --pidfile "$pid_file" \
+        --background --no-close \
+        --startas "$javaexe" \
+        --chdir "$working_dir" \
+        -- "${arguments[@]}" \
+        >> "$log_file" 2>&1
+      await_file "$pid_file"
+    else
+      su -s /bin/sh -c "$javaexe $(printf "\"%s\" " "${arguments[@]}") >> \"$log_file\" 2>&1 & echo \$!" "$run_user" > "$pid_file"
+    fi
+    pid=$(cat "$pid_file")
+  else
+    checkPermissions || return $?
+    "$javaexe" "${arguments[@]}" >> "$log_file" 2>&1 &
+    pid=$!
+    disown $pid
+    echo "$pid" > "$pid_file"
+  fi
+  [[ -z $pid ]] && { echoRed "Failed to start"; return 1; }
+  echoGreen "Started [$pid]"
+}
+
+stop() {
+  working_dir=$(dirname "$jarfile")
+  pushd "$working_dir" > /dev/null
+  [[ -f $pid_file ]] || { echoYellow "Not running (pidfile not found)"; return 0; }
+  pid=$(cat "$pid_file")
+  isRunning "$pid" || { echoYellow "Not running (process ${pid}). Removing stale pid file."; rm -f "$pid_file"; return 0; }
+  do_stop "$pid" "$pid_file"
+}
+
+do_stop() {
+  kill "$1" &> /dev/null || { echoRed "Unable to kill process $1"; return 1; }
+  for i in $(seq 1 $STOP_WAIT_TIME); do
+    isRunning "$1" || { echoGreen "Stopped [$1]"; rm -f "$2"; return 0; }
+    [[ $i -eq STOP_WAIT_TIME/2 ]] && kill "$1" &> /dev/null
+    sleep 1
+  done
+  echoRed "Unable to kill process $1";
+  return 1;
+}
+
+restart() {
+  stop && start
+}
+
+status() {
+  working_dir=$(dirname "$jarfile")
+  pushd "$working_dir" > /dev/null
+  [[ -f "$pid_file" ]] || { echoRed "Not running"; return 3; }
+  pid=$(cat "$pid_file")
+  isRunning "$pid" || { echoRed "Not running (process ${pid} not found)"; return 1; }
+  echoGreen "Running [$pid]"
+  return 0
+}
+
+run() {
+  pushd "$(dirname "$jarfile")" > /dev/null
+  "$javaexe" "${arguments[@]}"
+  result=$?
+  popd > /dev/null
+  return "$result"
+}
+
+# Call the appropriate action function
+case "$action" in
+start)
+  start "$@"; exit $?;;
+stop)
+  stop "$@"; exit $?;;
+restart)
+  restart "$@"; exit $?;;
+status)
+  status "$@"; exit $?;;
+run)
+  run "$@"; exit $?;;
+*)
+  echo "Usage: $0 {start|stop|restart|status|run}"; exit 1;
+esac
+
+exit 0

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.1.8</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
@@ -40,6 +40,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <embeddedLaunchScript>../script/launchScript</embeddedLaunchScript>
+                </configuration>
             </plugin>
         </plugins>
     </build>

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

@@ -1,12 +1,23 @@
 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) {
         return null;
@@ -14,6 +25,29 @@ public class DemoWebConfigurer implements TieshengWebConfigurer {
 
     @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-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.1.8</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.1.8</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.1.8</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

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

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.1.8</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.1.8</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.1.8</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.1.8</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.1.8</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/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,11 +25,18 @@ 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);
@@ -41,32 +49,8 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
     }
 
     @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

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