Merge branch 'test-uploadDir' into 'master'

GlobalConfig新加uploadDir配置

See merge request tiesheng/tiesheng!2

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

@@ -1,5 +1,7 @@
 package com.tiesheng.login.config.token;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.util.ServletKit;
@@ -50,8 +52,18 @@ public class TsTokenAspect {
 
         // 过滤不要需要验证的接口（path）
         String requestURI = ServletKit.getRequest().getRequestURI();
-        if (StrUtil.startWithAnyIgnoreCase(requestURI, tsTokenConfig.getIgnorePaths())) {
+        String[] ignorePaths = tsTokenConfig.getIgnorePaths();
-            return;
+        if (ObjUtil.isNotEmpty(ignorePaths)) {
+            for (String path : ignorePaths) {
+                if (path.contains("/**")) {
+                    path = path.replace("/**", "");
+                    if (StrUtil.startWith(requestURI, path)) {
+                        return;
+                    }
+                } else if (requestURI.equals(path)) {
+                    return;
+                }
+            }
         }
 
         // 过滤不要需要验证的接口（注解）

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

@@ -23,6 +23,7 @@ public class GlobalConfig {
     private String host;
     private String service;
     private String version;
+    private String uploadDir = System.getProperty("user.dir");
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
@@ -80,6 +81,15 @@ public class GlobalConfig {
     // setter\getter
     ///////////////////////////////////////////////////////////////////////////
 
+
+    public String getUploadDir() {
+        return uploadDir;
+    }
+
+    public void setUploadDir(String uploadDir) {
+        this.uploadDir = uploadDir;
+    }
+
     public String getHost() {
         return host;
     }

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

@@ -5,7 +5,9 @@ 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.extra.spring.SpringUtil;
 import cn.hutool.http.HttpUtil;
+import com.tiesheng.util.config.GlobalConfig;
 
 public class FileUploadPath {
 
@@ -46,7 +48,7 @@ public class FileUploadPath {
         }
         pathBean.setHttpPath(tempPath);
 
-        String tempAbs = String.format("%s/static%s", System.getProperty("user.dir"), tempPath);
+        String tempAbs = String.format("%s/static%s", SpringUtil.getBean(GlobalConfig.class).getUploadDir(), tempPath);
         tempAbs = FileUtil.normalize(tempAbs);
         pathBean.setAbsolutePath(tempAbs);