Merge remote-tracking branch 'origin/master'

docker-compose.yml

@@ -16,6 +16,6 @@ services:
       - --spring.profiles.active=beta
     privileged: true
     volumes:
-      - /www/wwwroot/demo.opsli.bedebug.com/backend/run:/usr/local/opsli/opsli-boot #挂载目录
+      - /www/wwwroot/demo.opsli.bedebug.com/backend/var:/usr/local/opsli/opsli-boot/var #挂载目录
     ports:
       - "7000:7000"

opsli-starter/src/main/resources/application-beta.yaml

@@ -34,8 +34,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://172.27.105.47:3306/opsli-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: MYSQL0p9o8i7u
+          username: opsli-boot
+          password: OPSLI!@#0p9o8i7u
           driver-class-name: com.mysql.cj.jdbc.Driver
       # 多数据源配置
       #slave-datasource:
@@ -74,9 +74,9 @@ opsli:
   enable-demo: true
   # web 上传文件路径
   web:
-    upload-path: /www/wwwroot/demo.opsli.com/files
+    upload-path: var/files
 
 # 系统日志
 log:
-  path: /var/log
+  path: var/log
 

opsli-starter/src/main/resources/application-dev.yaml

@@ -79,8 +79,9 @@ opsli:
   enable-demo: false
   # web 上传文件路径
   web:
-    upload-path: /Users/system/Documents/work/tmp/opsli
+    upload-path: var/files
 
 # 系统日志
 log:
-  path: /Users/system/Documents/脚本/opsli/var/log
+  path: var/log
+

opsli-starter/src/main/resources/application-local.yaml

@@ -79,8 +79,9 @@ opsli:
   enable-demo: false
   # web 上传文件路径
   web:
-    upload-path: /Users/system/Documents/work/tmp/opsli
+    upload-path: var/files
 
 # 系统日志
 log:
-  path: /Users/system/Documents/脚本/opsli/var/log
+  path: var/log
+

opsli-starter/src/main/resources/application-release.yaml

@@ -74,8 +74,8 @@ opsli:
   enable-demo: true
   # web 上传文件路径
   web:
-    upload-path: /Users/system/Documents/work/tmp/opsli
+    upload-path: var/files
 
 # 系统日志
 log:
-  path: /var/log
+  path: var/log