|
@@ -1,19 +1,11 @@
|
|
|
#配置数据源
|
|
#配置数据源
|
|
|
server:
|
|
server:
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- port: 8007
|
|
|
|
|
-=======
|
|
|
|
|
port: 8001
|
|
port: 8001
|
|
|
->>>>>>> feature-2022.10.09
|
|
|
|
|
spring:
|
|
spring:
|
|
|
mvc:
|
|
mvc:
|
|
|
static-path-pattern: /image/**
|
|
static-path-pattern: /image/**
|
|
|
resources:
|
|
resources:
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- static-locations: file:/image/,file:/image/
|
|
|
|
|
-=======
|
|
|
|
|
static-locations: file:/nt/,file:/nt/
|
|
static-locations: file:/nt/,file:/nt/
|
|
|
->>>>>>> feature-2022.10.09
|
|
|
|
|
datasource:
|
|
datasource:
|
|
|
druid:
|
|
druid:
|
|
|
db-type: com.alibaba.druid.pool.DruidDataSource
|
|
db-type: com.alibaba.druid.pool.DruidDataSource
|
|
@@ -64,11 +56,7 @@ spring:
|
|
|
multi-statement-allow: true
|
|
multi-statement-allow: true
|
|
|
redis:
|
|
redis:
|
|
|
#数据库索引
|
|
#数据库索引
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- database: 0
|
|
|
|
|
-=======
|
|
|
|
|
database: 1
|
|
database: 1
|
|
|
->>>>>>> feature-2022.10.09
|
|
|
|
|
host: 114.55.230.80
|
|
host: 114.55.230.80
|
|
|
port: 6379
|
|
port: 6379
|
|
|
password: 123qysd!@#
|
|
password: 123qysd!@#
|
|
@@ -168,7 +156,6 @@ app:
|
|
|
background:
|
|
background:
|
|
|
picture: https://fqgz.flowbb.cn/image/logo/83d9449f4e02459da1661bafdf08b86a_8.png
|
|
picture: https://fqgz.flowbb.cn/image/logo/83d9449f4e02459da1661bafdf08b86a_8.png
|
|
|
image:
|
|
image:
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
url: https://fqgz.flowbb.cn/image/
|
|
url: https://fqgz.flowbb.cn/image/
|
|
|
upload:
|
|
upload:
|
|
|
path: /image/
|
|
path: /image/
|
|
@@ -176,7 +163,6 @@ app:
|
|
|
domain: https://fqgz.flowbb.cn/
|
|
domain: https://fqgz.flowbb.cn/
|
|
|
push:
|
|
push:
|
|
|
port: 8090
|
|
port: 8090
|
|
|
-=======
|
|
|
|
|
url: https://fqgz.flowbb.cn:10001/image/
|
|
url: https://fqgz.flowbb.cn:10001/image/
|
|
|
upload:
|
|
upload:
|
|
|
path: /image/
|
|
path: /image/
|
|
@@ -184,7 +170,6 @@ app:
|
|
|
domain: https://fqgz.flowbb.cn:10001/
|
|
domain: https://fqgz.flowbb.cn:10001/
|
|
|
push:
|
|
push:
|
|
|
port: 8081
|
|
port: 8081
|
|
|
->>>>>>> feature-2022.10.09
|
|
|
|
|
minio:
|
|
minio:
|
|
|
accesskey: minioadmin
|
|
accesskey: minioadmin
|
|
|
secretkey: minioadmin
|
|
secretkey: minioadmin
|
|
@@ -210,17 +195,10 @@ xxl:
|
|
|
admin:
|
|
admin:
|
|
|
addresses: http://114.55.230.80:8080/xxl-job-admin
|
|
addresses: http://114.55.230.80:8080/xxl-job-admin
|
|
|
executor:
|
|
executor:
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- appname: eladmin-xxl-job-executor
|
|
|
|
|
- address:
|
|
|
|
|
- ip:
|
|
|
|
|
- port: 9998
|
|
|
|
|
-=======
|
|
|
|
|
appname: nt-xxl-job-executor
|
|
appname: nt-xxl-job-executor
|
|
|
address:
|
|
address:
|
|
|
ip:
|
|
ip:
|
|
|
port: 9991
|
|
port: 9991
|
|
|
->>>>>>> feature-2022.10.09
|
|
|
|
|
logpath: /users/songxiaodong/applogs/xxl-job/jobhandler
|
|
logpath: /users/songxiaodong/applogs/xxl-job/jobhandler
|
|
|
logretentiondays: 30
|
|
logretentiondays: 30
|
|
|
|
|
|
