小改

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7201
+  port: 8706
   tomcat:
     uri-encoding: utf-8
     threads:
@@ -7,19 +7,16 @@ server:
       max: 800
     accept-count: 200
     max-connections: 10000
-  servlet:
-    encoding:
-      charset: utf-8
 spring:
   thymeleaf:
     cache: false
   datasource:
     dynamic:
-      primary: dev
+      primary: his
       strict: false
       datasource:
         his:
-          url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
+          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
           username: "sa"
           password:
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
@@ -28,10 +25,10 @@ spring:
           username: "sa"
           password: "hnthxyyy"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        dev:
-          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
+        adicon:
+          url: "jdbc:sqlserver://172.16.32.100:1433;databaseName=CYYFCheckUPV5_HNTHYY"
           username: "sa"
-          password:
+          password: "*ThyyHis2018#"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
     druid:
       #type: com.alibaba.druid.pool.DruidDataSource
@@ -78,6 +75,17 @@ spring:
     format:
       date: yyyy-MM-dd
       date-time: yyyy-MM-dd HH:mm:ss
+  redis:
+    host: 172.16.32.217
+    port: 6379
+    database: 0
+    password: thyy@2018
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+logging:
+  level:
+    thyyxxk.webserver.dao: info
 forest:
   timeout: 0
   read-timeout: 0
@@ -86,38 +94,72 @@ forest:
   log-response-status: true
   connect-timeout: 1500
   variables:
-    socketCenter: http://localhost:8707/socketApi
+    socketCenter: http://demo.hnthyy.cn:8707/socketApi
 
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
+management:
+  server:
+    port: 9091
+  endpoints:
+    web:
+      base-path: /actuator
+      exposure:
+        include: '*'
+  metrics:
+    export:
+      simple:
+        enabled: true
+      jmx:
+        enabled: true
+      prometheus:
+        enabled: true
+    distribution:
+      percentiles-histogram:
+        http:
+          server:
+            requests: false
+      minimum-expected-value:
+        http:
+          server:
+            requests: 20ms
+      maximum-expected-value:
+        http:
+          server:
+            requests: 200ms
+  endpoint:
+    metrics:
+      enabled: true
+    health:
+      show-details: always
+      probes:
+        enabled: true
+    prometheus:
+      enabled: true
 
 execute-scheduled: false
 is-prod: false
-triage-notify-url: http://localhost:8082/triage/roomScreen/pushMsg
+
+triage-notify-url: http://172.16.30.26:8082/triage/roomScreen/pushMsg
 si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
 
 #正式环境
-si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
-si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
-si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-si-zy-fee-url: http://172.16.32.166:1000
-si-mz-fee-url: http://172.16.32.166:1100/mzFee
-si-injury-fee-url: http://172.16.32.163:2100/siInjury
-si-injury-systm-url: http://172.16.32.163:2000/siInjury
-thmz-api-url: http://172.16.32.160:81/thmz/api/v1
+#si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
+#si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
+#si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
+#si-zy-fee-url: http://172.16.32.166:1000
+#si-mz-fee-url: http://172.16.32.166:1100/mzFee
+#si-injury-fee-url: http://172.16.32.163:2100/siInjury
+#si-injury-systm-url: http://172.16.32.163:2000/siInjury
+#thmz-api-url: http://172.16.32.160:81/thmz/api/v1
+#appletThmzUrl: http://172.16.32.160:81/thmz
 
 
 #测试环境
-#si-api-url: http://10.93.30.130:20001/isp-api/powercsb/1101
-#si-access-key: Zgs5jfxaKb86XbCuUzLK9EhFjiQfHR1vydaPzp
-#si-secret-key: SKT2ETMT3XkAYApqh79DCnN9ZjfbQEBMPU0GyLz9
-#si-zy-fee-url: http://localhost:1000
-#si-mz-fee-url: http://localhost:1100/mzFee
-#si-injury-fee-url: http://localhost:2100/siInjury
-#si-injury-systm-url: http://localhost:2000/siInjury
-#thmz-api-url: http://172.16.30.33:81/thmz/api/v1
-
-logging:
-  level:
-    thyyxxk.webserver.dao: debug
+si-api-url: http://10.93.28.242:80/isp-api/powercsb/
+si-access-key: ohksRseHwPk9JAVGAQ5lghF5euo6NQZjiv8O2V
+si-secret-key: SKQgruu508MeFbQmLZs4Oyj5Qk0GjLstGVtWJB3Y
+si-zy-fee-url: http://172.16.30.26:1000
+si-mz-fee-url: http://172.16.30.26:1100/mzFee
+si-injury-fee-url: http://172.16.30.26:2100/siInjury
+si-injury-systm-url: http://172.16.30.26:2000/siInjury
+thmz-api-url: http://demo.hnthyy.cn:8089/thmz/api/v1
+appletThmzUrl: http://demo.hnthyy.cn:8089/thmz

src/main/resources/application.yml

@@ -1,180 +1,3 @@
-server:
-  port: 8706
-  tomcat:
-    uri-encoding: utf-8
-    threads:
-      min-spare: 20
-      max: 800
-    accept-count: 200
-    max-connections: 10000
-  servlet:
-    encoding:
-      charset: utf-8
 spring:
