diff --git a/cloudutil/src/main/resources/application-util-pre.yml b/cloudutil/src/main/resources/application-util-pre.yml new file mode 100644 index 00000000..38b45b53 --- /dev/null +++ b/cloudutil/src/main/resources/application-util-pre.yml @@ -0,0 +1,145 @@ +#<<<<<<< HEAD +##服务端点暴露 +#management: +# endpoints: +# web: +# exposure: +# # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*' +# include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream +## # 不暴露哪些端点 +## exclude: env,beans,configprops +# endpoint: +# health: +# # 是否展示健康检查详情 +# show-details: always +# health: +# redis: +# enabled: false +##eureka注册 +#eureka: +# client: +# service-url: +# # 指定eureka server通信地址，注意/eureka/小尾巴不能少 +# #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ +## defaultZone: http://admin:admin@49.233.89.188:7010/eureka/ +# defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ +# instance: +# # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server +# prefer-ip-address: true +# metadata-map: +# management: +# context-path: ${server.servlet.context-path:}/actuator +# home-page-url-path: ${server.servlet.context-path:}/ +# status-page-url-path: ${server.servlet.context-path:}/actuator/info +# health-check-url-path: ${server.servlet.context-path:}/actuator/health +#feign: +# client: +# config: +# default: +# connectTime: 5000 +# readTimeout: 5000 +# # NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。 +# # BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。 +# # HEADERS：记录BASIC级别的基础上，记录请求和响应的header。 +# # FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据 +# loggerLevel: basic +# hystrix: +# enabled: true +## sleuth +#logging: +# level: +# root: info +# org.springframework.cloud.sleuth: DEBUG +#spring: +## zipkin: +## base-url: http://49.233.89.188:9411 +## sleuth: +## sampler: +## # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 +## probability: 1.0 +# cloud: +# inetutils: +#======= +#服务端点暴露 +management: + endpoints: + web: + exposure: + # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*' + include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream + # # 不暴露哪些端点 + # exclude: env,beans,configprops + endpoint: + health: + # 是否展示健康检查详情 + show-details: always + health: + redis: + enabled: false +#eureka注册 +eureka: + client: + service-url: + # 指定eureka server通信地址，注意/eureka/小尾巴不能少 + #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ + +# defaultZone: http://admin:admin@101.201.226.21:7010/eureka/ +# defaultZone: http://admin:admin@121.36.3.207:7010/eureka/ + defaultZone: http://admin:admin@127.0.0.1:7010/eureka/ + # defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ + instance: + # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server + prefer-ip-address: true + metadata-map: + management: + context-path: ${server.servlet.context-path:}/actuator + home-page-url-path: ${server.servlet.context-path:}/ + status-page-url-path: ${server.servlet.context-path:}/actuator/info + health-check-url-path: ${server.servlet.context-path:}/actuator/health +feign: + client: + config: + default: + connectTime: 60000 + readTimeout: 60000 + # NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。 + # BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。 + # HEADERS：记录BASIC级别的基础上，记录请求和响应的header。 + # FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据 + loggerLevel: basic + hystrix: + enabled: true +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + strategy: THREAD + thread: + timeoutInMilliseconds: 60000 + threadpool: + default: + coreSize: 200 #并发执行的最大线程数，默认10 + maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1 + queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5 +#ribbon的超时时间 +ribbon: + ReadTimeout: 60000 + ConnectTimeout: 60000 +# sleuth +logging: + level: + root: info + org.springframework.cloud.sleuth: DEBUG +spring: + # zipkin: + # base-url: http://49.233.89.188:9411 + # sleuth: + # sampler: + # # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 + # probability: 1.0 + cloud: + inetutils: + ignored-interfaces: ['VMware.*'] \ No newline at end of file diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 09551a96..e2790f96 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -117,7 +117,7 @@ hystrix: timeout: enabled: true isolation: - strategy: SEMAPHORE + strategy: THREAD thread: timeoutInMilliseconds: 60000 threadpool: diff --git a/signin/src/main/resources/application.yml b/signin/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/signin/src/main/resources/application.yml +++ b/signin/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common diff --git a/signin/src/main/resources/druid-test.yml b/signin/src/main/resources/druid-test.yml index f3bbd3c2..e6a4010d 100644 --- a/signin/src/main/resources/druid-test.yml +++ b/signin/src/main/resources/druid-test.yml @@ -29,7 +29,7 @@ spring: testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 # url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8 - url: jdbc:mysql://test.tall.wiki/tall3?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://test.tall.wiki/tall3_bak?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file