解决yml冲突
This commit is contained in:
parent
30613accd3
commit
1c45d971b5
|
|
@ -191,12 +191,6 @@ spring:
|
||||||
username: nu_sys
|
username: nu_sys
|
||||||
password: nu_sys
|
password: nu_sys
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
# 多数据源配置-试验田
|
|
||||||
nuro:
|
|
||||||
url: jdbc:mysql://192.168.2.199:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
|
||||||
username: nu_ro
|
|
||||||
password: nu_ro
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
#redis 配置
|
#redis 配置
|
||||||
redis:
|
redis:
|
||||||
database: 0
|
database: 0
|
||||||
|
|
@ -255,12 +249,10 @@ jeecg:
|
||||||
pc: http://localhost:3100
|
pc: http://localhost:3100
|
||||||
app: http://localhost:8051
|
app: http://localhost:8051
|
||||||
path:
|
path:
|
||||||
#服务指令上传目录
|
|
||||||
directivepath: /opt/upFiles001/directive
|
|
||||||
#文件上传根目录 设置
|
#文件上传根目录 设置
|
||||||
upload: /opt/upFiles001
|
upload: /opt/upFiles
|
||||||
#webapp文件路径
|
#webapp文件路径
|
||||||
webapp: /opt/webapp001
|
webapp: /opt/webapp
|
||||||
shiro:
|
shiro:
|
||||||
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
|
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
|
||||||
#阿里云oss存储和大鱼短信秘钥配置
|
#阿里云oss存储和大鱼短信秘钥配置
|
||||||
|
|
@ -382,6 +374,7 @@ tplink:
|
||||||
username: administrator
|
username: administrator
|
||||||
password: Root@123..
|
password: Root@123..
|
||||||
uploadpath: /
|
uploadpath: /
|
||||||
|
|
||||||
#zmy
|
#zmy
|
||||||
aliyun:
|
aliyun:
|
||||||
ocr:
|
ocr:
|
||||||
|
|
@ -389,3 +382,18 @@ aliyun:
|
||||||
accessKeySecret: pQBMT6TlUWgRfvvDnOu0IKVYXCfKee
|
accessKeySecret: pQBMT6TlUWgRfvvDnOu0IKVYXCfKee
|
||||||
#文件传输秘钥
|
#文件传输秘钥
|
||||||
downloadkey: hP2K9Z!WLuj"M#8,
|
downloadkey: hP2K9Z!WLuj"M#8,
|
||||||
|
|
||||||
|
# 微信支付
|
||||||
|
wxpay:
|
||||||
|
# APIv3密钥
|
||||||
|
api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E
|
||||||
|
# APPID
|
||||||
|
appid: wx8fc3e4305d2fbf0b
|
||||||
|
# 商户ID
|
||||||
|
mch-id: 1717618860
|
||||||
|
# 商户API证书序列号
|
||||||
|
mch-serial-no: 3E51C9D24F64CE50E9273E544561D29684AB21C7
|
||||||
|
# 接收结果通知地址
|
||||||
|
notify-domain: https://www.focusnu.com/nursing-unit_0010507/weiXinPay/wx/callback
|
||||||
|
# 商户私钥文件路径
|
||||||
|
private-key-path: c://apiclient_key.pem
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
server:
|
server:
|
||||||
port: 8081
|
port: 8082
|
||||||
tomcat:
|
tomcat:
|
||||||
max-swallow-size: -1
|
max-swallow-size: -1
|
||||||
error:
|
error:
|
||||||
|
|
@ -191,12 +191,6 @@ spring:
|
||||||
username: fw8864sshdang
|
username: fw8864sshdang
|
||||||
password: uGDBkM25I6nZCNM2
|
password: uGDBkM25I6nZCNM2
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
# 多数据源配置-试验田
|
|
||||||
# nuro:
|
|
||||||
# url: jdbc:mysql://192.168.2.199:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
|
||||||
# username: nu_ro
|
|
||||||
# password: nu_ro
|
|
||||||
# driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
#redis 配置
|
#redis 配置
|
||||||
redis:
|
redis:
|
||||||
database: 0
|
database: 0
|
||||||
|
|
@ -253,8 +247,6 @@ jeecg:
|
||||||
pc: http://localhost:3100
|
pc: http://localhost:3100
|
||||||
app: http://localhost:8051
|
app: http://localhost:8051
|
||||||
path:
|
path:
|
||||||
#服务指令上传目录
|
|
||||||
directivepath: /opt/upFiles/directive
|
|
||||||
#文件上传根目录 设置
|
#文件上传根目录 设置
|
||||||
upload: /opt/nu001/upFiles
|
upload: /opt/nu001/upFiles
|
||||||
#webapp文件路径
|
#webapp文件路径
|
||||||
|
|
@ -380,6 +372,7 @@ tplink:
|
||||||
username: administrator
|
username: administrator
|
||||||
password: Root@123..
|
password: Root@123..
|
||||||
uploadpath: /
|
uploadpath: /
|
||||||
|
|
||||||
#zmy
|
#zmy
|
||||||
aliyun:
|
aliyun:
|
||||||
ocr:
|
ocr:
|
||||||
|
|
@ -387,3 +380,18 @@ aliyun:
|
||||||
accessKeySecret: pQBMT6TlUWgRfvvDnOu0IKVYXCfKee
|
accessKeySecret: pQBMT6TlUWgRfvvDnOu0IKVYXCfKee
|
||||||
#文件传输秘钥
|
#文件传输秘钥
|
||||||
downloadkey: hP2K9Z!WLuj"M#8,
|
downloadkey: hP2K9Z!WLuj"M#8,
|
||||||
|
|
||||||
|
# 微信支付
|
||||||
|
wxpay:
|
||||||
|
# APIv3密钥
|
||||||
|
api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E
|
||||||
|
# APPID
|
||||||
|
appid: wx8fc3e4305d2fbf0b
|
||||||
|
# 商户ID
|
||||||
|
mch-id: 1717618860
|
||||||
|
# 商户API证书序列号
|
||||||
|
mch-serial-no: 3E51C9D24F64CE50E9273E544561D29684AB21C7
|
||||||
|
# 接收结果通知地址
|
||||||
|
notify-domain: https://www.focusnu.com/nursing-unit_0010507/weiXinPay/callback
|
||||||
|
# 商户私钥文件路径
|
||||||
|
private-key-path: /opt/nu001/apiclient_key.pem
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue