merge and modify config file
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
|
||||
spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
druid:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
# url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
|
||||
url: jdbc:mysql://59.110.212.44:3306/e_book?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
|
||||
url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
|
||||
username: root
|
||||
password: HSXY1234hsxy
|
||||
initial-size: 10
|
||||
@@ -42,13 +42,6 @@ spring:
|
||||
username: admin
|
||||
password: 751019
|
||||
virtualHost: /
|
||||
|
||||
|
||||
# redis:
|
||||
# host: 82.157.238.238
|
||||
# port: 6379
|
||||
# password: redis970104
|
||||
|
||||
aliyun:
|
||||
oss:
|
||||
file:
|
||||
@@ -63,18 +56,5 @@ aliyun:
|
||||
|
||||
templateCode: SMS_248840040
|
||||
|
||||
|
||||
##多数据源的配置
|
||||
#dynamic:
|
||||
# datasource:
|
||||
# slave1:
|
||||
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_security
|
||||
# username: sa
|
||||
# password: 123456
|
||||
# slave2:
|
||||
# driver-class-name: org.postgresql.Driver
|
||||
# url: jdbc:postgresql://localhost:5432/renren_security
|
||||
# username: renren
|
||||
|
||||
# password: 123456
|
||||
server:
|
||||
port: 9200
|
||||
@@ -1,10 +1,10 @@
|
||||
|
||||
spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
druid:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
# url: jdbc:mysql://59.110.212.44:3306/e_book?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
|
||||
url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
|
||||
url: jdbc:mysql://59.110.212.44:3306/e_book?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
password: HSXY1234hsxy
|
||||
initial-size: 10
|
||||
@@ -55,16 +55,5 @@ aliyun:
|
||||
|
||||
templateCode: SMS_248840040
|
||||
|
||||
##多数据源的配置
|
||||
#dynamic:
|
||||
# datasource:
|
||||
# slave1:
|
||||
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_security
|
||||
# username: sa
|
||||
# password: 123456
|
||||
# slave2:
|
||||
# driver-class-name: org.postgresql.Driver
|
||||
# url: jdbc:postgresql://localhost:5432/renren_security
|
||||
# username: renren
|
||||
# password: 123456
|
||||
server:
|
||||
port: 9100
|
||||
@@ -4,7 +4,6 @@ server:
|
||||
uri-encoding: UTF-8
|
||||
max-threads: 1000
|
||||
min-spare-threads: 30
|
||||
port: 9200
|
||||
servlet:
|
||||
context-path: /pb
|
||||
|
||||
@@ -12,7 +11,7 @@ connection-timeout: 6000000ms
|
||||
spring:
|
||||
# 环境 dev|test|prod
|
||||
profiles:
|
||||
active: prod
|
||||
active: dev
|
||||
# jackson时间格式化
|
||||
jackson:
|
||||
time-zone: GMT+8
|
||||
|
||||
@@ -16,8 +16,8 @@ wxpay.notifyUrl: http://59.110.212.44:9100/pb/pay/payNotify
|
||||
wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
|
||||
# ???? /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
|
||||
|
||||
wxpay.keyPemPath:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
|
||||
#wxpay.keyPemPath:D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
|
||||
#wxpay.keyPemPath:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
|
||||
wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
|
||||
#???????
|
||||
wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
|
||||
#???????
|
||||
|
||||
Reference in New Issue
Block a user