Merge remote-tracking branch 'origin/master'

ruoyi-admin/pom.xml

@@ -133,6 +133,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.5.15</version>
                 <configuration>
+                    <includeSystemScope>true</includeSystemScope>
                     <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                 </configuration>
                 <executions>

ruoyi-admin/src/main/resources/application-dev.yml

@@ -47,9 +47,9 @@ spring:
       testOnBorrow: false
       testOnReturn: false
       webStatFilter:
-        enabled: true
+        enabled: false
       statViewServlet:
-        enabled: true
+        enabled: false
         # 设置白名单，不填则允许所有访问
         allow:
         url-pattern: /druid/*
@@ -70,7 +70,7 @@ spring:
   redis:
     # 地址
     #host: 192.168.0.146
-    host: 172.16.196.175
+    host: 172.16.196.173
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -89,6 +89,13 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+snail-job:
+  server:
+    port: 17888
+    host: 172.16.196.173
+  namespace: M18Z4tm7bKJmswwcLMlGgzLUEn5I2_A8
+  group: test_sh_group
+  token: SJ_bM5DeeFSAV6ltYwqqCKoA7v5HuwGH5Hr
 
 docker:
-  host: tcp://localhost:2375
+  host: tcp://172.16.196.174:2375

ruoyi-admin/src/main/resources/application-dm.yml

@@ -95,6 +95,13 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+snail-job:
+  server:
+    port: 17888
+    host: 127.0.0.1
+  namespace: M18Z4tm7bKJmswwcLMlGgzLUEn5I2_A8
+  group: test_sh_group
+  token: SJ_bM5DeeFSAV6ltYwqqCKoA7v5HuwGH5Hr
 
 docker:
   host: tcp://localhost:2375

ruoyi-admin/src/main/resources/application-druid.yml

@@ -81,6 +81,13 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+snail-job:
+  server:
+    port: 17888
+    host: 127.0.0.1
+  namespace: M18Z4tm7bKJmswwcLMlGgzLUEn5I2_A8
+  group: test_sh_group
+  token: SJ_bM5DeeFSAV6ltYwqqCKoA7v5HuwGH5Hr
 
 docker:
   host: tcp://localhost:2375

ruoyi-admin/src/main/resources/application-test.yml

@@ -95,6 +95,13 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+snail-job:
+  server:
+    port: 17888
+    host: 127.0.0.1
+  namespace: M18Z4tm7bKJmswwcLMlGgzLUEn5I2_A8
+  group: test_sh_group
+  token: SJ_bM5DeeFSAV6ltYwqqCKoA7v5HuwGH5Hr
 
 docker:
   host: tcp://localhost:2375

ruoyi-admin/src/main/resources/application.yml

@@ -146,14 +146,6 @@ sys:
     upload:
       path: D:/tmp/map/
 
-snail-job:
-  server:
-    port: 17888
-    host: 127.0.0.1
-  namespace: M18Z4tm7bKJmswwcLMlGgzLUEn5I2_A8
-  group: test_sh_group
-  token: SJ_bM5DeeFSAV6ltYwqqCKoA7v5HuwGH5Hr
-
 
 # 调度器相关配置dpp
 ds:

ruoyi-admin/src/main/resources/logback.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-
-
     <!-- job配置↓↓↓↓↓↓↓↓↓↓↓↓↓ -->
 
     <property name="log.base" value="snail-job-demo" />
@@ -16,9 +14,9 @@
 
     <appender name="fileInfo"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>./data/log/${log.base}/info/info.log</file>
+        <file>/soft/${log.base}/info/info.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>./data/log/${log.base}/info/info.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>./soft/${log.base}/info/info.%d{yyyy-MM-dd}.log</FileNamePattern>
             <MaxHistory>30</MaxHistory>
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
@@ -32,9 +30,9 @@
     </appender>
 
     <appender name="fileWarn" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>./data/log/${log.base}/warn/warn.log</file>
+        <file>/soft/${log.base}/warn/warn.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>./data/log/${log.base}/warn/warn.%d{yyyy-MM-dd}.log
+            <FileNamePattern>/soft/${log.base}/warn/warn.%d{yyyy-MM-dd}.log
             </FileNamePattern>
             <MaxHistory>30</MaxHistory>
         </rollingPolicy>
@@ -49,9 +47,9 @@
     </appender>
 
     <appender name="fileError" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>./data/log/${log.base}/error/error.log</file>
+        <file>/soft/${log.base}/error/error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>./data/log/${log.base}/error/error.%d{yyyy-MM-dd}.log
+            <FileNamePattern>/soft/${log.base}/error/error.%d{yyyy-MM-dd}.log
             </FileNamePattern>
             <MaxHistory>30</MaxHistory>
         </rollingPolicy>
@@ -89,7 +87,7 @@
 
     <!-- job配置↑↑↑↑↑↑↑↑↑↑↑↑↑ -->
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/tmp/sh-models/logs" />
+	<property name="log.path" value="/soft/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-common/pom.xml

@@ -259,8 +259,6 @@
             <groupId>com.koal</groupId>
             <artifactId>kms-sdk</artifactId>
             <version>1.4.1</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/kms-sdk-1.4.1.jar</systemPath>
         </dependency>
         <!--
                 <dependency>