From 7756f6e3a85eb836442f3e68fd435059c80dee7f Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 29 Jul 2021 17:19:43 +0800 Subject: [PATCH] importPosition --- cloudutil/src/main/resources/application-util-test.yml | 2 +- ht/src/main/java/com/ccsens/ht/api/ImportController.java | 2 +- ht/src/main/resources/application-test.yml | 4 ++-- ht/src/main/resources/application.yml | 4 ++-- tall/src/main/resources/application.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 569f6b37..ab113363 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -20,7 +20,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.4.113:7010/eureka/ + defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ instance: # 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server prefer-ip-address: true diff --git a/ht/src/main/java/com/ccsens/ht/api/ImportController.java b/ht/src/main/java/com/ccsens/ht/api/ImportController.java index 85807ff6..f581adc4 100644 --- a/ht/src/main/java/com/ccsens/ht/api/ImportController.java +++ b/ht/src/main/java/com/ccsens/ht/api/ImportController.java @@ -48,7 +48,7 @@ public class ImportController { @ApiImplicitParams({ @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") }) - @RequestMapping(value = "/importBase", method = RequestMethod.POST) + @RequestMapping(value = "/importPosition", method = RequestMethod.POST) public JsonResponse importPosition(@RequestParam(required = true) Part file) throws Exception { String allowedExts = "xls,xlsx"; String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; diff --git a/ht/src/main/resources/application-test.yml b/ht/src/main/resources/application-test.yml index 8c9dace3..9f949a6d 100644 --- a/ht/src/main/resources/application-test.yml +++ b/ht/src/main/resources/application-test.yml @@ -9,9 +9,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: host: 127.0.0.1 - password: guest + password: 111111 port: 5672 - username: guest + username: admin redis: database: 0 host: 127.0.0.1 diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml index b9b264a7..f59084b0 100644 --- a/ht/src/main/resources/application.yml +++ b/ht/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod - include: common, util-prod + active: test + include: common, util-test diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index af245946..eca66951 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: util-prod,common \ No newline at end of file + active: test + include: util-test,common \ No newline at end of file