diff --git a/pom.xml b/pom.xml
index 8dce506..579a25d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
1.8
2.1.9
2.1.9
-
- 8.0.26
+ 5.1.38
+
1.1.3
2.3.0
2.6
@@ -343,9 +343,9 @@
-
+
${project.artifactId}
diff --git a/src/main/java/com/platform/config/ShiroConfig.java b/src/main/java/com/platform/config/ShiroConfig.java
index bb08441..5c6b796 100644
--- a/src/main/java/com/platform/config/ShiroConfig.java
+++ b/src/main/java/com/platform/config/ShiroConfig.java
@@ -60,7 +60,7 @@ public class ShiroConfig {
Map filterMap = new LinkedHashMap<>();
filterMap.put("/webjars/**", "anon");
- filterMap.put("/druid/**", "anon");
+// filterMap.put("/druid/**", "anon");
filterMap.put("/app/**", "anon");
filterMap.put("/test", "anon");
filterMap.put("/profile/**", "anon");
@@ -68,12 +68,12 @@ public class ShiroConfig {
filterMap.put("/sys/login", "anon");
filterMap.put("/video/**", "anon");
filterMap.put(path(videoFileProperties.getBaseSavePath()), "anon");
- filterMap.put("/swagger/**", "anon");
- filterMap.put("/v2/api-docs", "anon");
- filterMap.put("/v2/api-docs-ext", "anon");
- filterMap.put("/swagger-ui.html", "anon");
- filterMap.put("/swagger-resources/**", "anon");
- filterMap.put("/doc.html", "anon");
+// filterMap.put("/swagger/**", "anon");
+// filterMap.put("/v2/api-docs", "anon");
+// filterMap.put("/v2/api-docs-ext", "anon");
+// filterMap.put("/swagger-ui.html", "anon");
+// filterMap.put("/swagger-resources/**", "anon");
+// filterMap.put("/doc.html", "anon");
filterMap.put("/captcha.jpg", "anon");
filterMap.put("/media/**", "anon");
filterMap.put("/page/**", "anon");
diff --git a/src/main/java/com/platform/modules/plm/util/MaterialUtils.java b/src/main/java/com/platform/modules/plm/util/MaterialUtils.java
index 7419167..a2a6087 100644
--- a/src/main/java/com/platform/modules/plm/util/MaterialUtils.java
+++ b/src/main/java/com/platform/modules/plm/util/MaterialUtils.java
@@ -311,7 +311,7 @@ public class MaterialUtils {
Files.createFile(localFile);
Stream stream = Files.list(Paths.get(folder));
stream.filter(path -> !path.getFileName().toString().equals(filename))
- .sorted((o1, o2) -> {
+ .sorted((o1, o2) -> {
String p1 = o1.getFileName().toString();
String p2 = o2.getFileName().toString();
int i1 = p1.lastIndexOf("-");
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 950aaf7..7e36600 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,11 +6,11 @@ spring:
first: #数据源1
url: jdbc:mysql://localhost:3306/jinan-live?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true
username: root
- password: 55436
+ password: root
second: #数据源2
url: jdbc:mysql://localhost:3306/jinan-live?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true
username: root
- password: 55436
+ password: root
initial-size: 10
max-active: 100
min-idle: 10