From 5193bfb6c137107c45dadc61c1c4b44b298dfab3 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Sat, 14 May 2022 19:51:30 +0800 Subject: [PATCH] 20220514 --- .../cloudutil/feign/TallFeignClient.java | 2 +- .../main/resources/application-util-8hz.yml | 67 +++++++++++++++++++ .../com/ccsens/ht/config/SpringConfig.java | 2 +- ht/src/main/resources/application-8hz.yml | 44 ++++++++++++ ht/src/main/resources/application.yml | 4 +- ht/src/main/resources/druid-8hz.yml | 35 ++++++++++ tall/src/main/resources/application-8hz.yml | 37 ++++++++++ tall/src/main/resources/application.yml | 4 +- tall/src/main/resources/druid-8hz.yml | 33 +++++++++ 9 files changed, 222 insertions(+), 6 deletions(-) create mode 100644 cloudutil/src/main/resources/application-util-8hz.yml create mode 100644 ht/src/main/resources/application-8hz.yml create mode 100644 ht/src/main/resources/druid-8hz.yml create mode 100644 tall/src/main/resources/application-8hz.yml create mode 100644 tall/src/main/resources/druid-8hz.yml diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index c6903cab..2617b86a 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -28,7 +28,7 @@ import java.util.Map; * @create: 2019/11/27 10:03 */ -@FeignClient(name = "tall-visual", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class) +@FeignClient(name = "tall", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class) public interface TallFeignClient { /** diff --git a/cloudutil/src/main/resources/application-util-8hz.yml b/cloudutil/src/main/resources/application-util-8hz.yml new file mode 100644 index 00000000..5606ff30 --- /dev/null +++ b/cloudutil/src/main/resources/application-util-8hz.yml @@ -0,0 +1,67 @@ +#服务端点暴露 +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@127.0.0.1:7010/eureka/ +# defaultZone: http://admin:admin@81.70.54.64: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 +hystrix: + threadpool: + default: + coreSize: 200 #并发执行的最大线程数，默认10 + maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1 + queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5 +# 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.*'] \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java b/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java index 2cba511b..b5ac0755 100644 --- a/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java +++ b/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java @@ -92,6 +92,6 @@ public class SpringConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/uploads/**") - .addResourceLocations("file:///home/cloud/ht_visual/uploads/"); + .addResourceLocations("file:///home/cloud/ht/uploads/"); } } \ No newline at end of file diff --git a/ht/src/main/resources/application-8hz.yml b/ht/src/main/resources/application-8hz.yml new file mode 100644 index 00000000..ced5ab8d --- /dev/null +++ b/ht/src/main/resources/application-8hz.yml @@ -0,0 +1,44 @@ +server: + port: 7040 + servlet: + context-path: +spring: + application: + name: ht + datasource: + type: com.alibaba.druid.pool.DruidDataSource + rabbitmq: + host: 127.0.0.1 + password: 111111 + port: 5672 + username: tall + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms + + +swagger: + enable: false +file: +# path: /home/cloud/ht/uploads/ +# domain: https://sd.tall.wiki/gateway/ht/ +# imgDomain: https://sd.tall.wiki/gateway/ht/uploads + path: /home/cloud/ht/uploads/ + domain: https://www.eight-hertz.com/gateway/ht/ + imgDomain: https://www.eight-hertz.com/gateway/ht/uploads +ht: + project: + patientUrl: https://www.eight-hertz.com/ht-dev/htPatientRegister + name: 认知功能评测云平台系统 +eureka: + instance: + ip-address: 127.0.0.1 \ No newline at end of file diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml index 4ecd13fd..ef258489 100644 --- a/ht/src/main/resources/application.yml +++ b/ht/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: 8hz + include: common, util-8hz diff --git a/ht/src/main/resources/druid-8hz.yml b/ht/src/main/resources/druid-8hz.yml new file mode 100644 index 00000000..2b3b8541 --- /dev/null +++ b/ht/src/main/resources/druid-8hz.yml @@ -0,0 +1,35 @@ +spring: + datasource: + druid: + connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + driverClassName: com.mysql.cj.jdbc.Driver + dynamicUrl: jdbc:mysql://localhost:3306/${schema} + filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*' + filterName: druidFilter + filterProfileEnable: true + filterUrlPattern: /* + filters: stat,wall + initialSize: 5 + maxActive: 20 + maxPoolPreparedStatementPerConnectionSize: 20 + maxWait: 60000 + minEvictableIdleTimeMillis: 300000 + minIdle: 5 +# password: b3fd300ad4694070007fdcca961c4018211dc53235dd806ad62abc0cc0abb8e5 + password: + poolPreparedStatements: true + servletLogSlowSql: true + servletLoginPassword: 111111 + servletLoginUsername: druid + servletName: druidServlet + servletResetEnable: true + servletUrlMapping: /druid/* + testOnBorrow: false + testOnReturn: false + testWhileIdle: true + timeBetweenEvictionRunsMillis: 60000 +# url: jdbc:mysql://127.0.0.1/ht?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://127.0.0.1/ht?useUnicode=true&characterEncoding=UTF-8 + username: root + validationQuery: SELECT 1 FROM DUAL + env: CCSENS_HT \ No newline at end of file diff --git a/tall/src/main/resources/application-8hz.yml b/tall/src/main/resources/application-8hz.yml new file mode 100644 index 00000000..02fa9bd4 --- /dev/null +++ b/tall/src/main/resources/application-8hz.yml @@ -0,0 +1,37 @@ +server: + port: 7030 + servlet: + context-path: /v1.0 +spring: + snowflake: + datacenterId: 1 + workerId: 1 + application: + name: tall + datasource: + type: com.alibaba.druid.pool.DruidDataSource + rabbitmq: + host: 127.0.0.1 + password: 111111 + port: 5672 + username: tall + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: + port: 6379 + timeout: 1000ms +swagger: + enable: false +eureka: + instance: + ip-address: 127.0.0.1 + +gatewayUrl: https://www.eight-hertz.com/gateway/ +smsCode: 1 \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index af245946..9909a61f 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: util-prod,common \ No newline at end of file + active: 8hz + include: util-8hz,common \ No newline at end of file diff --git a/tall/src/main/resources/druid-8hz.yml b/tall/src/main/resources/druid-8hz.yml new file mode 100644 index 00000000..a417cb0c --- /dev/null +++ b/tall/src/main/resources/druid-8hz.yml @@ -0,0 +1,33 @@ +spring: + datasource: + druid: + connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + driverClassName: com.mysql.cj.jdbc.Driver + dynamicUrl: jdbc:mysql://127.0.0.1:3306/${schema} + filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*' + filterName: druidFilter + filterProfileEnable: true + filterUrlPattern: /* + filters: stat,wall + initialSize: 5 + maxActive: 20 + maxPoolPreparedStatementPerConnectionSize: 20 + maxWait: 60000 + minEvictableIdleTimeMillis: 300000 + minIdle: 5 + password: + poolPreparedStatements: true + servletLogSlowSql: true + servletLoginPassword: 111111 + servletLoginUsername: druid + servletName: druidServlet + servletResetEnable: true + servletUrlMapping: /druid/* + testOnBorrow: false + testOnReturn: false + testWhileIdle: true + timeBetweenEvictionRunsMillis: 60000 + url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8 + username: root + validationQuery: SELECT 1 FROM DUAL + env: CCSENS_HT \ No newline at end of file