lighter hai 1 ano
pai
achega
9a8d44d470

+ 15 - 5
src/main/resources/application-dev.yml

@@ -13,11 +13,17 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: his
+      primary: dev
       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:
+          type: "com.zaxxer.hikari.HikariDataSource"
+          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+        dev:
+          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
           username: "sa"
           password:
           type: "com.zaxxer.hikari.HikariDataSource"
@@ -39,6 +45,10 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  mvc:
+    format:
+      date: yyyy-MM-dd
+      date-time: yyyy-MM-dd HH:mm:ss
 forest:
   timeout: 0
   read-timeout: 0
@@ -49,9 +59,9 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
 
-#正式环境
+#测试环境
 si-api-url: http://webhis.thyy.cn:8077/ybjkdz
 si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
 si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-web-his-url: http://172.16.32.160:8077
-thmz-url: http://172.16.32.160:81/thmz
+web-his-url: http://172.16.30.26:8706
+thmz-url: http://172.16.30.119:8089/thmz

+ 1 - 1
src/main/resources/application-prod.yml

@@ -50,7 +50,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
 
 #正式环境
-si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
+si-api-url: http://webhis.thyy.cn:8077/ybjkdz
 si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
 si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 web-his-url: http://172.16.32.160:8077

+ 2 - 73
src/main/resources/application.yml

@@ -1,74 +1,3 @@
-server:
-  port: 1100
-  servlet:
-    encoding:
-      charset: UTF-8
-      force: true
-      enabled: true
-  tomcat:
-    uri-encoding: UTF-8
-
 spring:
-  thymeleaf:
-    cache: false
-  datasource:
-    dynamic:
-      primary: dev
-      strict: false
-      datasource:
-        his:
-          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
-          username: "sa"
-          password:
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        dev:
-          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
-          username: "sa"
-          password:
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        thmz:
-          url: "jdbc:mariadb://172.16.32.160:3306/thyy_mz_system?useUnicode=true&characterEncoding=utf-8"
-          username: "root"
-          password: "thyy@2018"
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "org.mariadb.jdbc.Driver"
-    hikari:
-      minimum-idle: 3
-      idle-timeout: 180000
-      maximum-pool-size: 10
-      auto-commit: true
-      pool-name: lisDbPool
-      connection-timeout: 30000
-      connection-test-query: select 1
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  mvc:
-    format:
-      date: yyyy-MM-dd
-      date-time: yyyy-MM-dd HH:mm:ss
-forest:
-  timeout: 0
-  read-timeout: 0
-  log-enabled: false
-  log-request: false
-  log-response-status: false
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-
-#正式环境
-#si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
-#si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
-#si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-#web-his-url: http://172.16.32.160:8077
-#thmz-url: http://172.16.32.160:81/thmz
-
-#测试环境
-si-api-url: http://10.93.28.242:80/isp-api/powercsb/
-si-access-key: ohksRseHwPk9JAVGAQ5lghF5euo6NQZjiv8O2V
-si-secret-key: SKQgruu508MeFbQmLZs4Oyj5Qk0GjLstGVtWJB3Y
-web-his-url: http://172.16.30.26:8706
-thmz-url: http://demo.hnthyy.cn:8089/thmz
+  profiles:
+    active: dev