Browse Source

importPosition

sd
zhizhi wu 4 years ago
parent
commit
7756f6e3a8
  1. 2
      cloudutil/src/main/resources/application-util-test.yml
  2. 2
      ht/src/main/java/com/ccsens/ht/api/ImportController.java
  3. 4
      ht/src/main/resources/application-test.yml
  4. 4
      ht/src/main/resources/application.yml
  5. 4
      tall/src/main/resources/application.yml

2
cloudutil/src/main/resources/application-util-test.yml

@ -20,7 +20,7 @@ eureka:
service-url: service-url:
# 指定eureka server通信地址,注意/eureka/小尾巴不能少 # 指定eureka server通信地址,注意/eureka/小尾巴不能少
#defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/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: instance:
# 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server # 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server
prefer-ip-address: true prefer-ip-address: true

2
ht/src/main/java/com/ccsens/ht/api/ImportController.java

@ -48,7 +48,7 @@ public class ImportController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") @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 { public JsonResponse importPosition(@RequestParam(required = true) Part file) throws Exception {
String allowedExts = "xls,xlsx"; String allowedExts = "xls,xlsx";
String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;

4
ht/src/main/resources/application-test.yml

@ -9,9 +9,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
host: 127.0.0.1 host: 127.0.0.1
password: guest password: 111111
port: 5672 port: 5672
username: guest username: admin
redis: redis:
database: 0 database: 0
host: 127.0.0.1 host: 127.0.0.1

4
ht/src/main/resources/application.yml

@ -1,5 +1,5 @@
spring: spring:
profiles: profiles:
active: prod active: test
include: common, util-prod include: common, util-test

4
tall/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: prod active: test
include: util-prod,common include: util-test,common
Loading…
Cancel
Save