修改冲突
This commit is contained in:
parent
49a935d6c6
commit
63da647619
@ -4,8 +4,8 @@ dubbo:
|
|||||||
protocol: zookeeper
|
protocol: zookeeper
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
# address: 121.229.45.214:9004
|
# address: 121.229.45.214:9004
|
||||||
address: 172.16.100.93:2181
|
# address: 172.16.100.93:2181
|
||||||
# address: 127.0.0.1:2181
|
address: 127.0.0.1:2181
|
||||||
# address: 114.218.158.24:2181
|
# address: 114.218.158.24:2181
|
||||||
consumer:
|
consumer:
|
||||||
filter: tracing
|
filter: tracing
|
||||||
@ -42,7 +42,50 @@ dubbo:
|
|||||||
params:
|
params:
|
||||||
.accessKeyId: "Paymentksl"
|
.accessKeyId: "Paymentksl"
|
||||||
.secretAccessKey: "BSDY-FDF1-Fontree_payment"
|
.secretAccessKey: "BSDY-FDF1-Fontree_payment"
|
||||||
|
CastClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
interface: com.fontree.microservices.fiee.multicast
|
||||||
SecFilingsClientImpl:
|
SecFilingsClientImpl:
|
||||||
protocol: tri
|
protocol: tri
|
||||||
retries: 0
|
retries: 0
|
||||||
interface: com.fontree.microservices.fiee.SecFiling
|
interface: com.fontree.microservices.fiee.SecFiling
|
||||||
|
logger:
|
||||||
|
zap-config:
|
||||||
|
level: error # 日志级别
|
||||||
|
development: false
|
||||||
|
disableCaller: false
|
||||||
|
disableStacktrace: false
|
||||||
|
encoding: "json"
|
||||||
|
# zap encoder 配置
|
||||||
|
encoderConfig:
|
||||||
|
messageKey: "message"
|
||||||
|
levelKey: "level"
|
||||||
|
timeKey: "time"
|
||||||
|
nameKey: "logger"
|
||||||
|
callerKey: "caller"
|
||||||
|
stacktraceKey: "stacktrace"
|
||||||
|
lineEnding: ""
|
||||||
|
levelEncoder: "capitalColor"
|
||||||
|
timeEncoder: "iso8601"
|
||||||
|
durationEncoder: "seconds"
|
||||||
|
callerEncoder: "short"
|
||||||
|
nameEncoder: ""
|
||||||
|
EncodeTime: zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05.000"),
|
||||||
|
EncodeDuration: zapcore.SecondsDurationEncoder,
|
||||||
|
outputPaths:
|
||||||
|
- "stderr"
|
||||||
|
errorOutputPaths:
|
||||||
|
- "stderr"
|
||||||
|
lumberjack-config:
|
||||||
|
# 写日志的文件名称
|
||||||
|
filename: "runtime/logs/fiee.log"
|
||||||
|
# 每个日志文件长度的最大大小，单位是 MiB。默认 100MiB
|
||||||
|
maxSize: 5
|
||||||
|
# 日志保留的最大天数(只保留最近多少天的日志)
|
||||||
|
maxAge: 30
|
||||||
|
# 只保留最近多少个日志文件，用于控制程序总日志的大小
|
||||||
|
maxBackups: 30
|
||||||
|
# 是否使用本地时间，默认使用 UTC 时间
|
||||||
|
localTime: true
|
||||||
|
# 是否压缩日志文件，压缩方法 gzip
|
||||||
|
compress: false
|
||||||
@ -42,7 +42,50 @@ dubbo:
|
|||||||
params:
|
params:
|
||||||
.accessKeyId: "Paymentksl"
|
.accessKeyId: "Paymentksl"
|
||||||
.secretAccessKey: "BSDY-FDF1-Fontree_payment"
|
.secretAccessKey: "BSDY-FDF1-Fontree_payment"
|
||||||
|
CastClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
interface: com.fontree.microservices.fiee.multicast
|
||||||
SecFilingsClientImpl:
|
SecFilingsClientImpl:
|
||||||
protocol: tri
|
protocol: tri
|
||||||
retries: 0
|
retries: 0
|
||||||
interface: com.fontree.microservices.fiee.SecFiling
|
interface: com.fontree.microservices.fiee.SecFiling
|
||||||
|
logger:
|
||||||
|
zap-config:
|
||||||
|
level: error # 日志级别
|
||||||
|
development: false
|
||||||
|
disableCaller: false
|
||||||
|
disableStacktrace: false
|
||||||
|
encoding: "json"
|
||||||
|
# zap encoder 配置
|
||||||
|
encoderConfig:
|
||||||
|
messageKey: "message"
|
||||||
|
levelKey: "level"
|
||||||
|
timeKey: "time"
|
||||||
|
nameKey: "logger"
|
||||||
|
callerKey: "caller"
|
||||||
|
stacktraceKey: "stacktrace"
|
||||||
|
lineEnding: ""
|
||||||
|
levelEncoder: "capitalColor"
|
||||||
|
timeEncoder: "iso8601"
|
||||||
|
durationEncoder: "seconds"
|
||||||
|
callerEncoder: "short"
|
||||||
|
nameEncoder: ""
|
||||||
|
EncodeTime: zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05.000"),
|
||||||
|
EncodeDuration: zapcore.SecondsDurationEncoder,
|
||||||
|
outputPaths:
|
||||||
|
- "stderr"
|
||||||
|
errorOutputPaths:
|
||||||
|
- "stderr"
|
||||||
|
lumberjack-config:
|
||||||
|
# 写日志的文件名称
|
||||||
|
filename: "runtime/logs/fiee.log"
|
||||||
|
# 每个日志文件长度的最大大小，单位是 MiB。默认 100MiB
|
||||||
|
maxSize: 5
|
||||||
|
# 日志保留的最大天数(只保留最近多少天的日志)
|
||||||
|
maxAge: 30
|
||||||
|
# 只保留最近多少个日志文件，用于控制程序总日志的大小
|
||||||
|
maxBackups: 30
|
||||||
|
# 是否使用本地时间，默认使用 UTC 时间
|
||||||
|
localTime: true
|
||||||
|
# 是否压缩日志文件，压缩方法 gzip
|
||||||
|
compress: false
|
||||||
@ -4,5 +4,88 @@ dubbo:
|
|||||||
protocol: zookeeper
|
protocol: zookeeper
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
# address: 121.229.45.214:9004
|
# address: 121.229.45.214:9004
|
||||||
address: 127.0.0.1:2181
|
address: 172.16.100.93:2181
|
||||||
# address: 114.218.158.24:2181
|
# address: 127.0.0.1:2181
|
||||||
|
# address: 114.218.158.24:2181
|
||||||
|
consumer:
|
||||||
|
filter: tracing
|
||||||
|
request-timeout: 30s
|
||||||
|
references:
|
||||||
|
OrderClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
retries: 0
|
||||||
|
interface: com.fontree.microservices.common.order # must be compatible with grpc or dubbo-java
|
||||||
|
# filter: cshutdown,sign,fonDomainFilter,fonValidateFilter
|
||||||
|
params:
|
||||||
|
.accessKeyId: "SYD8-order-04"
|
||||||
|
.secretAccessKey: "Al-order-FDF112"
|
||||||
|
BundleClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
retries: 0
|
||||||
|
interface: com.fontree.microservices.fiee.bundle # must be compatible with grpc or dubbo-java
|
||||||
|
AccountClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
retries: 0
|
||||||
|
interface: com.fontree.microservices.common.Account
|
||||||
|
filter: echo,metrics,token,accesslog,sign,tps,generic_service,execute
|
||||||
|
params:
|
||||||
|
.accessKeyId: "Accountksl"
|
||||||
|
.secretAccessKey: "BSDY-FDF1-Fontree_account"
|
||||||
|
AccountFieeClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
retries: 3
|
||||||
|
interface: com.fontree.microservices.common.micro.account.fiee
|
||||||
|
# filter: echo,metrics,token,accesslog,sign,tps,generic_service,execute,pshutdown,auth,fonValidateFilter
|
||||||
|
PaymentCentClientImpl:
|
||||||
|
interface: com.fontree.microservices.common.payment # must be compatible with grpc or dubbo-java
|
||||||
|
filter: cshutdown,sign,auth
|
||||||
|
params:
|
||||||
|
.accessKeyId: "Paymentksl"
|
||||||
|
.secretAccessKey: "BSDY-FDF1-Fontree_payment"
|
||||||
|
CastClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
interface: com.fontree.microservices.fiee.multicast
|
||||||
|
SecFilingsClientImpl:
|
||||||
|
protocol: tri
|
||||||
|
retries: 0
|
||||||
|
interface: com.fontree.microservices.fiee.SecFiling
|
||||||
|
logger:
|
||||||
|
zap-config:
|
||||||
|
level: error # 日志级别
|
||||||
|
development: false
|
||||||
|
disableCaller: false
|
||||||
|
disableStacktrace: false
|
||||||
|
encoding: "json"
|
||||||
|
# zap encoder 配置
|
||||||
|
encoderConfig:
|
||||||
|
messageKey: "message"
|
||||||
|
levelKey: "level"
|
||||||
|
timeKey: "time"
|
||||||
|
nameKey: "logger"
|
||||||
|
callerKey: "caller"
|
||||||
|
stacktraceKey: "stacktrace"
|
||||||
|
lineEnding: ""
|
||||||
|
levelEncoder: "capitalColor"
|
||||||
|
timeEncoder: "iso8601"
|
||||||
|
durationEncoder: "seconds"
|
||||||
|
callerEncoder: "short"
|
||||||
|
nameEncoder: ""
|
||||||
|
EncodeTime: zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05.000"),
|
||||||
|
EncodeDuration: zapcore.SecondsDurationEncoder,
|
||||||
|
outputPaths:
|
||||||
|
- "stderr"
|
||||||
|
errorOutputPaths:
|
||||||
|
- "stderr"
|
||||||
|
lumberjack-config:
|
||||||
|
# 写日志的文件名称
|
||||||
|
filename: "runtime/logs/fiee.log"
|
||||||
|
# 每个日志文件长度的最大大小，单位是 MiB。默认 100MiB
|
||||||
|
maxSize: 5
|
||||||
|
# 日志保留的最大天数(只保留最近多少天的日志)
|
||||||
|
maxAge: 30
|
||||||
|
# 只保留最近多少个日志文件，用于控制程序总日志的大小
|
||||||
|
maxBackups: 30
|
||||||
|
# 是否使用本地时间，默认使用 UTC 时间
|
||||||
|
localTime: true
|
||||||
|
# 是否压缩日志文件，压缩方法 gzip
|
||||||
|
compress: false
|
||||||
Loading…
Reference in New Issue
Block a user