diff --git a/Dockerfile b/Dockerfile index 757dd5d..75ae3bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM busybox:uclibc WORKDIR /app -# 复制时区数据(从本地复制) +# 复制时区数据 COPY timezone/localtime /etc/localtime COPY timezone/timezone /etc/timezone COPY timezone/Shanghai /usr/share/zoneinfo/Asia/Shanghai diff --git a/config.yml b/config.yml index 2d4109c..b52a335 100644 --- a/config.yml +++ b/config.yml @@ -121,7 +121,7 @@ circuitBreaker: fallbackMessage: "钱包服务暂时繁忙,请稍后再试" # 降级提示消息 requestTimeout: 30000 distributedTTL: 300 # 钱包服务启用分布式熔断 - adminIPs: "127.0.0.1,116.204.74.41" # 允许重置熔断器的管理员IP列表(逗号分隔) + adminIPs: "127.0.0.1,192.168.0.169" # 允许重置熔断器的管理员IP列表(逗号分隔) market: enabled: true maxFailures: 5 @@ -148,7 +148,7 @@ circuitBreaker: redis: # 集群模式配置方法 default: - address: 116.204.74.41:6379 + address: 192.168.0.169:6379 db: 0 idleTimeout: "60s" #连接最大空闲时间,使用时间字符串例如30s/1m/1d maxConnLifetime: "90s" #连接最长存活时间,使用时间字符串例如30s/1m/1d @@ -158,9 +158,9 @@ redis: writeTimeout: "30s" #TCP的Write操作超时时间,使用时间字符串例如30s/1m/1d maxActive: 100 consul: - address: 116.204.74.41:8500 + address: 192.168.0.169:8500 services: - name: customerService - name: test111 jaeger: #链路追踪 - addr: 116.204.74.41:4318 + addr: 192.168.0.169:4318 diff --git a/timezone/Shanghai b/timezone/Shanghai new file mode 100644 index 0000000..91f6f8b Binary files /dev/null and b/timezone/Shanghai differ diff --git a/timezone/localtime b/timezone/localtime new file mode 100644 index 0000000..91f6f8b Binary files /dev/null and b/timezone/localtime differ diff --git a/timezone/timezone b/timezone/timezone new file mode 100644 index 0000000..421b7a4 --- /dev/null +++ b/timezone/timezone @@ -0,0 +1 @@ +Asia/Shanghai