diff --git a/cloudutil/src/main/resources/application-util-prod.yml b/cloudutil/src/main/resources/application-util-prod.yml index f2d211d5..13492aa5 100644 --- a/cloudutil/src/main/resources/application-util-prod.yml +++ b/cloudutil/src/main/resources/application-util-prod.yml @@ -1,3 +1,65 @@ +#<<<<<<< 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: @@ -5,8 +67,8 @@ management: 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 + # # 不暴露哪些端点 + # exclude: env,beans,configprops endpoint: health: # 是否展示健康检查详情 @@ -20,10 +82,13 @@ eureka: service-url: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ + # defaultZone: http://admin:admin@49.232.6.143:7010/eureka/ + # defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ -# defaultZone: http://admin:admin@81.70.54.64:7010/eureka/ +# defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ defaultZone: http://admin:admin@121.36.3.207:7010/eureka/ - + # defaultZone: http://admin:admin@192.168.31.13:7010/eureka/ + # defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server prefer-ip-address: true @@ -33,54 +98,6 @@ eureka: 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 -#hystrix: -# threadpool: -# default: -# coreSize: 200 #并发执行的最大线程数，默认10 -# maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1 -# queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5 -# command: -# default: -# execution: -# isolation: -# #SEMAPHORE 它在调用线程上执行，并发请求受信号量限制 THREAD它在单独的线程上执行，并发请求受线程池中线程数的限制 -# strategy: THREAD -# thread: -# timeoutInMilliseconds: 60000 -# timeouot: -# enabled: false -##ribbon的超时时间 -#ribbon: -# ReadTimeout: 60000 -# ConnectTimeout: 60000 -## sleuth -#logging: -# level: -# root: info -# org.springframework.cloud.sleuth: DEBUG -#spring: -## zipkin: -## base-url: http://140.143.228.3:9411 -## sleuth: -## sampler: -## # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 -## probability: 0.1 -# cloud: -# inetutils: -# ignored-interfaces: ['VMware.*'] feign: client: config: @@ -101,9 +118,14 @@ hystrix: timeout: enabled: true isolation: - strategy: SEMAPHORE + strategy: THREAD thread: timeoutInMilliseconds: 60000 + threadpool: + default: + coreSize: 200 #并发执行的最大线程数，默认10 + maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1 + queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5 #ribbon的超时时间 ribbon: ReadTimeout: 60000 diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 918a49db..09551a96 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -120,6 +120,11 @@ hystrix: strategy: SEMAPHORE thread: timeoutInMilliseconds: 60000 + threadpool: + default: + coreSize: 200 #并发执行的最大线程数，默认10 + maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1 + queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5 #ribbon的超时时间 ribbon: ReadTimeout: 60000 diff --git a/util/src/main/java/com/ccsens/util/CodeError.java b/util/src/main/java/com/ccsens/util/CodeError.java index b3b90dfb..903c10b8 100644 --- a/util/src/main/java/com/ccsens/util/CodeError.java +++ b/util/src/main/java/com/ccsens/util/CodeError.java @@ -11,6 +11,7 @@ public class CodeError { public static final Code SYS_ERROR = new Code(500, "网络繁忙，请您稍后重试", false); public static final Code THIRD_ERROR = new Code(-1, "调用第三方刚接口异常", false); public static final Code PARAM_ERROR = new Code(1, "参数异常", false); + public static final Code PARAM_LOCK = new Code(2, "必填参数为空", false); @Getter public static class Code{