1、调整日志配置

2、去掉流量监控
3、去掉没有用的配置

pom.xml

@@ -86,11 +86,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <!--hystrix-dashboard-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
-        </dependency>
         <!--hystrix -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -195,11 +190,7 @@
             <artifactId>spring-boot-data-aggregator-starter</artifactId>
             <version>${aggregator.version}</version>
         </dependency>
-
     </dependencies>
-
-   
-
     <build>
        <plugins>
 			<plugin>

src/main/java/com/diagbot/CdssApplication.java

@@ -9,7 +9,6 @@ import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfigurati
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
-import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 
@@ -20,7 +19,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  */
 @EnableHystrix
 @EnableCircuitBreaker
-@EnableHystrixDashboard
 @ConfigurationPropertiesScan
 @EnableFeignClients({ "com.diagbot.client" })
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })

src/main/resources/application-dev.yml

@@ -54,7 +54,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.21:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.31:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: dsYun8!@#
       # 连接池的配置信息
@@ -107,7 +107,7 @@ spring:
       cache: 15 # cache索引
       token: 15 # Token索引
       mr: 15 # 病历索引
-    host: 192.168.2.21  #Redis服务器地址
+    host: 192.168.2.31  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password:  # Redis服务器连接密码（默认为空）
     lettuce:
@@ -155,20 +155,19 @@ io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate
   thread-number: 200
 
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
+oath.self.address: http://localhost:${server.port}
 
 swagger:
   enable: true
 
 #图片服务器
 imageUrl:
-  prefix: http://192.168.2.236:82
+  prefix: http://192.168.2.31:82
 
 #病历质控地址
 mrqc:
-  url: http://192.168.2.236:5858
+  url: http://192.168.2.32:5858
 
 #CDSS核心地址
 cdss-core:
-  url: http://192.168.2.22:7010
+  url: http://192.168.2.32:7010

src/main/resources/application-local.yml

@@ -1,212 +0,0 @@
-server:
-  port: 6060
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-  client:
-    config:
-      default:
-        connectTimeout: 10000  # 连接超时时间
-        readTimeout: 3600000     # 读超时时间设置
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  cloud:
-    stream:
-      bindings:
-        outputCdssLog:
-          destination: cdssLog
-        inputCdssLog:
-          destination: cdssLog
-          group: cdssLogReceiveGroup
-
-  #mq
-  rabbitmq:
-    host: localhost
-    port: 5672
-    username: guest
-    password: guest
-    publisher-confirms: true
-    virtual-host: /
-
-  #redis
-  redis:
-    database:
-      cache: 15 # cache索引
-      token: 15 # Token索引
-      mr: 15 # 病历索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 200
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-swagger:
-  enable: true
-
-#日志记录
-cdssLog:
-  enable: true
-
-#Token鉴权
-tokenAuth:
-  enable: false
-
-#图片服务器
-imageUrl:
-  prefix: http://192.168.2.236:82
-
-#病历质控地址
-mrqc:
-  url: http://192.168.2.236:5858
-
-#CDSS核心地址
-cdss-core:
-  url: http://192.168.2.236:7010

src/main/resources/application-pre.yml

@@ -1,213 +0,0 @@
-server:
-  port: 6060
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-  client:
-    config:
-      default:
-        connectTimeout: 10000  # 连接超时时间
-        readTimeout: 3600000     # 读超时时间设置
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.121:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: teamback
-      password: goTulmLeon
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  cloud:
-    stream:
-      bindings:
-        outputCdssLog:
-          destination: cdssLog
-        inputCdssLog:
-          destination: cdssLog
-          group: cdssLogReceiveGroup
-
-  #mq
-  rabbitmq:
-    host: 192.168.2.121
-    port: 5672
-    username: lantone
-    password: lantone
-    publisher-confirms: true
-    virtual-host: /
-
-
-  #redis
-  redis:
-    database:
-      cache: 15 # cache索引
-      token: 15 # Token索引
-      mr: 15 # 病历索引
-    host: 192.168.2.121  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 200
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-swagger:
-  enable: true
-
-#日志记录
-cdssLog:
-  enable: true
-
-#Token鉴权
-tokenAuth:
-  enable: false
-
-#图片服务器
-imageUrl:
-  prefix: http://192.168.2.121:82
-
-#病历质控地址
-mrqc:
-  url: http://192.168.2.121:5858
-
-#CDSS核心地址
-cdss-core:
-  url: http://192.168.2.121:7010

src/main/resources/application-pro.yml

