配置修复

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>12.6.2</version>
+    <version>12.6.3</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/controller/outpatient/template/TemplateController.java

@@ -18,12 +18,12 @@ import thyyxxk.webserver.utils.ResultVoUtil;
 @RestController
 @RequestMapping("/template")
 public class TemplateController {
-    @Value("${appletThmzUrl}")
-    private String appletThmzUrl;
+    @Value("${thmz-api-url}")
+    private String thmzApiUrl;
 
     @PostMapping("/queryTcDepartment")
     public ResultVo<JSONArray> queryTcDepartment() {
-        String url = appletThmzUrl + "/queryTcDiscuntDept";
+        String url = thmzApiUrl + "/queryTcDiscuntDept";
         ResultVo response = new RestTemplate().getForObject(url, ResultVo.class);
         if (null == response) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
@@ -36,7 +36,7 @@ public class TemplateController {
 
     @PostMapping("/queryAllDepartment")
     public ResultVo<JSONArray> queryAllDepartment() {
-        String url = appletThmzUrl + "/queryAllDept";
+        String url = thmzApiUrl + "/queryAllDept";
         ResultVo response = new RestTemplate().getForObject(url, ResultVo.class);
         if (null == response) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
@@ -49,7 +49,7 @@ public class TemplateController {
 
     @PostMapping("/queryTcByDepartment")
     public ResultVo queryTcByDepartment(@RequestBody TcInquiry inquiry) {
-        String url = appletThmzUrl + "/queryTcByDeptCode";
+        String url = thmzApiUrl + "/queryTcByDeptCode";
         ResultVo response = new RestTemplate().postForObject(url, inquiry, ResultVo.class);
         if (null == response) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
@@ -62,7 +62,7 @@ public class TemplateController {
 
     @PostMapping("/queryTcByTemplateId")
     public ResultVo queryTcByTemplateId(@RequestBody TcInquiry inquiry) {
-        String url = appletThmzUrl + "/queryTcByTemplateId";
+        String url = thmzApiUrl + "/queryTcByTemplateId";
         ResultVo response = new RestTemplate().postForObject(url, inquiry, ResultVo.class);
         if (null == response) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);

src/main/java/thyyxxk/webserver/dao/his/technologyArchives/TechnologyArchivesMainDao.java

@@ -18,4 +18,4 @@ public interface TechnologyArchivesMainDao extends BaseMapper<TechnologyArchives
 
     @Select(" select account as accountAuthor, social_no as socialNo, name as accountName from technology_archives_main ")
     List<Map<String, Object>> selectTechnologyArchivesMainDict();
-}
+}

src/main/java/thyyxxk/webserver/service/inpatient/charge/CashierProcessService.java

@@ -53,8 +53,8 @@ public class CashierProcessService {
     private DictDataDao dictDataDao;
     @Resource
     private MzsfBillnoRecDao mzsfBillnoRecDao;
-    @Value("${appletThmzUrl}")
-    private String appletThmzUrl;
+    @Value("${thmz-api-url}")
+    private String thmzApiUrl;
 
     private static final String SETT_TYPE_JN = "交纳";
     private static final String SETT_TYPE_TK = "退款";
@@ -414,7 +414,7 @@ public class CashierProcessService {
     public ResultVo  uploadDzInvoice(PatientParam param){
         Map<String, Object> paramMap = dealInvoiceParam(param);
         paramMap.put("opId", TokenUtil.getInstance().getTokenUserId());
-        ResultVo response = new RestTemplate().postForObject(appletThmzUrl+"/uploadZyInvoice", paramMap, ResultVo.class);
+        ResultVo response = new RestTemplate().postForObject(thmzApiUrl +"/uploadZyInvoice", paramMap, ResultVo.class);
         return response;
     }
 
@@ -476,7 +476,7 @@ public class CashierProcessService {
 
     public ResultVo<Map<String, Object>> downDzInvoice(PatientParam param) {
         Map<String, Object> paramMap = dealInvoiceParam(param);
-        ResultVo response = new RestTemplate().postForObject(appletThmzUrl+"/queryInvoiceFile", paramMap, ResultVo.class);
+        ResultVo response = new RestTemplate().postForObject(thmzApiUrl +"/queryInvoiceFile", paramMap, ResultVo.class);
         if(response == null ){
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_HTML_ERROR, "下载电子发票错误");
         }

src/main/java/thyyxxk/webserver/service/inpatient/charge/TransactionService.java

@@ -18,7 +18,7 @@ import thyyxxk.webserver.entity.inpatient.charge.MisPosVo;
 @Slf4j
 @Service
 public class TransactionService {
-    @Value("${appletThmzUrl}")
+    @Value("${thmz-api-url}")
     private String thmzUrl;
 
     public ResultVo posGet(String url,String param){

src/main/java/thyyxxk/webserver/service/outpatient/thmz/ShareholderCardService.java

@@ -45,7 +45,7 @@ public class ShareholderCardService {
     @Resource
     private ZdDiscountDetailDao zdDiscountDetailDao;
 
-    @Value("${appletThmzUrl}")
+    @Value("${thmz-api-url}")
     private String thmzUrl;
 
     public List<Map<String, Object>> queryDiscountClass() {

src/main/resources/application-cytest.yml

@@ -160,9 +160,8 @@ 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
+thmz-api-url: http://172.16.32.160:81/thmz
 rmHkUserApi: http://172.16.30.66:20923/thyy/api/haikang/door/destructionUser
-appletThmzUrl: http://172.16.30.119:8089/thmz
 
 logging:
   level:

src/main/resources/application-dameng.yml

@@ -1,184 +0,0 @@
-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: his
-      strict: false
-      datasource:
-        his:
-          url: "jdbc:dm://172.16.32.206:5240?genKeyNameCase=2"
-          username: "THXYHISDB"
-          password: "THXYHISDB@123456"
-          driver-class-name: "dm.jdbc.driver.DmDriver"
-        lis:
-          url: "jdbc:sqlserver://172.16.32.178:1433;databaseName=eLimsCore"
-          username: "sa"
-          password: "hnthxyyy"
-          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.167
-    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://localhost:8707/socketApi
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-  global-config:
-    enableSqlRunner: true
-
-management:
-  server:
-    port: 9093
-  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
-
-#正式环境
-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.30.119:8089/thmz
-
-logging:
-  level:
-    thyyxxk.webserver.dao: debug
-thyy:
-  ca:
-    sign-authentication:
-      app-code: ywxt
-      app-pwd: 12345678
-      cert: "MIIB9TCCAZigAwIBAgIOAV53M9Vp5AY8j5DL1EUwDAYIKoEcz1UBg3UFADA+MQswCQYDVQQGEwJDTjEUMBIGA1UEAwwLU00yIFJPT1QgQ0ExCzAJBgNVBAgMAlNIMQwwCgYDVQQKDANoYWgwHhcNMjMwMzA5MDY1MzQyWhcNMjUwMzA5MDY1MzQyWjBZMQswCQYDVQQGEwJDTjELMAkGA1UECAwCU0gxCzAJBgNVBAcMAlNIMQ0wCwYDVQQKDARzaWduMQ0wCwYDVQQLDARzaWduMRIwEAYDVQQDDAlzaWduX3Rlc3QwWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAAT9dIroxCUB5oZvxl2Irq3OoAtbWvqa5tNvw854VGmgJxfuuTfgBtcVdEHkbXsSvRNdj9Uq2ld2XFjoaIyHaC1Co10wWzAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFCE77Si3YBk/u4qjZMQAJNHBvWKUMB0GA1UdDgQWBBSjsmDHccu255pXS76XpNE3LL7f7DALBgNVHQ8EBAMCB4AwDAYIKoEcz1UBg3UFAANJADBGAiEAkECq7DAZiONAwDblXKigoyGkmjePKsS2L4noqg/wQuwCIQCGnRJITQ+ErYg/l+YNrAWgY1UtoQnsM8A4XIsUynzu7Q=="
-      sign-aig: "SM3withSM2"
-      url: "http://103.36.136.173:7845/services/CipherServices"
-    mobile-app:
-      app-id: 3
-      url: https://device.mkeysec.net/openapi
-      privatekey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHwpN7M6Xhja7sfaB0K3y2MBd4xLfhOF64mv0mtEZfqaWvphadXAimnfru8Y4sf0wDb9LYjacXRTkRMhZaZq5ZRCNFB+G8HnNb1y9Vr+7VqvT3wlRV0n+Jar+rEFguW293kH6wOLPQVNkmL4xEy/ecI81gfqR0wSHbyVWaBJ4o7w8qYVFc3is0vswl/bpKE2/4ngjEGDNuYdS0oXZR1TOjEEtNPEws9944yHyfYnbJgbTXkO78hlRUUu4tA8UnSjLrO0m0I6aQkuibPHKjMj247q2629L5IQpn+mGpgxmqUQmzSlKf5wg3uE0Ss1Bea8/AneSDBx2tzjsEs2qKn8cfAgMBAAECggEAM18GbaVCjNIPMf/rmmnmPA6AoztVFU0+Un6bcmzfAE3ymz+u6QatY1b+YDJZiS72NYq37yfS5XRVPtOEL9sQ+EhXTETKP2QKZONNTxBOwN166tHHFd6cUgRp2LJLm+cPi9/KgKZELH4e2Vs+qb3AyX2mtm/VjTSTulY6JRjAPF6EIyQqiLIinyw9TUXNqBs1kT5ma/50YPO2pSXWiOcXX9WWL7ECCNLCfKVRCKlEuaHuIozDuuwGHBrALAdqjWxrj0IMywCZIoVbBke+U7+KCKhKsc5eqsUJu8YfoVR3hxVhUHjlqIFbuAlLvrMqYZd3HgT1O3RSp/eOyXRMGsW0kQKBgQDHvA1p9Qv7K62WYOwwHEIg5Qym5uK4ClhvWUUQPE63bhzrkLkfNlDEOFpsnIk1EonvJHbfzW4pKR36AjbGBv9xxdgntkee+35pN8d8MT2eNMyHdsF6TDToKqPmqKHcxXmnpOCtC9Cam1wjBU+e7gdSoAeNWJeKUzg79HN7M7uD6QKBgQCuAPkd1G7GHkhMiXur1Td6nTmzwz9zPeHHycAE2r1epH22VUfKTu/oDgmky/VKO3JJuc1txt2bHs90iTLRDmcMy9l+6Ix9UJzmanAIRzhAVgmwz1liUNLbnJGl0YxCq0qlQA3FUUmOP36C2cvHcJm/hRIPG2O2nT1DLKsHvgU1xwKBgGL6mPciHU7aBUrZOxJYXpjoiQ2Iq1+imNKNPYFfMW8LHT/LV0HVa87hUkYyiHgJeNtOia48olO5cYZ8ZGJcA2iBL632UaXCYZGIt82epTdqWNTkj9qoOyu2PcTHWncKUVA3j7ORgE2tocolDqDmujBC55svBOHifaKQcE3khA9JAoGAf/fLPjrrNN00gsVhpJ/sa0qSEzh2w4QxNkOT6n4MYzxKD/xsDcc7/MfGI+K0BOHvTXVONXvZoqloHOaB7unOs8R/sivIlqjgmzyQJCZsojQkcFot/HZAfK6LFw4jPyzGev2+ou0DUZA0tHsEuSqAiC+PdnjIPpcpZOvG5KzFHCUCgYEAuLEUmIzQ7ex85Ulag2qfGj0CDMAq1R/rmwrk+1d2aP9GY890HwcyN5dlZGy8/Z/lMlzOGo1kDhhhwOfbiYSit00FdLChVux0wh8nyqqB4IuTy0S0ZeTNjWnjftpNaPXdHh5mpUXXKygCp3UT65HC6coaqoD3Vv8jE32svsz/uPE="
-    timestamp-authentication:
-      url: http://103.36.136.173:7845/services/TimeStampServices
-      app-code: ywxt
-      app-pwd: 12345678
-    HBoard-sign:
-      api-key: "00000"
-      api-secret: "00000000"
-      url: http://47.100.199.230:8080/pdfsign_hw
-      return-url: "https://emr.hnthyy.cn:9222/caTest/thyyca/hBoardSignReturnUrl"
-  archive:
-    path: "Z:\\"
-  other:
-    mobile-address: "https://emr.hnthyy.cn:8081"
-    mobile-agentid: 1000051

src/main/resources/application-dev.yml

@@ -147,7 +147,6 @@ 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://172.16.30.119:8089/thmz
-appletThmzUrl: http://demo.hnthyy.cn:8089/thmz
 rmHkUserApi: http://172.16.30.66:20923/thyy/api/haikang/door/destructionUser
 
 thyy:

src/main/resources/application-pnfy.yml

@@ -146,8 +146,7 @@ si-zy-fee-url: http://172.16.20.115:1000
 si-mz-fee-url: http://172.16.20.115:1100/mzFee
 si-injury-fee-url: http://172.16.20.115:2100/siInjury
 si-injury-systm-url: http://172.16.20.115:2000/siInjury
-thmz-api-url: http://172.16.20.115:81/thmz/api/v1
-appletThmzUrl: http://172.16.20.115:81/thmz
+thmz-api-url: http://172.16.20.115:81/thmz
 rmHkUserApi: ""
 
 thyy:

src/main/resources/application-prod.yml

@@ -146,8 +146,7 @@ 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
+thmz-api-url: http://172.16.32.160:81/thmz
 rmHkUserApi: http://172.16.32.167:20923/thyy/api/haikang/door/destructionUser
 
 thyy:

src/main/resources/application-show.yml

@@ -105,6 +105,5 @@ si-zy-fee-url: http://demo.hnthyy.cn/:1000
 si-mz-fee-url: http://demo.hnthyy.cn/:1100/mzFee
 si-injury-fee-url: http://demo.hnthyy.cn/:2100/siInjury
 si-injury-systm-url: http://demo.hnthyy.cn/:2000/siInjury
-thmz-api-url: http://demo.hnthyy.cn:8089/thmz/api/v1
-appletThmzUrl: http://demo.hnthyy.cn:8089/thmz
+thmz-api-url: http://demo.hnthyy.cn:8089/thmz
 rmHkUserApi: http://172.16.30.66:20923/thyy/api/haikang/door/destructionUser

src/main/resources/application-tz.yml

@@ -146,8 +146,7 @@ si-zy-fee-url: http://172.16.20.115:1000
 si-mz-fee-url: http://172.16.20.115:1100/mzFee
 si-injury-fee-url: http://172.16.20.115:2100/siInjury
 si-injury-systm-url: http://172.16.20.115:2000/siInjury
-thmz-api-url: http://172.16.20.115:81/thmz/api/v1
-appletThmzUrl: http://172.16.20.115:81/thmz
+thmz-api-url: http://172.16.20.115:81/thmz
 
 thyy:
   ca: