Merge remote-tracking branch 'origin/master'

v1.4.1
hiparker 4 years ago
commit 591336c081

@ -16,6 +16,6 @@ services:
- --spring.profiles.active=beta - --spring.profiles.active=beta
privileged: true privileged: true
volumes: 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: ports:
- "7000:7000" - "7000:7000"

@ -34,8 +34,8 @@ spring:
datasource: datasource:
master: 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 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 username: opsli-boot
password: MYSQL0p9o8i7u password: OPSLI!@#0p9o8i7u
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置 # 多数据源配置
#slave-datasource: #slave-datasource:
@ -74,9 +74,9 @@ opsli:
enable-demo: true enable-demo: true
# web 上传文件路径 # web 上传文件路径
web: web:
upload-path: /www/wwwroot/demo.opsli.com/files upload-path: var/files
# 系统日志 # 系统日志
log: log:
path: /var/log path: var/log

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

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

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

Loading…
Cancel
Save