diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java index 60b7e57..8f19e23 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java @@ -43,7 +43,7 @@ public class LetterQueueReceiver { * @param message * 发送:rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....)); */ - //@RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE) +// @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE) public void processImppMessage(SysMessage msg, Channel channel, Message message) { try { LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功:{}",msg); diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 894e866..30cc83b 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -32,7 +32,7 @@ eureka.client.service-url.defaultZone=http://192.168.1.20:8000/eureka/,http://19 #### 本机微服配置 #### #本服务主机ip(若多个网卡,则需要设置本服务ip) -eureka.instance.ip-address=192.168.1.25 +eureka.instance.ip-address=192.168.1.20 #本服务实例ID #eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port} #本服务主机名 @@ -48,6 +48,20 @@ eureka.instance.lease-expiration-duration-in-seconds=30 #心跳周期 eureka.instance.lease-renewal-interval-in-seconds=20 +#打开feign的熔断 +feign.hystrix.enabled=true +#读取数据时长 +ribbon.ReadTimeout=3000 +#连接时长 +ribbon.ConnectTimeout=3000 +#重试 +ribbon.maxAutoRetries=2 +#响应超过时长,进行熔断(熔断超时需要大于读取时长及连接时长) +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000 + +#集群名 +eureka.instance.metadata-map.cluster=impp_cluster + ################ 日志据源 ################ spring.data.mongodb.database=mongoDBSource spring.data.mongodb.uri=192.168.1.55:27017 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties index dda671f..b488919 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8080 +server.port=8100 #用户登陆路径 filter.shiro.user.loginuri = /login diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index ccf06e4..751429c 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=51010 +server.port=58100 #用户登陆路径 filter.shiro.user.loginuri = /login diff --git a/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx b/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx index 19fd927..08ac3c0 100644 Binary files a/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx and b/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx differ