diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index c10bfcdd..388aba37 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -18,7 +18,7 @@ public class ActDefineStartMap { map.put("2","standardSurveyWorkFlow"); map.put("3","standardCommentProcessWorkFlow"); - map.put("3","standardregulatoryinventory"); + map.put("4","standardregulatoryinventory"); return map.get(type); } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index b72e68c9..c6643978 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -213,7 +213,7 @@ public class WorkFlowController { @ApiOperation(value = "完成任务") @PostMapping("/completeTask") - public Wrapper completeTaskByUserId(@RequestBody BusMes busMes){ + public Wrapper completeTaskByUserId(BusMes busMes){ Wrapper str = workFlowFeignClient.completeTaskByUserId(busMes); if(str.getCode() == 500){ str.setSuccess(false); diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index a916e2e4..f021e344 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -9,14 +9,14 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem-zqazqazqa +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== #Eruept -eureka.client.allow-redirects=false -eureka.client.register-with-eureka=false -eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ +eureka.client.allow-redirects=true +eureka.client.register-with-eureka=true +eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ #============================================== # 邮箱配置1 @@ -35,13 +35,16 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc -spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +#spring.rabbitmq.port=5672 +#spring.rabbitmq.virtual-host=uat_pcms +#spring.rabbitmq.username=uat_pcms +#spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true - +spring.rabbitmq.host=192.168.10.248 +spring.rabbitmq.port=5672 +spring.rabbitmq.username=ca +spring.rabbitmq.password=cs986432 # ============================================== # 文档存储路径指向 # ============================================== diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml index 04f4a809..ce248b14 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -35,7 +35,7 @@