-  thymeleaf:
-    cache: false
-  datasource:
-    dynamic:
-      primary: dev
-      strict: false
-      datasource:
-        his:
-          url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
-          username: "sa"
-          password:
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        lis:
-          url: "jdbc:sqlserver://172.16.32.178:1433;databaseName=eLimsCore"
-          username: "sa"
-          password: "hnthxyyy"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        adicon:
-          url: "jdbc:sqlserver://172.16.32.100:1433;databaseName=CYYFCheckUPV5_HNTHYY"
-          username: "sa"
-          password: "*ThyyHis2018#"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        dev:
-          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
-          username: "sa"
-          password:
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-    druid:
-      #type: com.alibaba.druid.pool.DruidDataSource
-      #初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时
-      initial-size: 40
-      #最大连接池数量
-      max-active: 100
-      #最小连接池数量
-      min-idle: 40
-      #获取连接时最大等待时间，单位毫秒
-      max-wait: 60000
-      #使用非公平锁。
-      use-unfair-lock: true
-      #用来检测连接是否有效的sql，要求是一个查询语句。
-      validation-query: SELECT 1
-      #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
-      test-while-idle: true
-      #申请连接时执行validationQuery检测连接是否有效，
-      test-on-borrow: true
-      #归还连接时执行validationQuery检测连接是否有效，
-      test-on-return: false
-      #Destroy线程会检测连接的间隔时间，testWhileIdle的判断依据，详细看testWhileIdle属性的说明
-      time-between-eviction-runs-millis: 60000
-      #配置一个连接在池中最小生存的时间，单位是毫秒
-      min-evictable-idle-time-millis: 300000
-      #监控统计用的filter:stat  日志用的filter:log4j    防御sql注入的filter:wall
-      filters: stat
-      #是否缓存preparedStatement，也就是PSCache，在mysql5.5以下的版本中没有PSCache功能，建议关闭掉
-      pool-prepared-statements: false
-      #要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。
-      max-pool-prepared-statement-per-connection-size: 200
-      #对于长时间不使用的连接强制关闭
-      remove-abandoned: true
-      #数据库链接超过180秒开始关闭空闲连接 秒为单位
-      remove-abandoned-timeout: 180
-      #将当前关闭动作记录到日志  此配置项会影响性能，只在排查的时候打开，系统运行时最好关闭。
-      log-abandoned: true
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 去除druid配置
-  jackson:
-    time-zone: Asia/Shanghai
-    date-format: yyyy-MM-dd HH:mm:ss
-  mvc:
-    format:
-      date: yyyy-MM-dd
-      date-time: yyyy-MM-dd HH:mm:ss
-  redis:
-    host: 172.16.32.217
-    port: 6379
-    database: 0
-    password: thyy@2018
-forest:
-  timeout: 0
-  read-timeout: 0
-  log-enabled: true
-  log-request: true
-  log-response-status: true
-  connect-timeout: 1500
-  variables:
-    socketCenter: http://demo.hnthyy.cn:8707/socketApi
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-  global-config:
-    enableSqlRunner: true
-
-management:
-  server:
-    port: 9091
-  endpoints:
-    web:
-      base-path: /actuator
-      exposure:
-        include: '*'
-  metrics:
-    export:
-      simple:
-        enabled: true
-      jmx:
-        enabled: true
-      prometheus:
-        enabled: true
-    distribution:
-      percentiles-histogram:
-        http:
-          server:
-            requests: false
-      minimum-expected-value:
-        http:
-          server:
-            requests: 20ms
-      maximum-expected-value:
-        http:
-          server:
-            requests: 200ms
-  endpoint:
-    metrics:
-      enabled: true
-    health:
-      show-details: always
-      probes:
-        enabled: true
-    prometheus:
-      enabled: true
-
-execute-scheduled: false
-is-prod: false
-triage-notify-url: http://localhost:8082/triage/roomScreen/pushMsg
-si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
-
-#si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
-#si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
-#si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-
-#正式环境
-#si-zy-fee-url: http://172.16.32.166:1000
-#si-mz-fee-url: http://172.16.32.166:1100/mzFee
-#si-injury-fee-url: http://172.16.32.163:2100/siInjury
-#si-injury-systm-url: http://172.16.32.163:2000/siInjury
-#thmz-api-url: http://172.16.32.160:81/thmz/api/v1
-#si-api-url: http://10.93.28.242:80/isp-api/powercsb/
-#si-access-key: ohksRseHwPk9JAVGAQ5lghF5euo6NQZjiv8O2V
-#si-secret-key: SKQgruu508MeFbQmLZs4Oyj5Qk0GjLstGVtWJB3Y
-appletThmzUrl: http://demo.hnthyy.cn:8089/thmz
-
-#测试环境
-#thmz-api-url: http://172.16.30.119:8089/thmz/api/v1
-thmz-api-url: http://demo.hnthyy.cn:8089/thmz/api/v1
-si-zy-fee-url: http://localhost:1000
-si-mz-fee-url: http://localhost:1100/mzFee
-si-injury-fee-url: http://localhost:2100/siInjury
-si-injury-systm-url: http://localhost:2000/siInjury
-si-api-url: http://10.93.28.242:80/isp-api/powercsb/
-si-access-key: ohksRseHwPk9JAVGAQ5lghF5euo6NQZjiv8O2V
-si-secret-key: SKQgruu508MeFbQmLZs4Oyj5Qk0GjLstGVtWJB3Y
-
-
-#logging:
-#  level:
-#    thyyxxk.webserver.dao: debug
+  profiles:
+    active: prod