@@ -1,212 +0,0 @@
-server:
-  port: 6060
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-  client:
-    config:
-      default:
-        connectTimeout: 10000  # 连接超时时间
-        readTimeout: 3600000     # 读超时时间设置
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.122:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  cloud:
-    stream:
-      bindings:
-        outputCdssLog:
-          destination: cdssLog
-        inputCdssLog:
-          destination: cdssLog
-          group: cdssLogReceiveGroup
-
-  #mq
-  rabbitmq:
-    host: 192.168.2.122
-    port: 5672
-    username: lantone
-    password: lantone
-    publisher-confirms: true
-    virtual-host: /
-
-  #redis
-  redis:
-    database:
-      cache: 15 # cache索引
-      token: 15 # Token索引
-      mr: 15 # 病历索引
-    host: 192.168.2.122  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 200
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-swagger:
-  enable: true
-
-#日志记录
-cdssLog:
-  enable: true
-
-#Token鉴权
-tokenAuth:
-  enable: false
-
-#图片服务器
-imageUrl:
-  prefix: http://192.168.2.122:82
-
-#病历质控地址
-mrqc:
-  url: http://192.168.2.122:5858
-
-#CDSS核心地址
-cdss-core:
-  url: http://192.168.2.122:7010

src/main/resources/application-test.yml

@@ -1,212 +0,0 @@
-server:
-  port: 6060
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-  client:
-    config:
-      default:
-        connectTimeout: 10000  # 连接超时时间
-        readTimeout: 3600000     # 读超时时间设置
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小，最小，最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
-          enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  cloud:
-    stream:
-      bindings:
-        outputCdssLog:
-          destination: cdssLog
-        inputCdssLog:
-          destination: cdssLog
-          group: cdssLogReceiveGroup
-
-  #mq
-  rabbitmq:
-    host: 192.168.2.241
-    port: 5672
-    username: lantone
-    password: lantone
-    publisher-confirms: true
-    virtual-host: /
-
-  #redis
-  redis:
-    database:
-      cache: 15 # cache索引
-      token: 15 # Token索引
-      mr: 15 # 病历索引
-    host: 192.168.2.241  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 200
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-swagger:
-  enable: true
-
-#日志记录
-cdssLog:
-  enable: true
-
-#Token鉴权
-tokenAuth:
-  enable: false
-
-#图片服务器
-imageUrl:
-  prefix: http://192.168.2.241:82
-
-#病历质控地址
-mrqc:
-  url: http://192.168.2.241:5858
-
-#CDSS核心地址
-cdss-core:
-  url: http://192.168.2.241:7010

src/main/resources/logback-spring.xml

@@ -7,18 +7,12 @@
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr"
-                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!--包名输出缩进对齐-->
     <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
-    <!--  日志记录器，日期滚动记录
-            ERROR 级别
-     -->
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_error.log</file>
@@ -54,10 +48,6 @@
         </filter>
     </appender>
 
-
-    <!-- 日志记录器，日期滚动记录
-            WARN  级别
-     -->
     <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_warn.log</file>
@@ -93,10 +83,6 @@
         </filter>
     </appender>
 
-
-    <!-- 日志记录器，日期滚动记录
-            INFO  级别
-    -->
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_info.log</file>
@@ -132,10 +118,6 @@
         </filter>
     </appender>
 
-
-    <!-- 日志记录器，日期滚动记录
-            DEBUG  级别
-    -->
     <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_debug.log</file>
@@ -171,7 +153,6 @@
         </filter>
     </appender>
 
-    <!-- ConsoleAppender 控制台输出日志 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <!--encoder 默认配置为PatternLayoutEncoder-->
         <encoder>
@@ -184,31 +165,12 @@
             <level>debug</level>
         </filter>
     </appender>
-
-    <!-- FrameworkServlet日志-->
+    
     <logger name="org.springframework" level="WARN"/>
-
-    <!-- mybatis日志打印-->
     <logger name="org.apache.ibatis" level="DEBUG"/>
     <logger name="java.sql" level="DEBUG"/>
-
-    <!--  项目 mapper 路径
-            console控制台显示sql语句：STDOUT.filter.level -> debug级别
-    -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <!-- 本地环境下的日志配置 -->
-    <springProfile name="local">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 开发环境下的日志配置 -->
     <springProfile name="dev">
         <root level="INFO">
             <appender-ref ref="ERROR"/>
@@ -219,36 +181,4 @@
         </root>
     </springProfile>
 
-    <!-- 测试环境下的日志配置 -->
-    <springProfile name="test">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 预发布环境下的日志配置 -->
-    <springProfile name="pre">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 生产环境下的日志配置 -->
-    <springProfile name="pro">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
 </configuration>