diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 5c829176..763f5b33 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -82,7 +82,7 @@ eureka: service-url: # 指定eureka server通信地址,注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ - defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ + defaultZone: http://admin:admin@49.232.6.143:7010/eureka/ # defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ instance: # 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server diff --git a/tcm/src/main/resources/application-test.yml b/tcm/src/main/resources/application-test.yml index 92d2cc05..2e527a77 100644 --- a/tcm/src/main/resources/application-test.yml +++ b/tcm/src/main/resources/application-test.yml @@ -28,11 +28,11 @@ swagger: enable: true eureka: instance: - ip-address: 192.168.0.99 + ip-address: 49.232.6.143 file: path: /home/cloud/tcm/uploads/ - domain: https://test.tall.wiki/gateway/tcm/ - imgDomain: https://test.tall.wiki/gateway/tcm/uploads/ + domain: https://www.sxwikionline.com/gateway/tcm/ + imgDomain: https://www.sxwikionline.com/gateway/tcm/uploads/ day: one: 9 two: 30 diff --git a/tcm/src/main/resources/druid-test.yml b/tcm/src/main/resources/druid-test.yml index 9210cf42..9c2a7d09 100644 --- a/tcm/src/main/resources/druid-test.yml +++ b/tcm/src/main/resources/druid-test.yml @@ -15,7 +15,7 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 + password: poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://test.tall.wiki/tcm?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://127.0.0.1/tcm?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index 51c9e569..07e96ca2 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -175,7 +175,7 @@ SELECT - '' as content, + '总人数' as content, ti.name, count( * ) AS nums FROM