Commit 6850e367 by yangxiujun

fix:配置文件修改

1 parent 3ae512ff
...@@ -48,7 +48,7 @@ spring: ...@@ -48,7 +48,7 @@ spring:
enabled: false enabled: false
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://124.70.188.174:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.0.62:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username: root username: root
password: boxi_dev_0725 password: boxi_dev_0725
# url: jdbc:mysql://localhost:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai # url: jdbc:mysql://localhost:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
......
...@@ -36,10 +36,10 @@ spring: ...@@ -36,10 +36,10 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
config: config:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
file-extension: yaml file-extension: yaml
import-check: import-check:
...@@ -50,7 +50,7 @@ spring: ...@@ -50,7 +50,7 @@ spring:
- nacos:redis-config.yaml?group=project&refreshEnabled=true - nacos:redis-config.yaml?group=project&refreshEnabled=true
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://124.70.188.174:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.0.62:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username: root username: root
password: boxi_dev_0725 password: boxi_dev_0725
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
......
...@@ -6,11 +6,11 @@ spring: ...@@ -6,11 +6,11 @@ spring:
cloud: cloud:
nacos: nacos:
config: config:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
file-extension: yaml file-extension: yaml
discovery: discovery:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
config: config:
import: import:
......
...@@ -11,10 +11,10 @@ spring: ...@@ -11,10 +11,10 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
config: config:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
file-extension: yaml file-extension: yaml
import-check: import-check:
...@@ -30,7 +30,7 @@ spring: ...@@ -30,7 +30,7 @@ spring:
# - optional:nacos:datasource-config.yaml # - optional:nacos:datasource-config.yaml
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://124.70.188.174:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.0.62:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username: root username: root
password: boxi_dev_0725 password: boxi_dev_0725
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
...@@ -66,7 +66,7 @@ SaaS: ...@@ -66,7 +66,7 @@ SaaS:
ak: 216d013687ba46f5ad990e9380ec56c6 ak: 216d013687ba46f5ad990e9380ec56c6
userAccount: 1YL+MfLj/Oy70Dvbvn3mYg== userAccount: 1YL+MfLj/Oy70Dvbvn3mYg==
userPassword: EDcMZqTNwRv/ZvGJ8KG+bg== userPassword: EDcMZqTNwRv/ZvGJ8KG+bg==
encryptionPassWord: 64e1cde3f9144bfb encryptionPassWord: ceshidt123456!@#
bean: bean:
server: https://bean-test.bshg.com.cn server: https://bean-test.bshg.com.cn
app-key: eDZEhTCxAcM9paRfwPjAM7RGkfmbf15S_PEA app-key: eDZEhTCxAcM9paRfwPjAM7RGkfmbf15S_PEA
......
server: #server:
port: 8013 # port: 8013
#
spring: #spring:
application: # application:
name: project-order # name: project-order
jackson: # jackson:
default-property-inclusion: NON_NULL # default-property-inclusion: NON_NULL
time-zone: GMT+8 # time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss # date-format: yyyy-MM-dd HH:mm:ss
cloud: # cloud:
nacos: # nacos:
discovery: # discovery:
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
group: project # group: project
username: nacos # username: nacos
password: nacos # password: nacos
config: # config:
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
group: project # group: project
file-extension: yaml # file-extension: yaml
import-check: # import-check:
# no config file # # no config file
enabled: false # enabled: false
username: nacos # username: nacos
password: nacos # password: nacos
config: # config:
import: # import:
- nacos:redis-config.yaml?group=project&refreshEnabled=true # - nacos:redis-config.yaml?group=project&refreshEnabled=true
- nacos:bean-kafka-config.yaml?group=project&refreshEnabled=true # - nacos:bean-kafka-config.yaml?group=project&refreshEnabled=true
#config: # #config:
# import: # # import:
# - optional:nacos:project-order.yaml # # - optional:nacos:project-order.yaml
# - optional:nacos:datasource-config.yaml # # - optional:nacos:datasource-config.yaml
datasource: # datasource:
driver-class-name: com.mysql.cj.jdbc.Driver # driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai # url: jdbc:mysql://127.0.0.1:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username: boxi # username: boxi
password: boxi_dev_0725 # password: boxi_dev_0725
type: com.alibaba.druid.pool.DruidDataSource # type: com.alibaba.druid.pool.DruidDataSource
#
seata: #seata:
application-id: ${spring.application.name} # application-id: ${spring.application.name}
tx-service-group: ${spring.application.name}-group # tx-service-group: ${spring.application.name}-group
service: # service:
vgroup-mapping: # vgroup-mapping:
project-order-group: default # project-order-group: default
grouplist: # grouplist:
default: 127.0.0.1:8091 # default: 127.0.0.1:8091
#
mybatis-plus: #mybatis-plus:
global-config: # global-config:
db-config: # db-config:
id-type: auto # id-type: auto
configuration: # configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#
sentry: #sentry:
dsn: http://85293a9310fc4a8187422a7a257fc1ba@sentry.zjhuixinyun.com/8 # dsn: http://85293a9310fc4a8187422a7a257fc1ba@sentry.zjhuixinyun.com/8
#
# Set traces_sample_rate to 1.0 to capture 100% # # Set traces_sample_rate to 1.0 to capture 100%
# of transactions for performance monitoring. # # of transactions for performance monitoring.
# We recommend adjusting this value in production. # # We recommend adjusting this value in production.
tracesSampleRate: 1.0 # tracesSampleRate: 1.0
exception-resolver-order: -2147483647 # exception-resolver-order: -2147483647
#
SaaS: #SaaS:
url: https://pea-test.bshg.com.cn # url: https://pea-test.bshg.com.cn
ak: 64e1cde3f9144bfb850b7d37c51af559 # ak: 64e1cde3f9144bfb850b7d37c51af559
userAccount: sMvf3yZWA69lKcvlgKcOHQ== # userAccount: sMvf3yZWA69lKcvlgKcOHQ==
userPassword: qjOHxpQPXLnJP+Jq1CZGBQ== # userPassword: qjOHxpQPXLnJP+Jq1CZGBQ==
encryptionPassWord: 64e1cde3f9144bfb # encryptionPassWord: 64e1cde3f9144bfb
bean: #bean:
server: https://bean-test.bshg.com.cn # server: https://bean-test.bshg.com.cn
app-key: eDZEhTCxAcM9paRfwPjAM7RGkfmbf15S_PEA # app-key: eDZEhTCxAcM9paRfwPjAM7RGkfmbf15S_PEA
secret-key: 9kB3ESrYhh8A08nta7CjnYn2Jw1wAEXH_PEA # secret-key: 9kB3ESrYhh8A08nta7CjnYn2Jw1wAEXH_PEA
#
scheduler: #scheduler:
init-engineer-capacity: # init-engineer-capacity:
# 每天22点1次 # # 每天22点1次
cron-expr: 0 0 22 * * ? # cron-expr: 0 0 22 * * ?
day-offset-begin: 1 # day-offset-begin: 1
day-offset-end: 20 # day-offset-end: 20
rewrite-force: true # rewrite-force: true
#
calc-engineer-capacity: # calc-engineer-capacity:
# 8-20点,每30分钟1次 # # 8-20点,每30分钟1次
cron-expr: 0 */30 1-23 * * ? # cron-expr: 0 */30 1-23 * * ?
day-offset-begin: 0 # day-offset-begin: 0
day-offset-end: 20 # day-offset-end: 20
#
calc-org-capacity: # calc-org-capacity:
# 8-20点,每小时1次 # # 8-20点,每小时1次
cron-expr: 0 0 1-23 * * ? # cron-expr: 0 0 1-23 * * ?
day-offset-begin: 0 # day-offset-begin: 0
day-offset-end: 20 # day-offset-end: 20
logging: #logging:
level: # level:
root: info # root: info
org.hibernate.type.descriptor.sql.BasicBinder: trace # org.hibernate.type.descriptor.sql.BasicBinder: trace
\ No newline at end of file \ No newline at end of file
...@@ -7,10 +7,10 @@ spring: ...@@ -7,10 +7,10 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
config: config:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
file-extension: yaml file-extension: yaml
config: config:
...@@ -20,7 +20,7 @@ spring: ...@@ -20,7 +20,7 @@ spring:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://124.70.188.174:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.0.62:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username: root username: root
password: boxi_dev_0725 password: boxi_dev_0725
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
......
...@@ -7,10 +7,10 @@ spring: ...@@ -7,10 +7,10 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
config: config:
server-addr: 124.70.188.174:8848 server-addr: 192.168.0.62:8848
group: project group: project
file-extension: yaml file-extension: yaml
config: config:
...@@ -20,7 +20,7 @@ spring: ...@@ -20,7 +20,7 @@ spring:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://124.70.188.174:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.0.62:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username: root username: root
password: boxi_dev_0725 password: boxi_dev_0725
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!