diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqConsumer.java b/common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqConsumer.java deleted file mode 100644 index fc11b86..0000000 --- a/common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqConsumer.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.neusoft.smart.pos.mq; - -import java.util.Properties; - -import javax.annotation.PostConstruct; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSON; -import com.aliyun.openservices.ons.api.Action; -import com.aliyun.openservices.ons.api.ConsumeContext; -import com.aliyun.openservices.ons.api.Consumer; -import com.aliyun.openservices.ons.api.Message; -import com.aliyun.openservices.ons.api.MessageListener; -import com.aliyun.openservices.ons.api.ONSFactory; -import com.aliyun.openservices.ons.api.PropertyKeyConst; -import com.aliyun.openservices.ons.api.bean.ConsumerBean; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Service -@Profile(MQConfig.Impl.ALIYUN_ROCKET_MQ) -public class AliyunRocketMqConsumer extends MqBaseConsumer { - - @Value("${spring.aliyunRocketmq.accessKeyId}") - private String accessKeyId; - - @Value("${spring.aliyunRocketmq.accessKeySecret}") - private String accessKeySecret; - - @Value("${spring.aliyunRocketmq.groupId}") - private String groupId; - - @Value("${spring.aliyunRocketmq.namesrvAddr}") - private String namesrvAddr; - - @PostConstruct - public void init() { - for (EnumMsgMqTopic topic: EnumMsgMqTopic.values()) { - Properties properties = new Properties(); - // 您在控制台创建的 Group ID - properties.put(PropertyKeyConst.GROUP_ID, topic.getGroupId()); - // AccessKey 阿里云身份验证,在阿里云服务器管理控制台创建 - properties.put(PropertyKeyConst.AccessKey, accessKeyId); - // SecretKey 阿里云身份验证,在阿里云服务器管理控制台创建 - properties.put(PropertyKeyConst.SecretKey, accessKeySecret); - // 设置 TCP 接入域名,到控制台的实例基本信息中查看 - properties.put(PropertyKeyConst.NAMESRV_ADDR,namesrvAddr); - // 集群订阅方式(默认) - // properties.put(PropertyKeyConst.MessageModel, PropertyValueConst.CLUSTERING); - // 广播订阅方式 - // properties.put(PropertyKeyConst.MessageModel, PropertyValueConst.BROADCASTING); - Consumer consumer = ONSFactory.createConsumer(properties); - consumer.subscribe(topic.getCode(), "*", new MessageListener() { //订阅多个 Tag - public Action consume(Message message, ConsumeContext context) { - try { - System.out.println("Receive: " + message); - doMessage(new String(message.getBody())); - return Action.CommitMessage; - }catch(Exception e) { - log.error("AliyunRocketMqConsumer error:",e); - return Action.ReconsumeLater; - } - } - }); - consumer.start(); - log.info(" aliyunrocketMq consumer start success! "+JSON.toJSONString(consumer)); - } - - } - -} diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/EnumMsgMqTopic.java b/common/src/main/java/com/neusoft/smart/pos/mq/EnumMsgMqTopic.java deleted file mode 100644 index 487c8c2..0000000 --- a/common/src/main/java/com/neusoft/smart/pos/mq/EnumMsgMqTopic.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.neusoft.smart.pos.mq; - -/** - * Created by luozukai - */ -public enum EnumMsgMqTopic { - DEFAULT("topic-1","GID_P_1", "默认"), - STOCK("stock","GID_P_2","库存"), - ; - - public static EnumMsgMqTopic getEnum(String code) { - for (EnumMsgMqTopic value : values()) { - if (value.getCode().equals(code)) { - return value; - } - } - return null; - } - - private String code; - private String message; - private String groupId; - - EnumMsgMqTopic(String code, String groupId,String message) { - this.code = code; - this.message = message; - this.groupId = groupId; - } - - public String getCode() { - return code; - } - - public String getMessage() { - return message; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } -} diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/MQConfig.java b/common/src/main/java/com/neusoft/smart/pos/mq/MQConfig.java index 8953eb5..802f37a 100644 --- a/common/src/main/java/com/neusoft/smart/pos/mq/MQConfig.java +++ b/common/src/main/java/com/neusoft/smart/pos/mq/MQConfig.java @@ -2,8 +2,7 @@ package com.neusoft.smart.pos.mq; public class MQConfig { public static class Impl { - public static final String RABBIT_MQ = "rabbitMQ"; - public static final String ROCKET_MQ = "rocketMQ"; - public static final String ALIYUN_ROCKET_MQ = "aliyunRocketMQ"; + public static final String RABBIT_MQ = "rabbitmq"; + public static final String ALIYUN_ROCKET_MQ = "aliyunRocketmq"; } } diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/MqProducer.java b/common/src/main/java/com/neusoft/smart/pos/mq/MqProducer.java index 498f0ff..23802a4 100644 --- a/common/src/main/java/com/neusoft/smart/pos/mq/MqProducer.java +++ b/common/src/main/java/com/neusoft/smart/pos/mq/MqProducer.java @@ -1,7 +1,11 @@ package com.neusoft.smart.pos.mq; +import java.io.Serializable; + public interface MqProducer { - public void sendMessage(Object data, String topic, String tags, String keys); + public void sendMessage(String exchange, String routingKey, Serializable object); + + public void sendMessage(String exchange, String routingKey, String msg); } diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqConsumer.java b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqConsumer.java new file mode 100644 index 0000000..eb645f1 --- /dev/null +++ b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqConsumer.java @@ -0,0 +1,96 @@ +package com.neusoft.smart.pos.mq.aliyunRocketMq; + +import java.util.List; +import java.util.Properties; + +import javax.annotation.PostConstruct; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import com.alibaba.fastjson.JSON; +import com.aliyun.openservices.ons.api.Action; +import com.aliyun.openservices.ons.api.ConsumeContext; +import com.aliyun.openservices.ons.api.Consumer; +import com.aliyun.openservices.ons.api.Message; +import com.aliyun.openservices.ons.api.MessageListener; +import com.aliyun.openservices.ons.api.ONSFactory; +import com.aliyun.openservices.ons.api.PropertyKeyConst; +import com.neusoft.smart.pos.mq.MQConfig; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +//@Service +//@Profile(MQConfig.Impl.ALIYUN_ROCKET_MQ) +public abstract class AliyunRocketMqConsumer { + + @Value("${spring.aliyunRocketmq.accessKeyId}") + private String accessKeyId; + + @Value("${spring.aliyunRocketmq.accessKeySecret}") + private String accessKeySecret; + + @Value("${spring.aliyunRocketmq.namesrvAddr}") + private String namesrvAddr; + + @PostConstruct + public void init() { + for (EnumMsgTopic topic: EnumMsgTopic.values()) { + Properties properties = new Properties(); + // 您在控制台创建的 Group ID + properties.put(PropertyKeyConst.GROUP_ID, topic.getGroupId()); + // AccessKey 阿里云身份验证,在阿里云服务器管理控制台创建 + properties.put(PropertyKeyConst.AccessKey, accessKeyId); + // SecretKey 阿里云身份验证,在阿里云服务器管理控制台创建 + properties.put(PropertyKeyConst.SecretKey, accessKeySecret); + // 设置 TCP 接入域名,到控制台的实例基本信息中查看 + properties.put(PropertyKeyConst.NAMESRV_ADDR,namesrvAddr); + // 集群订阅方式(默认) + // properties.put(PropertyKeyConst.MessageModel, PropertyValueConst.CLUSTERING); + // 广播订阅方式 + // properties.put(PropertyKeyConst.MessageModel, PropertyValueConst.BROADCASTING); + Consumer consumer = ONSFactory.createConsumer(properties); + + List topicTags = EnumMsgTopicTags.getTagsByTopic(topic.getTopic()); + if (null != topicTags) { + for (EnumMsgTopicTags emtt:topicTags) { + consumer.subscribe(topic.getTopic(), emtt.getTags(), new MessageListener() { //订阅Tag + public Action consume(Message message, ConsumeContext context) { + try { + System.out.println("Receive: " + message); + doMessage(topic.getTopic(),emtt.getTags(),new String(message.getBody())); + return Action.CommitMessage; + }catch(Exception e) { + log.error("AliyunRocketMqConsumer error:",e); + return Action.ReconsumeLater; + } + } + }); + consumer.start(); + log.info(" aliyunrocketMq consumer start success! "+JSON.toJSONString(consumer)); + } + } + +// consumer.subscribe(topic.getTopic(), "*", new MessageListener() { //订阅多个 Tag +// public Action consume(Message message, ConsumeContext context) { +// try { +// System.out.println("Receive: " + message); +// doMessage(topic.getTopic(),new String(message.getBody())); +// return Action.CommitMessage; +// }catch(Exception e) { +// log.error("AliyunRocketMqConsumer error:",e); +// return Action.ReconsumeLater; +// } +// } +// }); +// consumer.start(); +// log.info(" aliyunrocketMq consumer start success! "+JSON.toJSONString(consumer)); + } + + } + + protected abstract void doMessage(String topic,String tag,String msg); + +} diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqMessageProducer.java b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqMessageProducer.java similarity index 54% rename from common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqMessageProducer.java rename to common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqMessageProducer.java index b66519f..123688c 100644 --- a/common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqMessageProducer.java +++ b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqMessageProducer.java @@ -1,24 +1,26 @@ -package com.neusoft.smart.pos.mq; +package com.neusoft.smart.pos.mq.aliyunRocketMq; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Properties; - import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.aliyun.openservices.ons.api.Message; import com.aliyun.openservices.ons.api.ONSFactory; import com.aliyun.openservices.ons.api.Producer; import com.aliyun.openservices.ons.api.PropertyKeyConst; import com.aliyun.openservices.ons.api.SendResult; +import com.neusoft.smart.pos.mq.MQConfig; +import com.neusoft.smart.pos.mq.MqProducer; +import com.neusoft.smart.pos.mq.util.JsonUtil; /** @@ -38,9 +40,6 @@ public class AliyunRocketMqMessageProducer implements MqProducer { @Value("${spring.aliyunRocketmq.accessKeySecret}") private String accessKeySecret; - @Value("${spring.aliyunRocketmq.groupId}") - private String groupId; - @Value("${spring.aliyunRocketmq.namesrvAddr}") private String namesrvAddr; @@ -55,7 +54,7 @@ public class AliyunRocketMqMessageProducer implements MqProducer { @PostConstruct public void init() { producerMap = new HashMap(); - for (EnumMsgMqTopic topic: EnumMsgMqTopic.values()) { + for (EnumMsgTopic topic: EnumMsgTopic.values()) { Properties properties = new Properties(); properties.setProperty(PropertyKeyConst.GROUP_ID, topic.getGroupId()); // AccessKey 阿里云身份验证,在阿里云服务器管理控制台创建 @@ -70,12 +69,22 @@ public class AliyunRocketMqMessageProducer implements MqProducer { // 在发送消息前,必须调用 start 方法来启动 Producer,只需调用一次即可 producer.start(); log.info("aliyunrocketmq producer info :"+JSON.toJSONString(producer)); - producerMap.put(topic.getCode(), producer); + producerMap.put(topic.getTopic(), producer); } + } - + @Override - public void sendMessage(Object data, String topic, String tags, String keys) { + public void sendMessage(String exchange, String routingKey, Serializable object) { + sendStringMsg(exchange,JsonUtil.obj2Json(object)); + } + + @Override + public void sendMessage(String exchange, String routingKey, String msg) { + sendStringMsg(exchange,msg); + } + + private void sendStringMsg(String topic,String content) { Producer producer = producerMap.get(topic); if (null == producer) { log.error("topic :"+topic+" has no AliyunRocketMqMessageProducer."); @@ -84,35 +93,40 @@ public class AliyunRocketMqMessageProducer implements MqProducer { if (producer.isClosed()) { producer.start(); } - //循环发送消息 - Message msg = new Message( // - // Message 所属的 Topic - topic, - // Message Tag 可理解为 Gmail 中的标签,对消息进行再归类,方便 Consumer 指定过滤条件在 MQ 服务器过滤 - tags, - // Message Body 可以是任何二进制形式的数据, MQ 不做任何干预, - // 需要 Producer 与 Consumer 协商好一致的序列化和反序列化方式 - JsonUtil.obj2Json(data).getBytes()); - // 设置代表消息的业务关键属性,请尽可能全局唯一。 - // 以方便您在无法正常收到消息情况下,可通过阿里云服务器管理控制台查询消息并补发 - // 注意:不设置也不会影响消息正常收发 - msg.setKey(keys); + List topicTags = EnumMsgTopicTags.getTagsByTopic(topic); + if (null != topicTags) { + for (EnumMsgTopicTags emtt:topicTags) { + //循环发送消息 + Message msg = new Message( // + // Message 所属的 Topic + topic, + // Message Tag 可理解为 Gmail 中的标签,对消息进行再归类,方便 Consumer 指定过滤条件在 MQ 服务器过滤 + emtt.getTags(), + // Message Body 可以是任何二进制形式的数据, MQ 不做任何干预, + // 需要 Producer 与 Consumer 协商好一致的序列化和反序列化方式 + content.getBytes()); + // 设置代表消息的业务关键属性,请尽可能全局唯一。 + // 以方便您在无法正常收到消息情况下,可通过阿里云服务器管理控制台查询消息并补发 + // 注意:不设置也不会影响消息正常收发 + //msg.setKey(routingKey); + msg.setKey(emtt.getTags()); - try { - SendResult sendResult = producer.send(msg); - // 同步发送消息,只要不抛异常就是成功 - if (sendResult != null) { - System.out.println(new Date() + " Send mq message success. Topic is:" + msg.getTopic() + " msgId is: " + sendResult.getMessageId()); + try { + SendResult sendResult = producer.send(msg); + // 同步发送消息,只要不抛异常就是成功 + if (sendResult != null) { + log.info(new Date() + " Send mq message success. Topic is:" + msg.getTopic() + " msgId is: " + sendResult.getMessageId()); + } + } + catch (Exception e) { + // 消息发送失败,需要进行重试处理,可重新发送这条消息或持久化这条数据进行补偿处理 + log.error(new Date() + " Send mq message failed. Topic is:" + msg.getTopic(),e); } - } - catch (Exception e) { - // 消息发送失败,需要进行重试处理,可重新发送这条消息或持久化这条数据进行补偿处理 - System.out.println(new Date() + " Send mq message failed. Topic is:" + msg.getTopic()); - e.printStackTrace(); - } + } + } // 在应用退出前,销毁 Producer 对象 // 注意:如果不销毁也没有问题 //producer.shutdown(); - } + } } diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopic.java b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopic.java new file mode 100644 index 0000000..fb09d56 --- /dev/null +++ b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopic.java @@ -0,0 +1,31 @@ +package com.neusoft.smart.pos.mq.aliyunRocketMq; + +import com.neusoft.smart.pos.framework.config.RabbitExchangeConfiguration; + +public enum EnumMsgTopic { + + LOGIN("POS_G_1",RabbitExchangeConfiguration.FANOUT_EXCHANGE_LOGIN), + ORDER_COMPLETE("POS_G_2",RabbitExchangeConfiguration.FANOUT_EXCHANGE_ORDER_COMPLETE), + FILE_UPLOADED("POS_G_3",RabbitExchangeConfiguration.FANOUT_EXCHANGE_FILE_UPLOADED_NOTIFY); + + private String groupId; + private String topic; + + EnumMsgTopic(String groupId,String topic) { + this.groupId = groupId; + this.topic = topic; + } + public String getGroupId() { + return groupId; + } + public void setGroupId(String groupId) { + this.groupId = groupId; + } + public String getTopic() { + return topic; + } + public void setTopic(String topic) { + this.topic = topic; + } + +} diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopicTags.java b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopicTags.java new file mode 100644 index 0000000..42ff1e8 --- /dev/null +++ b/common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopicTags.java @@ -0,0 +1,49 @@ +package com.neusoft.smart.pos.mq.aliyunRocketMq; + +import java.util.ArrayList; +import java.util.List; + +import com.neusoft.smart.pos.framework.config.RabbitExchangeConfiguration; + +public enum EnumMsgTopicTags { + + LOGIN_QUEUE1(RabbitExchangeConfiguration.FANOUT_EXCHANGE_LOGIN,RabbitExchangeConfiguration.LONGIN_QUEUE1_NAME), + ORDER_COMPLETE_QUEUE1(RabbitExchangeConfiguration.FANOUT_EXCHANGE_ORDER_COMPLETE,RabbitExchangeConfiguration.ORDER_COMPLETE_QUEUE1_NAME), + ORDER_COMPLETE_QUEUE2(RabbitExchangeConfiguration.FANOUT_EXCHANGE_ORDER_COMPLETE,RabbitExchangeConfiguration.ORDER_COMPLETE_QUEUE2_NAME), + FILE_UPLOADED_QUEUE1(RabbitExchangeConfiguration.FANOUT_EXCHANGE_FILE_UPLOADED_NOTIFY,RabbitExchangeConfiguration.FILE_UPLOADED_NOTIFY_QUEUE1_NAME), + FILE_UPLOADED_QUEUE2(RabbitExchangeConfiguration.FANOUT_EXCHANGE_FILE_UPLOADED_NOTIFY,RabbitExchangeConfiguration.FILE_UPLOADED_NOTIFY_QUEUE2_NAME),; + + + private String topic; + private String tags; + + EnumMsgTopicTags(String topic,String tags) { + this.topic = topic; + this.tags = tags; + } + public String getTopic() { + return topic; + } + public void setTopic(String topic) { + this.topic = topic; + } + public String getTags() { + return tags; + } + public void setTags(String tags) { + this.tags = tags; + } + + public static List getTagsByTopic(String topic) { + List list = new ArrayList(); + for (EnumMsgTopicTags emtt: EnumMsgTopicTags.values()) { + if (emtt.getTopic().equals(topic)) { + list.add(emtt); + } + } + if (list.size() <= 0) { + return null; + } + return list; + } +} diff --git a/common/src/main/java/com/neusoft/smart/pos/utils/RabbitMQSender.java b/common/src/main/java/com/neusoft/smart/pos/mq/rabbitmq/RabbitMQSender.java similarity index 85% rename from common/src/main/java/com/neusoft/smart/pos/utils/RabbitMQSender.java rename to common/src/main/java/com/neusoft/smart/pos/mq/rabbitmq/RabbitMQSender.java index a7bba4d..22eb7cb 100644 --- a/common/src/main/java/com/neusoft/smart/pos/utils/RabbitMQSender.java +++ b/common/src/main/java/com/neusoft/smart/pos/mq/rabbitmq/RabbitMQSender.java @@ -1,4 +1,4 @@ -package com.neusoft.smart.pos.utils; +package com.neusoft.smart.pos.mq.rabbitmq; import java.io.Serializable; import org.apache.commons.lang3.SerializationUtils; @@ -6,11 +6,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; import com.neusoft.smart.pos.framework.config.RabbitExchangeConfiguration; +import com.neusoft.smart.pos.mq.MQConfig; +import com.neusoft.smart.pos.mq.MqProducer; +@Profile(MQConfig.Impl.RABBIT_MQ) @Component -public class RabbitMQSender { +public class RabbitMQSender implements MqProducer{ private static Logger logger = LoggerFactory.getLogger(RabbitMQSender.class); @Autowired @@ -22,6 +26,7 @@ public class RabbitMQSender { * @param routingKey routingKey * @param object 发送的对象 */ + @Override public void sendMessage(String exchange, String routingKey, Serializable object) { logger.info("【消息发送者】发送消息到交换机{},routingKey为{},消息内容为: {}", exchange, routingKey, object); byte[] content = SerializationUtils.serialize(object); @@ -35,6 +40,7 @@ public class RabbitMQSender { * @param routingKey routingKey * @param msg 发送的字符串 */ + @Override public void sendMessage(String exchange, String routingKey, String msg) { logger.info("【消息发送者】发送消息到交换机{},routingKey为{},消息内容为: {}", exchange, routingKey, msg); RabbitTemplate rabbitTemplate = configuration.rabbitTemplate(); diff --git a/common/src/main/java/com/neusoft/smart/pos/mq/JsonUtil.java b/common/src/main/java/com/neusoft/smart/pos/mq/util/JsonUtil.java similarity index 99% rename from common/src/main/java/com/neusoft/smart/pos/mq/JsonUtil.java rename to common/src/main/java/com/neusoft/smart/pos/mq/util/JsonUtil.java index 76969d6..97e61f8 100644 --- a/common/src/main/java/com/neusoft/smart/pos/mq/JsonUtil.java +++ b/common/src/main/java/com/neusoft/smart/pos/mq/util/JsonUtil.java @@ -1,4 +1,4 @@ -package com.neusoft.smart.pos.mq; +package com.neusoft.smart.pos.mq.util; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/config-server/src/main/resources/yml-config/eureka-server-test.yml b/config-server/src/main/resources/yml-config/eureka-server-test.yml deleted file mode 100644 index ab502fe..0000000 --- a/config-server/src/main/resources/yml-config/eureka-server-test.yml +++ /dev/null @@ -1,15 +0,0 @@ -eureka: - instance: - hostname: eureka - prefer-ip-address: false - server: - enable-self-preservation: false - eviction-interval-timer-in-ms: 4000 - client: - register-with-eureka: false - fetch-registry: false - serviceUrl: - defaultZone: http://eureka:1101/eureka/ -logging: - level: - root: info \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/gateway-dalianshitang.yml b/config-server/src/main/resources/yml-config/gateway-dalianshitang.yml deleted file mode 100644 index 04ddb6e..0000000 --- a/config-server/src/main/resources/yml-config/gateway-dalianshitang.yml +++ /dev/null @@ -1,224 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://localhost:1101/eureka/ -logging: - level: - root: info -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain -spring: - redis: - #数据库索引 - database: 0 - #主机地址 - host: 127.0.0.1 - #主机端口 - port: 6379 - #密码 - password: - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: / - rabbitmq: - host: localhost - username: fmpos - password: fmpos@server123 - port: 5672 -server: - tomcat: - uri-encoding: UTF-8 - accept-count: 1000 - max-threads: 1000 - max-connections: 2000 -zuul: - ribbon: - eager-load: - enabled: true - semaphore: - max-semaphores: 1000 # 默认值 - debug: - request: false - sensitiveHeaders: Authorization - host: - connect-timeout-millis: 60000 - socket-timeout-millis: 60000 - add-host-header: true - max-total-connections: 2000 # 默认值 - maxTotalConnections: 2000 - max-per-route-connections: 2000 # 默认值 - maxPerRouteConnections: 2000 -hystrix: - command: - service-user: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-ota: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-device: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-org: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-advertisement: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-inventory: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - service-member: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-trade: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-payment: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-promotion: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - default: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - fallback: - enabled: false - threadpool: - default: - coreSize: 1000 - maximumSize: 1000 - service-inventory: - coreSize: 1000 - maximumSize: 1000 - service-trade: - coreSize: 1000 - maximumSize: 1000 - service-org: - coreSize: 1000 - maximumSize: 1000 - service-device: - coreSize: 1000 - maximumSize: 1000 - service-user: - coreSize: 1000 - maximumSize: 1000 - service-payment: - coreSize: 1000 - maximumSize: 1000 - service-promotion: - coreSize: 1000 - maximumSize: 1000 -ribbon: - ReadTimeout: 60000 - SocketTimeout: 60000 - - eager-load: - enabled: true - clients: service-device, service-ota, service-trade, service-advertisement, service-inventory, service-member, service-org, service-payment, service-user -security: - enable-csrf: false - ignored: - - /** - -feign: - compression: - request: - enabled: true - response: - enabled: true - -smart: - pos: - constant: - #是否启用营销系统 - promotion: - enabled: false - oss: - endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - url: - ota: http://10.209.96.135:8080/file/ota/ - media: http://10.209.96.135:8080/file/media/ - config: http://10.209.96.135:8080/file/config/ - codeLib: http://10.209.96.135:8080/file/codeLib/ - img: http://10.209.96.135:8080/file/img/ - qrCode: http://10.209.96.135:8080/file/qrCode/ - storeLogo: http://10.209.96.135:8080/file/logo/ - apk: http://10.209.96.135:8080/file/apk - upload: - path: /mnt/hgfs/share/ - relativePath: \ diff --git a/config-server/src/main/resources/yml-config/gateway-dev.yml b/config-server/src/main/resources/yml-config/gateway-dev.yml index 5d06670..8fccb13 100644 --- a/config-server/src/main/resources/yml-config/gateway-dev.yml +++ b/config-server/src/main/resources/yml-config/gateway-dev.yml @@ -9,6 +9,8 @@ mybatis: mapper-locations: classpath:mybatis/mapping/*.xml type-aliases-package: com.neusoft.smart.pos.persistent.domain spring: + profiles: + include: rabbitmq redis: #数据库索引 database: 0 @@ -44,6 +46,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 diff --git a/config-server/src/main/resources/yml-config/gateway-prod.yml b/config-server/src/main/resources/yml-config/gateway-prod.yml index 431f9c9..5fc6af4 100644 --- a/config-server/src/main/resources/yml-config/gateway-prod.yml +++ b/config-server/src/main/resources/yml-config/gateway-prod.yml @@ -11,6 +11,8 @@ mybatis: mapper-locations: classpath:mybatis/mapping/*.xml type-aliases-package: com.neusoft.smart.pos.persistent.domain spring: + profiles: + include: rabbitmq redis: #数据库索引 database: 10 @@ -46,6 +48,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 diff --git a/config-server/src/main/resources/yml-config/gateway-shenyangshitang.yml b/config-server/src/main/resources/yml-config/gateway-shenyangshitang.yml deleted file mode 100644 index d8276cd..0000000 --- a/config-server/src/main/resources/yml-config/gateway-shenyangshitang.yml +++ /dev/null @@ -1,220 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://localhost:1101/eureka/ -logging: - level: - root: info -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain -spring: - redis: - #数据库索引 - database: 0 - #主机地址 - host: 127.0.0.1 - #主机端口 - port: 6379 - #密码 - password: - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: /mnt/hgfs/share/ - enabled: true - max-file-size: 1000MB - rabbitmq: - host: localhost - username: fmpos - password: fmpos@server123 - port: 5672 -zuul: - ribbon: - eager-load: - enabled: true - semaphore: - max-semaphores: 1000 # 默认值 - debug: - request: false - sensitiveHeaders: Authorization - host: - connect-timeout-millis: 60000 - socket-timeout-millis: 60000 - add-host-header: true - max-total-connections: 2000 # 默认值 - maxTotalConnections: 2000 - max-per-route-connections: 2000 # 默认值 - maxPerRouteConnections: 2000 -hystrix: - command: - service-user: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-ota: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-device: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-org: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-advertisement: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-goods: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - service-member: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-trade: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-payment: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-promotion: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - default: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - fallback: - enabled: false - threadpool: - default: - coreSize: 1000 - maximumSize: 1000 - service-goods: - coreSize: 1000 - maximumSize: 1000 - service-trade: - coreSize: 1000 - maximumSize: 1000 - service-org: - coreSize: 1000 - maximumSize: 1000 - service-device: - coreSize: 1000 - maximumSize: 1000 - service-user: - coreSize: 1000 - maximumSize: 1000 - service-payment: - coreSize: 1000 - maximumSize: 1000 - service-promotion: - coreSize: 1000 - maximumSize: 1000 -ribbon: - ReadTimeout: 60000 - SocketTimeout: 60000 - - eager-load: - enabled: true - clients: service-device, service-ota, service-trade, service-advertisement, service-goods, service-member, service-org, service-payment, service-user -security: - enable-csrf: false - ignored: - - /** - -feign: - compression: - request: - enabled: true - response: - enabled: true - -smart: - pos: - constant: - #是否启用营销系统 - promotion: - enabled: false - oss: - endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - url: - ota: http://10.209.96.72:8080/file/ota/ - media: http://10.209.96.72:8080/file/media/ - config: http://10.209.96.72:8080/file/config/ - codeLib: http://10.209.96.72:8080/file/codeLib/ - img: http://10.209.96.72:8080/file/img/ - qrCode: http://10.209.96.72:8080/file/qrCode/ - storeLogo: http://10.209.96.72:8080/file/logo/ - apk: http://10.209.96.72:8080/file/apk - upload: - path: /mnt/hgfs/share/ - relativePath: \ diff --git a/config-server/src/main/resources/yml-config/gateway-test.yml b/config-server/src/main/resources/yml-config/gateway-test.yml deleted file mode 100644 index 735bcdf..0000000 --- a/config-server/src/main/resources/yml-config/gateway-test.yml +++ /dev/null @@ -1,226 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ -logging: - level: - root: info -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain -spring: - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: / - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -server: - tomcat: - uri-encoding: UTF-8 - accept-count: 1000 - max-threads: 1000 - max-connections: 2000 -zuul: - ribbon: - eager-load: - enabled: true - semaphore: - max-semaphores: 1000 # 默认值 - debug: - request: false - sensitiveHeaders: Authorization - host: - connect-timeout-millis: 60000 - socket-timeout-millis: 60000 - add-host-header: true - max-total-connections: 2000 # 默认值 - maxTotalConnections: 2000 - max-per-route-connections: 2000 # 默认值 - maxPerRouteConnections: 2000 -hystrix: - command: - service-user: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-ota: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-device: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-org: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-advertisement: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - service-inventory: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - service-member: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-trade: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-payment: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - service-promotion: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - default: - execution: - isolation: - strategy: THREAD - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - requestVolumeThreshold: 1000 - fallback: - enabled: false - threadpool: - default: - coreSize: 1000 - maximumSize: 1000 - service-inventory: - coreSize: 1000 - maximumSize: 1000 - service-trade: - coreSize: 1000 - maximumSize: 1000 - service-org: - coreSize: 1000 - maximumSize: 1000 - service-device: - coreSize: 1000 - maximumSize: 1000 - service-user: - coreSize: 1000 - maximumSize: 1000 - service-payment: - coreSize: 1000 - maximumSize: 1000 - service-promotion: - coreSize: 1000 - maximumSize: 1000 -ribbon: - ReadTimeout: 60000 - SocketTimeout: 60000 - - eager-load: - enabled: true - clients: service-device, service-ota, service-trade, service-advertisement, service-inventory, service-member, service-org, service-payment, service-user -security: - enable-csrf: false - ignored: - - /** - -feign: - compression: - request: - enabled: true - response: - enabled: true - -smart: - pos: - constant: - #是否启用营销系统 - promotion: - enabled: true - oss: - endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - bucketName: neusoft-ota - url: - host: http://otadl.neusoft.com/ - ota: http://otadl.neusoft.com/otadev/ - media: http://otadl.neusoft.com/media/ - config: http://otadl.neusoft.com/config/ - codeLib: http://otadl.neusoft.com/codeLib/ - img: http://otadl.neusoft.com/img/ - qrCode: http://otadl.neusoft.com/qrCode/ - storeLogo: http://otadl.neusoft.com/logo/ - apk: http://otadl.neusoft.com/apk - upload: - path: /tmp - relativePath: /tmp \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-advertisement-dev.yml b/config-server/src/main/resources/yml-config/service-advertisement-dev.yml index 9f9a464..d095652 100644 --- a/config-server/src/main/resources/yml-config/service-advertisement-dev.yml +++ b/config-server/src/main/resources/yml-config/service-advertisement-dev.yml @@ -16,6 +16,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -78,6 +80,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-advertisement-prod.yml b/config-server/src/main/resources/yml-config/service-advertisement-prod.yml index 9a7e076..81b8670 100644 --- a/config-server/src/main/resources/yml-config/service-advertisement-prod.yml +++ b/config-server/src/main/resources/yml-config/service-advertisement-prod.yml @@ -16,6 +16,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -78,6 +80,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-advertisement-test.yml b/config-server/src/main/resources/yml-config/service-advertisement-test.yml deleted file mode 100644 index 2efb4e8..0000000 --- a/config-server/src/main/resources/yml-config/service-advertisement-test.yml +++ /dev/null @@ -1,83 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ -# healthcheck: -# enabled: true - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -server: - tomcat: - uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-device-dev.yml b/config-server/src/main/resources/yml-config/service-device-dev.yml index 86dddd5..21a0720 100644 --- a/config-server/src/main/resources/yml-config/service-device-dev.yml +++ b/config-server/src/main/resources/yml-config/service-device-dev.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -76,6 +78,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-device-prod.yml b/config-server/src/main/resources/yml-config/service-device-prod.yml index c5617dc..580ccf9 100644 --- a/config-server/src/main/resources/yml-config/service-device-prod.yml +++ b/config-server/src/main/resources/yml-config/service-device-prod.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -76,6 +78,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-device-test.yml b/config-server/src/main/resources/yml-config/service-device-test.yml deleted file mode 100644 index 42c41cd..0000000 --- a/config-server/src/main/resources/yml-config/service-device-test.yml +++ /dev/null @@ -1,81 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: warn - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -server: - tomcat: - uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-fumao-dev.yml b/config-server/src/main/resources/yml-config/service-fumao-dev.yml index 9c77105..46764e7 100644 --- a/config-server/src/main/resources/yml-config/service-fumao-dev.yml +++ b/config-server/src/main/resources/yml-config/service-fumao-dev.yml @@ -70,7 +70,7 @@ spring: http: encoding: charset: UTF-8 - enabled: true + enabled: true server: tomcat: uri-encoding: UTF-8 diff --git a/config-server/src/main/resources/yml-config/service-fumao-test.yml b/config-server/src/main/resources/yml-config/service-fumao-test.yml deleted file mode 100644 index 4e38376..0000000 --- a/config-server/src/main/resources/yml-config/service-fumao-test.yml +++ /dev/null @@ -1,118 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true -server: - tomcat: - uri-encoding: UTF-8 -feign: - httpclient: - enabled: true - compression: - request: - enabled: true - response: - enabled: true -zuul: - ribbon: - eager-load: - enabled: true - host: - connect-timeout-millis: 60000 - socket-timeout-millis: 60000 - add-host-header: true - max-total-connections: 2000 # 默认值 - maxTotalConnections: 2000 - max-per-route-connections: 2000 # 默认值 - maxPerRouteConnections: 2000 -hystrix: - command: - service-member: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - threadpool: - default: - coreSize: 1000 - maximumSize: 1000 - service-member: - coreSize: 1000 - maximumSize: 1000 -ribbon: - ReadTimeout: 60000 - SocketTimeout: 60000 - eager-load: - enabled: true - clients: service-member \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-inventory-dev.yml b/config-server/src/main/resources/yml-config/service-inventory-dev.yml index 2c21f18..a9b0aa6 100644 --- a/config-server/src/main/resources/yml-config/service-inventory-dev.yml +++ b/config-server/src/main/resources/yml-config/service-inventory-dev.yml @@ -20,6 +20,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -75,6 +77,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 security: enable-csrf: false ignored: diff --git a/config-server/src/main/resources/yml-config/service-inventory-prod.yml b/config-server/src/main/resources/yml-config/service-inventory-prod.yml index f7c4a58..065c49c 100644 --- a/config-server/src/main/resources/yml-config/service-inventory-prod.yml +++ b/config-server/src/main/resources/yml-config/service-inventory-prod.yml @@ -13,6 +13,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -68,6 +70,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 security: enable-csrf: false ignored: diff --git a/config-server/src/main/resources/yml-config/service-inventory-shenyangshitang.yml b/config-server/src/main/resources/yml-config/service-inventory-shenyangshitang.yml deleted file mode 100644 index 78ebc2a..0000000 --- a/config-server/src/main/resources/yml-config/service-inventory-shenyangshitang.yml +++ /dev/null @@ -1,75 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://localhost:1101/eureka/ -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 0 - #主机地址 - host: 127.0.0.1 - #主机端口 - port: 6379 - #密码 - password: - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - upload: - path: /tmp - rabbitmq: - host: localhost - username: fmpos - password: fmpos@server123 - port: 5672 -security: - enable-csrf: false - ignored: - - /** -canApprove: true \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-inventory-test.yml b/config-server/src/main/resources/yml-config/service-inventory-test.yml deleted file mode 100644 index 82ee08d..0000000 --- a/config-server/src/main/resources/yml-config/service-inventory-test.yml +++ /dev/null @@ -1,76 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - upload: - path: /tmp - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -security: - enable-csrf: false - ignored: - - /** -canApprove: false -checkStorageOnceMore: true \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-member-dev.yml b/config-server/src/main/resources/yml-config/service-member-dev.yml index 2d658a1..820fa78 100644 --- a/config-server/src/main/resources/yml-config/service-member-dev.yml +++ b/config-server/src/main/resources/yml-config/service-member-dev.yml @@ -17,6 +17,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -79,6 +81,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 diff --git a/config-server/src/main/resources/yml-config/service-member-prod.yml b/config-server/src/main/resources/yml-config/service-member-prod.yml index d41000b..f5e9ab1 100644 --- a/config-server/src/main/resources/yml-config/service-member-prod.yml +++ b/config-server/src/main/resources/yml-config/service-member-prod.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -76,6 +78,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 diff --git a/config-server/src/main/resources/yml-config/service-member-test.yml b/config-server/src/main/resources/yml-config/service-member-test.yml deleted file mode 100644 index 8313ecd..0000000 --- a/config-server/src/main/resources/yml-config/service-member-test.yml +++ /dev/null @@ -1,90 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -server: - tomcat: - uri-encoding: UTF-8 - -security: - enable-csrf: false - ignored: - - /** -business: - codeMatchOrgAndStoreId: - code_01: 179@284 - code_01_url: https://facepay.95516.com/facepayWX/index.html?accessId=uphebei#/ \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-order-dev.yml.bak b/config-server/src/main/resources/yml-config/service-order-dev.yml.bak deleted file mode 100644 index d67c569..0000000 --- a/config-server/src/main/resources/yml-config/service-order-dev.yml.bak +++ /dev/null @@ -1,87 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://localhost:1101/eureka/ - instance: - hostname: localhost - prefer-ip-address: false - status-page-url: http://${spring.cloud.client.ipAddress}:${server.port}/swagger-ui.html -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.order.persistent - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 0 - #主机地址 - host: localhost - #主机端口 - port: 6379 - #密码 - password: - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: / - - rabbitmq: - host: localhost - username: fmpos - password: fmpos@server123 - port: 5672 -smart: - pos: - constant: - #微信点餐URL - wechatOrderUrl: http://fmneupos.malls.iformall.com/wechatOrder/index.html diff --git a/config-server/src/main/resources/yml-config/service-order-prod.yml.bak b/config-server/src/main/resources/yml-config/service-order-prod.yml.bak deleted file mode 100644 index 57262da..0000000 --- a/config-server/src/main/resources/yml-config/service-order-prod.yml.bak +++ /dev/null @@ -1,83 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.order.persistent - -logging: - level: - root: warn - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 10 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: / - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -smart: - pos: - constant: - #微信点餐URL - wechatOrderUrl: http://fmneupos.malls.iformall.com/wechatOrder/index.html \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-order-test.yml.bak b/config-server/src/main/resources/yml-config/service-order-test.yml.bak deleted file mode 100644 index 402d23f..0000000 --- a/config-server/src/main/resources/yml-config/service-order-test.yml.bak +++ /dev/null @@ -1,84 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.order.persistent - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: / - - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -smart: - pos: - constant: - #微信点餐URL - wechatOrderUrl: http://fmneupos.malls.iformall.com/wechatOrder/index.html \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-org-dev.yml b/config-server/src/main/resources/yml-config/service-org-dev.yml index abe28e3..6d20495 100644 --- a/config-server/src/main/resources/yml-config/service-org-dev.yml +++ b/config-server/src/main/resources/yml-config/service-org-dev.yml @@ -13,6 +13,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -66,6 +68,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 smartPosPlatform: tables: wechat-redirect-url: http://10.209.96.72:9999/#/?table= \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-org-prod.yml b/config-server/src/main/resources/yml-config/service-org-prod.yml index bc44d37..c39a0cd 100644 --- a/config-server/src/main/resources/yml-config/service-org-prod.yml +++ b/config-server/src/main/resources/yml-config/service-org-prod.yml @@ -13,6 +13,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -66,6 +68,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 smartPosPlatform: tables: wechat-redirect-url: http://10.209.96.72:9999/#/?table= \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-org-test.yml b/config-server/src/main/resources/yml-config/service-org-test.yml deleted file mode 100644 index d1a9fe7..0000000 --- a/config-server/src/main/resources/yml-config/service-org-test.yml +++ /dev/null @@ -1,71 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -smartPosPlatform: - tables: - wechat-redirect-url: http://10.209.96.72:9999/#/?table= \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-ota-dev.yml b/config-server/src/main/resources/yml-config/service-ota-dev.yml index 3b45988..3712805 100644 --- a/config-server/src/main/resources/yml-config/service-ota-dev.yml +++ b/config-server/src/main/resources/yml-config/service-ota-dev.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -76,6 +78,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-ota-prod.yml b/config-server/src/main/resources/yml-config/service-ota-prod.yml index c5617dc..580ccf9 100644 --- a/config-server/src/main/resources/yml-config/service-ota-prod.yml +++ b/config-server/src/main/resources/yml-config/service-ota-prod.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -76,6 +78,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-ota-test.yml b/config-server/src/main/resources/yml-config/service-ota-test.yml deleted file mode 100644 index 2f662f1..0000000 --- a/config-server/src/main/resources/yml-config/service-ota-test.yml +++ /dev/null @@ -1,81 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -server: - tomcat: - uri-encoding: UTF-8 \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-payment-dev.yml b/config-server/src/main/resources/yml-config/service-payment-dev.yml index b65e43a..1bb5be7 100644 --- a/config-server/src/main/resources/yml-config/service-payment-dev.yml +++ b/config-server/src/main/resources/yml-config/service-payment-dev.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -70,6 +72,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 yumstone: trade-url: http://127.0.0.1:18081/canteen/yumstone/trade refund-url: http://127.0.0.1:18081/canteen/yumstone/refund \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-payment-prod.yml b/config-server/src/main/resources/yml-config/service-payment-prod.yml index 03b7a70..f08bc02 100644 --- a/config-server/src/main/resources/yml-config/service-payment-prod.yml +++ b/config-server/src/main/resources/yml-config/service-payment-prod.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -70,6 +72,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 yumstone: trade-url: http://127.0.0.1:18081/canteen/yumstone/trade refund-url: http://127.0.0.1:18081/canteen/yumstone/refund \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-payment-test.yml b/config-server/src/main/resources/yml-config/service-payment-test.yml deleted file mode 100644 index 49baf82..0000000 --- a/config-server/src/main/resources/yml-config/service-payment-test.yml +++ /dev/null @@ -1,75 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.payment.persistent - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -yumstone: - trade-url: http://127.0.0.1:18081/canteen/yumstone/trade - refund-url: http://127.0.0.1:18081/canteen/yumstone/refund \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-payorder-test.yml b/config-server/src/main/resources/yml-config/service-payorder-test.yml deleted file mode 100644 index 844966f..0000000 --- a/config-server/src/main/resources/yml-config/service-payorder-test.yml +++ /dev/null @@ -1,78 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.payorder.persistent - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: / -smart: - pos: - constant: - #微信点餐URL - wechatOrderUrl: http://fmneupos.malls.iformall.com/wechatOrder/index.html \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-promotion-dev.yml b/config-server/src/main/resources/yml-config/service-promotion-dev.yml index 80f7a84..f23da9e 100644 --- a/config-server/src/main/resources/yml-config/service-promotion-dev.yml +++ b/config-server/src/main/resources/yml-config/service-promotion-dev.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -77,6 +79,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 diff --git a/config-server/src/main/resources/yml-config/service-promotion-prod.yml b/config-server/src/main/resources/yml-config/service-promotion-prod.yml index 64be3d5..2c53bfe 100644 --- a/config-server/src/main/resources/yml-config/service-promotion-prod.yml +++ b/config-server/src/main/resources/yml-config/service-promotion-prod.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -77,6 +79,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 server: tomcat: uri-encoding: UTF-8 diff --git a/config-server/src/main/resources/yml-config/service-promotion-test.yml b/config-server/src/main/resources/yml-config/service-promotion-test.yml deleted file mode 100644 index 4cb1333..0000000 --- a/config-server/src/main/resources/yml-config/service-promotion-test.yml +++ /dev/null @@ -1,124 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - mvc: - date-format: yyyy-MM-dd HH:mm:ss - http: - encoding: - charset: UTF-8 - enabled: true - - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -server: - tomcat: - uri-encoding: UTF-8 -feign: - httpclient: - enabled: true - compression: - request: - enabled: true - response: - enabled: true -zuul: - ribbon: - eager-load: - enabled: true - host: - connect-timeout-millis: 60000 - socket-timeout-millis: 60000 - add-host-header: true - max-total-connections: 2000 # 默认值 - maxTotalConnections: 2000 - max-per-route-connections: 2000 # 默认值 - maxPerRouteConnections: 2000 -hystrix: - command: - service-member: - execution: - isolation: - thread: - timeoutInMilliseconds: 50000 - circuitBreaker: - enabled: false - threadpool: - default: - coreSize: 1000 - maximumSize: 1000 - service-member: - coreSize: 1000 - maximumSize: 1000 -ribbon: - ReadTimeout: 60000 - SocketTimeout: 60000 - eager-load: - enabled: true - clients: service-member \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-ssl-dev.yml b/config-server/src/main/resources/yml-config/service-ssl-dev.yml index f0054c6..b0933eb 100644 --- a/config-server/src/main/resources/yml-config/service-ssl-dev.yml +++ b/config-server/src/main/resources/yml-config/service-ssl-dev.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -72,6 +74,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 smart: pos: ssl: diff --git a/config-server/src/main/resources/yml-config/service-ssl-prod.yml b/config-server/src/main/resources/yml-config/service-ssl-prod.yml index 1aa2665..849401f 100644 --- a/config-server/src/main/resources/yml-config/service-ssl-prod.yml +++ b/config-server/src/main/resources/yml-config/service-ssl-prod.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -72,6 +74,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 smart: pos: ssl: diff --git a/config-server/src/main/resources/yml-config/service-ssl-test.yml b/config-server/src/main/resources/yml-config/service-ssl-test.yml deleted file mode 100644 index 03d701b..0000000 --- a/config-server/src/main/resources/yml-config/service-ssl-test.yml +++ /dev/null @@ -1,86 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - mvc: - date-format: yyyy-MM-dd HH:mm:ss - - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -smart: - pos: - ssl: - root: - cert: - path: E:\\ssl\\Server-Trust\\NeusoftOTAChain4Client.pem - key: - path: E:\\ssl\\Server-Update\\NeusoftOTAClientUse2100.key - password: 951753 - cert: - folder: - path: E:\\ssl\\Server-ToPost \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-trade-dev.yml b/config-server/src/main/resources/yml-config/service-trade-dev.yml index bf75576..f6871d4 100644 --- a/config-server/src/main/resources/yml-config/service-trade-dev.yml +++ b/config-server/src/main/resources/yml-config/service-trade-dev.yml @@ -17,6 +17,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -80,6 +82,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 smart: pos: constant: diff --git a/config-server/src/main/resources/yml-config/service-trade-prod.yml b/config-server/src/main/resources/yml-config/service-trade-prod.yml index e8c60ff..d3b9d79 100644 --- a/config-server/src/main/resources/yml-config/service-trade-prod.yml +++ b/config-server/src/main/resources/yml-config/service-trade-prod.yml @@ -14,6 +14,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -76,6 +78,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 smart: pos: constant: diff --git a/config-server/src/main/resources/yml-config/service-trade-test.yml b/config-server/src/main/resources/yml-config/service-trade-test.yml deleted file mode 100644 index 8be1f7b..0000000 --- a/config-server/src/main/resources/yml-config/service-trade-test.yml +++ /dev/null @@ -1,100 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.order.persistent - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - http: - encoding: - charset: UTF-8 - enabled: true - multipart: - location: / - - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -smart: - pos: - constant: - #微信点餐URL - wechatOrderUrl: http://fmneupos.malls.iformall.com/wechatOrder/index.html - oss: - endpoint: oss-cn-beijing.aliyuncs.com - accessId: LTAIm8Xt7lFtKxm6 - accessKey: bmZVdGdffb5fatUxiIL1PhckOxLE1d - host: http://neusoft-ota.oss-cn-beijing.aliyuncs.com - bucketName: neusoft-ota - url: - host: http://otadl.neusoft.com/ - ota: http://otadl.neusoft.com/otadev/ - media: http://otadl.neusoft.com/media/ - config: http://otadl.neusoft.com/config/ - codeLib: http://otadl.neusoft.com/codeLib/ - img: http://otadl.neusoft.com/img/ - qrCode: http://otadl.neusoft.com/qrCode/ - storeLogo: http://otadl.neusoft.com/logo/ - apk: http://otadl.neusoft.com/apk \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-user-dev.yml b/config-server/src/main/resources/yml-config/service-user-dev.yml index 9a9ea51..6557104 100644 --- a/config-server/src/main/resources/yml-config/service-user-dev.yml +++ b/config-server/src/main/resources/yml-config/service-user-dev.yml @@ -13,6 +13,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -67,6 +69,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 security: enable-csrf: false ignored: diff --git a/config-server/src/main/resources/yml-config/service-user-prod.yml b/config-server/src/main/resources/yml-config/service-user-prod.yml index d39a7c2..39a4455 100644 --- a/config-server/src/main/resources/yml-config/service-user-prod.yml +++ b/config-server/src/main/resources/yml-config/service-user-prod.yml @@ -13,6 +13,8 @@ logging: #DataSource配置,默认主数据源 spring: + profiles: + include: rabbitmq datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver @@ -67,6 +69,10 @@ spring: username: fmpos password: fmpos@server123 port: 5672 + aliyunRocketmq: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 security: enable-csrf: false ignored: diff --git a/config-server/src/main/resources/yml-config/service-user-test.yml b/config-server/src/main/resources/yml-config/service-user-test.yml deleted file mode 100644 index 168fd2d..0000000 --- a/config-server/src/main/resources/yml-config/service-user-test.yml +++ /dev/null @@ -1,72 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 - rabbitmq: - host: 172.17.173.172 - username: fmpos - password: fmpos@server123 - port: 5672 -security: - enable-csrf: false - ignored: - - /** \ No newline at end of file diff --git a/config-server/src/main/resources/yml-config/service-wxopen-test.yml b/config-server/src/main/resources/yml-config/service-wxopen-test.yml deleted file mode 100644 index 608c0e1..0000000 --- a/config-server/src/main/resources/yml-config/service-wxopen-test.yml +++ /dev/null @@ -1,75 +0,0 @@ -eureka: - client: - service-url: - defaultZone: http://eureka:1101/eureka/ - -#mapper文件加载支持两种方式,一种是在config文件中配置,一种是在这里配置 -mybatis: - mapper-locations: classpath:mybatis/mapping/*.xml - type-aliases-package: com.neusoft.smart.pos.persistent.domain - -logging: - level: - root: info - -#DataSource配置,默认主数据源 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://rm-2zen3rya8g4zur77c.mysql.rds.aliyuncs.com:3306/otaNewV2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false - username: fmposdb - password: fmposdb@2021User - #初始化大小,最小,最大 - initialSize: 5 - minIdle: 5 - maxActive: 20 - #配置获取连接等待超时的时间 - maxWait: 60000 - #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - #配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #打开PSCache,并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - #配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙 - filters: stat,wall,log4j - #通过connectProperties属性来打开mergeSql功能;慢SQL记录 - connectionProperties: druid.stat.mergeSql:true;druid.stat.slowSqlMillis:5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - redis: - #数据库索引 - database: 20 - #主机地址 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - #主机端口 - port: 6379 - #密码 - password: mallone:iF0rm@2l2ol9 - #最大连接数,为负表示不限制 - maxTotal: 8 - #最大阻塞等待时间,为负表示不限制 - maxWait: -1 - #最大空闲连接 - maxIdle: 8 - #最小空闲连接 - minIdle: 0 - #连接超时时间 - timeout: 0 -wechat: - open: - componentAppId: wxe68326867a19a32b - componentSecret: a2f8a5d50e5fe7bd465ec01515b6c5c5 - componentToken: POS_TOKEN - componentAesKey: neusoftuasdubioneproductposkey20181110256pm - redis: - database: 1 - host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com - port: 6379 - password: \ No newline at end of file diff --git a/gateway/src/main/java/com/neusoft/smart/pos/gateway/controller/OssReconciliationController.java b/gateway/src/main/java/com/neusoft/smart/pos/gateway/controller/OssReconciliationController.java index c1b1968..b2a956f 100644 --- a/gateway/src/main/java/com/neusoft/smart/pos/gateway/controller/OssReconciliationController.java +++ b/gateway/src/main/java/com/neusoft/smart/pos/gateway/controller/OssReconciliationController.java @@ -11,7 +11,8 @@ import com.neusoft.smart.pos.framework.exception.BusinessCommonException; import com.neusoft.smart.pos.framework.utils.IdGenerateUtils; import com.neusoft.smart.pos.framework.utils.LocalDateTimeUtils; import com.neusoft.smart.pos.framework.utils.SignatureUtils; -import com.neusoft.smart.pos.utils.RabbitMQSender; +import com.neusoft.smart.pos.mq.rabbitmq.RabbitMQSender; + import io.swagger.annotations.ApiOperation; import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/constants/InventoryErrorCode.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/constants/InventoryErrorCode.java index ecf32dc..37305fe 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/constants/InventoryErrorCode.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/constants/InventoryErrorCode.java @@ -28,6 +28,7 @@ public enum InventoryErrorCode implements CommonCode { this.message = message; } + public String getCode() { return code; } diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/GoodsCateringMenuController.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/GoodsCateringMenuController.java index 71cefa2..0f6ed47 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/GoodsCateringMenuController.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/GoodsCateringMenuController.java @@ -64,6 +64,7 @@ public class GoodsCateringMenuController { return new ResponseData<>(menuService.selectMenus(request)); } + @ApiOperation(value = "微信查询菜单列表接口") @GetMapping("/menus/shop/{shopId}") public ResponseData getList(@PathVariable Integer shopId) { diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryCheckStockController.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryCheckStockController.java index d5fdcf0..de46cb6 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryCheckStockController.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryCheckStockController.java @@ -38,6 +38,7 @@ public class InventoryCheckStockController { return new ResponseData<>(checkStockService.getList(request)); } + @ApiOperation(value = "库存盘点详情接口") @GetMapping("/detail") public ResponseData detail(InventoryCheckStockDetailRequest request) { diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsCategoryController.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsCategoryController.java index f41cda6..dbdc25d 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsCategoryController.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsCategoryController.java @@ -40,6 +40,7 @@ public class InventoryGoodsCategoryController { return new ResponseData<>(categoryService.selectCategories(request)); } + @ApiOperation(value = "创建类别接口") @PostMapping("") public ResponseData createCategory(@RequestBody CreateCategoryRequest request) { diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsTagController.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsTagController.java index de33183..5752d7e 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsTagController.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsTagController.java @@ -45,6 +45,7 @@ public class InventoryGoodsTagController { return new ResponseData<>(tagService.selectTags(request)); } + @ApiOperation(value = "标签列表接口") @GetMapping("/flavor/pos/{snCode}") public ResponseData> getFlavorTagsByPos(@PathVariable String snCode) { diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreBatchController.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreBatchController.java index a4f70e3..d24e708 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreBatchController.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreBatchController.java @@ -35,6 +35,7 @@ public class InventoryStoreBatchController { return new ResponseData<>(inventoryStoreBatchService.increaseInventory(request, InventoryConstant.STOCK_ADD, InventoryConstant.STOCK_IN)); } + @ApiOperation(value = "用户退货入库接口") @PostMapping("/userReturn") public ResponseData userReturn(@RequestBody PostInventoryStoreBatchRequest request) { diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreController.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreController.java index 0a397d6..00431ac 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreController.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreController.java @@ -46,6 +46,7 @@ public class InventoryStoreController { return new ResponseData<>(inventoryStoreService.getList(request)); } + @ApiOperation(value = "后台库存总金额接口") @GetMapping("/total-amount") public ResponseData getTotalAmount(@RequestParam(value = "shop_id") Integer shopId) { diff --git a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/SupplierController.java b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/SupplierController.java index a709d53..6a7ce0e 100644 --- a/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/SupplierController.java +++ b/service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/SupplierController.java @@ -35,6 +35,7 @@ public class SupplierController { return new ResponseData<>(supplierService.getList(request)); } + @ApiOperation(value = "供应商查询接口") @GetMapping("/{id}") public ResponseData detail(@PathVariable Integer id) { diff --git a/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardCapitalChangeController.java b/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardCapitalChangeController.java index cb57d1a..84a8de8 100644 --- a/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardCapitalChangeController.java +++ b/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardCapitalChangeController.java @@ -8,9 +8,7 @@ import com.neusoft.smart.pos.framework.bean.PaginationExtendBean; import com.neusoft.smart.pos.framework.dto.ResponseData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; import javax.validation.Valid; import java.math.BigDecimal; diff --git a/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardController.java b/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardController.java index 1c4d564..31a2f2a 100644 --- a/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardController.java +++ b/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardController.java @@ -98,6 +98,7 @@ public class CardController { return new ResponseData<>(); } + @Transactional @ApiOperation(value = "deactivate card") @PostMapping("/card/deactivate") diff --git a/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardTradeController.java b/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardTradeController.java index 694596f..3fb4ce3 100644 --- a/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardTradeController.java +++ b/service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardTradeController.java @@ -80,6 +80,7 @@ public class CardTradeController { return new ResponseData<>(afterBalance); } + @Transactional @PostMapping("/transfer/{snCode}") @ApiOperation(value = "转账接口", notes = "转账接口") diff --git a/service-member/src/main/java/com/neusoft/smart/pos/mq/MemberAliyunRocketMQReceiver.java b/service-member/src/main/java/com/neusoft/smart/pos/mq/MemberAliyunRocketMQReceiver.java new file mode 100644 index 0000000..0e18780 --- /dev/null +++ b/service-member/src/main/java/com/neusoft/smart/pos/mq/MemberAliyunRocketMQReceiver.java @@ -0,0 +1,27 @@ +package com.neusoft.smart.pos.mq; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import com.neusoft.smart.pos.mq.aliyunRocketMq.AliyunRocketMqConsumer; +import com.neusoft.smart.pos.mq.aliyunRocketMq.EnumMsgTopic; +import com.neusoft.smart.pos.mq.aliyunRocketMq.EnumMsgTopicTags; +import com.neusoft.smart.pos.mq.helper.MemberMQReceiverHelper; +import com.neusoft.smart.pos.mq.MQConfig; + +@Component +@Profile(MQConfig.Impl.ALIYUN_ROCKET_MQ) +public class MemberAliyunRocketMQReceiver extends AliyunRocketMqConsumer{ + + @Autowired + MemberMQReceiverHelper memberMQReceiverHelper; + + + @Override + protected void doMessage(String topic,String tag,String msg) { + if (EnumMsgTopic.ORDER_COMPLETE.getTopic().equals(topic) && EnumMsgTopicTags.ORDER_COMPLETE_QUEUE2.getTags().equals(tag)) { + memberMQReceiverHelper.processOrderCompleteStringMessage(msg); + } + } + +} diff --git a/service-member/src/main/java/com/neusoft/smart/pos/mq/MemberRabbitMQReceiver.java b/service-member/src/main/java/com/neusoft/smart/pos/mq/MemberRabbitMQReceiver.java new file mode 100644 index 0000000..6f7a96d --- /dev/null +++ b/service-member/src/main/java/com/neusoft/smart/pos/mq/MemberRabbitMQReceiver.java @@ -0,0 +1,22 @@ +package com.neusoft.smart.pos.mq; + +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import com.neusoft.smart.pos.mq.helper.MemberMQReceiverHelper; + +@Profile(MQConfig.Impl.RABBIT_MQ) +@Component +public class MemberRabbitMQReceiver { + + @Autowired + MemberMQReceiverHelper memberMQReceiverHelper; + + + @RabbitListener(queues = "order.complete.queue2.name") + public void processOrderCompleteMessage(byte[] content) { + memberMQReceiverHelper.processOrderCompleteMessage(content); + } + +} diff --git a/service-member/src/main/java/com/neusoft/smart/pos/card/utils/RabbitMQReceiver.java b/service-member/src/main/java/com/neusoft/smart/pos/mq/helper/MemberMQReceiverHelper.java similarity index 90% rename from service-member/src/main/java/com/neusoft/smart/pos/card/utils/RabbitMQReceiver.java rename to service-member/src/main/java/com/neusoft/smart/pos/mq/helper/MemberMQReceiverHelper.java index 7bd1914..318be3a 100644 --- a/service-member/src/main/java/com/neusoft/smart/pos/card/utils/RabbitMQReceiver.java +++ b/service-member/src/main/java/com/neusoft/smart/pos/mq/helper/MemberMQReceiverHelper.java @@ -1,4 +1,4 @@ -package com.neusoft.smart.pos.card.utils; +package com.neusoft.smart.pos.mq.helper; import com.alibaba.fastjson.JSONObject; import com.neusoft.smart.pos.card.constants.CardCapitalChangeType; @@ -20,6 +20,8 @@ import com.neusoft.smart.pos.exchangeStrategy.persistent.repository.IExchangeStr import com.neusoft.smart.pos.exchangeStrategy.service.ExchangeStrategyTypeDictService; import com.neusoft.smart.pos.framework.utils.DateUtils; import com.neusoft.smart.pos.framework.utils.SpringUtils; +import com.neusoft.smart.pos.mq.util.JsonUtil; + import lombok.val; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.SerializationUtils; @@ -33,9 +35,9 @@ import java.util.Date; import java.util.List; @Component -public class RabbitMQReceiver { +public class MemberMQReceiverHelper { - private static Logger logger = LoggerFactory.getLogger(RabbitMQReceiver.class); + private static Logger logger = LoggerFactory.getLogger(MemberMQReceiverHelper.class); @Resource private CardTradeService cardTradeService; @@ -53,13 +55,26 @@ public class RabbitMQReceiver { * 充值订单完成后,要更新卡内余额 * @param content */ - @RabbitListener(queues = "order.complete.queue2.name") + //rabbitmq @Transactional public void processOrderCompleteMessage(byte[] content) { logger.info("消息接收者接收到来自【order.complete队列二】的消息,消息内容:{}",content); GetAllOrderInfoResponse info = (GetAllOrderInfoResponse) SerializationUtils.deserialize(content); logger.info("反序列化消息内容:{}",info); - String orderType = info.getOrderType(); + processOrderCompleteMessage(info); + } + + //aliyunRocketMq + @Transactional + public void processOrderCompleteStringMessage(String content) { + logger.info("消息接收者接收到来自【order.complete队列二】的消息,消息内容:{}",content); + GetAllOrderInfoResponse info = (GetAllOrderInfoResponse) JsonUtil.readValue(content, GetAllOrderInfoResponse.class); + logger.info("反序列化消息内容:{}",info); + processOrderCompleteMessage(info); + } + + public void processOrderCompleteMessage(GetAllOrderInfoResponse info) { + String orderType = info.getOrderType(); if(orderType.equals(DictionaryConstant.ORDER_TYPE_HYCZ.getCode()) && info.getOrderStatus().equals(DictionaryConstant.ORDER_UPDATE_STATUS_ZFWC.getCode())) { //充值订单并且状态为支付完成 List payInfos = info.getPayInfos(); @@ -84,6 +99,8 @@ public class RabbitMQReceiver { } } } + + public void doRecharge(RechargeRequest rechargeRequest, String sn, Integer orgId, Integer shopId) { logger.info("doRecharge"); diff --git a/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TableGroupsController.java b/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TableGroupsController.java index 1f36960..29b3b13 100644 --- a/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TableGroupsController.java +++ b/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TableGroupsController.java @@ -36,6 +36,7 @@ public class TableGroupsController { return new ResponseData(); } + @GetMapping("/{id}") public ResponseData selectById(@PathVariable("id") Integer id) { return new ResponseData<>(tableGroupsMapper.selectById(id)); diff --git a/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TablesController.java b/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TablesController.java index 249f785..615750c 100644 --- a/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TablesController.java +++ b/service-org/src/main/java/com/neusoft/smart/pos/org/controller/TablesController.java @@ -47,6 +47,7 @@ public class TablesController { return new ResponseData(); } + @GetMapping("/{id}") public ResponseData selectById(@PathVariable("id") Integer id) { return new ResponseData<>(tableService.selectById(id)); diff --git a/service-org/src/main/java/com/neusoft/smart/pos/org/persistent/domain/OrgExample.java b/service-org/src/main/java/com/neusoft/smart/pos/org/persistent/domain/OrgExample.java index b4cbbc8..f65d374 100644 --- a/service-org/src/main/java/com/neusoft/smart/pos/org/persistent/domain/OrgExample.java +++ b/service-org/src/main/java/com/neusoft/smart/pos/org/persistent/domain/OrgExample.java @@ -17,6 +17,7 @@ public class OrgExample { public OrgExample() { oredCriteria = new ArrayList(); } + public String getOrderByClause() { return orderByClause; diff --git a/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradePackageController.java b/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradePackageController.java index 3950252..30a1a75 100644 --- a/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradePackageController.java +++ b/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradePackageController.java @@ -43,6 +43,7 @@ public class UpgradePackageController { return new ResponseData<>(); } + @ApiOperation(value = "分页查询更新包接口", notes = "分页查询更新包接口") @PostMapping("/upgradePackages") public ResponseData> list(@RequestBody UpgradePackageQueryRequest upgradePackageQueryRequest) { diff --git a/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradeStrategyController.java b/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradeStrategyController.java index 041a8d1..8ed1564 100644 --- a/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradeStrategyController.java +++ b/service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradeStrategyController.java @@ -45,6 +45,7 @@ public class UpgradeStrategyController { return new ResponseData<>(); } + @ApiOperation(value = "分页查询升级策略接口", notes = "分页查询升级策略接口") @PostMapping("/upgradeStrategies") public ResponseData> groupList(@RequestBody UpgradeStrategyQueryRequest upgradeStrategyQueryRequest) { diff --git a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/persistent/repository/PromotionPayChannelRepository.java b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/persistent/repository/PromotionPayChannelRepository.java index 4c1572f..2197dd3 100644 --- a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/persistent/repository/PromotionPayChannelRepository.java +++ b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/persistent/repository/PromotionPayChannelRepository.java @@ -27,6 +27,7 @@ public class PromotionPayChannelRepository { promotionPayChannelMapper.insertSelective(promotionPayChannel); } + /** * * @param promotionPayChannel diff --git a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/ManualPromotionCalculate.java b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/ManualPromotionCalculate.java index 12e793f..e2330bb 100644 --- a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/ManualPromotionCalculate.java +++ b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/ManualPromotionCalculate.java @@ -25,4 +25,5 @@ public class ManualPromotionCalculate implements IPromotionCalculate { } return calculateBean; } + } diff --git a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/MemberPromotionCalculate.java b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/MemberPromotionCalculate.java index 784c9d0..45822f9 100644 --- a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/MemberPromotionCalculate.java +++ b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/MemberPromotionCalculate.java @@ -32,4 +32,5 @@ public class MemberPromotionCalculate implements IPromotionCalculate { } return calculateBean; } + } diff --git a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PaymentPromotionCalculate.java b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PaymentPromotionCalculate.java index 649649d..a8151f5 100644 --- a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PaymentPromotionCalculate.java +++ b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PaymentPromotionCalculate.java @@ -66,4 +66,5 @@ public class PaymentPromotionCalculate implements IPromotionCalculate { } return calculateBean; } + } diff --git a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PromotionService.java b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PromotionService.java index ebb86b0..e0760ed 100644 --- a/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PromotionService.java +++ b/service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PromotionService.java @@ -183,6 +183,7 @@ public class PromotionService { return getPreferentialPriceResponse; } + // /** // * 临时计算一下合计 // * diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeAliyunRocketMQReceiver.java b/service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeAliyunRocketMQReceiver.java new file mode 100644 index 0000000..0db3a5e --- /dev/null +++ b/service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeAliyunRocketMQReceiver.java @@ -0,0 +1,33 @@ +package com.neusoft.smart.pos.mq; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import com.neusoft.smart.pos.mq.aliyunRocketMq.AliyunRocketMqConsumer; +import com.neusoft.smart.pos.mq.aliyunRocketMq.EnumMsgTopic; +import com.neusoft.smart.pos.mq.aliyunRocketMq.EnumMsgTopicTags; +import com.neusoft.smart.pos.mq.order.OrderMQReceiverHelper; +import com.neusoft.smart.pos.mq.payment.PaymentMQReceiverHelper; +import com.neusoft.smart.pos.mq.MQConfig; + +@Component +@Profile(MQConfig.Impl.ALIYUN_ROCKET_MQ) +public class TradeAliyunRocketMQReceiver extends AliyunRocketMqConsumer{ + + @Autowired + OrderMQReceiverHelper orderMQReceiverHelper; + + @Autowired + PaymentMQReceiverHelper paymentMQReceiverHelper; + + + @Override + protected void doMessage(String topic,String tag,String msg) { + if (EnumMsgTopic.LOGIN.getTopic().equals(topic) && EnumMsgTopicTags.LOGIN_QUEUE1.getTags().equals(tag)) { + paymentMQReceiverHelper.processLoginStringMessage(msg); + }else if (EnumMsgTopic.ORDER_COMPLETE.getTopic().equals(topic) && EnumMsgTopicTags.ORDER_COMPLETE_QUEUE1.getTags().equals(tag)) { + paymentMQReceiverHelper.processOrderCompleteStringMessage(msg); + } + } + +} diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeRabbitMQReceiver.java b/service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeRabbitMQReceiver.java new file mode 100644 index 0000000..1f298aa --- /dev/null +++ b/service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeRabbitMQReceiver.java @@ -0,0 +1,34 @@ +package com.neusoft.smart.pos.mq; + +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import com.neusoft.smart.pos.mq.order.OrderMQReceiverHelper; +import com.neusoft.smart.pos.mq.payment.PaymentMQReceiverHelper; + +@Profile(MQConfig.Impl.RABBIT_MQ) +@Component +public class TradeRabbitMQReceiver { + + @Autowired + OrderMQReceiverHelper orderMQReceiverHelper; + + @Autowired + PaymentMQReceiverHelper paymentMQReceiverHelper; + + @RabbitListener(queues = "file.uploaded.notify.queue1.name") + public void processAccountCheckingMessage(String objectName) { + orderMQReceiverHelper.doMessage(objectName); + } + + @RabbitListener(queues = "login.queue1.name") + public void processLoginMessage(byte[] content) { + paymentMQReceiverHelper.processLoginMessage(content); + } + + @RabbitListener(queues = "order.complete.queue1.name") + public void processOrderCompleteMessage(byte[] content) { + paymentMQReceiverHelper.processOrderCompleteMessage(content); + } +} diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/order/utils/OrderRabbitMQReceiver.java b/service-trade/src/main/java/com/neusoft/smart/pos/mq/order/OrderMQReceiverHelper.java similarity index 96% rename from service-trade/src/main/java/com/neusoft/smart/pos/order/utils/OrderRabbitMQReceiver.java rename to service-trade/src/main/java/com/neusoft/smart/pos/mq/order/OrderMQReceiverHelper.java index df95f30..5da6405 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/order/utils/OrderRabbitMQReceiver.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/mq/order/OrderMQReceiverHelper.java @@ -1,4 +1,4 @@ -package com.neusoft.smart.pos.order.utils; +package com.neusoft.smart.pos.mq.order; import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.*; @@ -11,6 +11,7 @@ import com.neusoft.smart.pos.framework.exception.BusinessCommonException; import com.neusoft.smart.pos.framework.utils.DateUtils; import com.neusoft.smart.pos.order.constants.TradeErrorCode; import com.neusoft.smart.pos.order.service.OrderService; +import com.neusoft.smart.pos.order.utils.WXTokenUtils; import com.neusoft.smart.pos.payorder.constants.PayErrorCode; import com.neusoft.smart.pos.payorder.persistent.domain.PayOrder; import com.neusoft.smart.pos.payorder.persistent.domain.TradeMchPayDetail; @@ -25,7 +26,6 @@ import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -39,9 +39,9 @@ import java.util.List; @Component -public class OrderRabbitMQReceiver { +public class OrderMQReceiverHelper { - private static Logger logger = LoggerFactory.getLogger(OrderRabbitMQReceiver.class); + private static Logger logger = LoggerFactory.getLogger(OrderMQReceiverHelper.class); private static final String M_CODE = "CMB034153fbffa79"; @Value("${smart.pos.constant.oss.endpoint}") private String endpoint; @@ -76,11 +76,9 @@ public class OrderRabbitMQReceiver { @Autowired private PayChannelRepository payChannelRepository; - @RabbitListener(queues = "file.uploaded.notify.queue1.name") - public void processAccountCheckingMessage(String objectName) { - logger.info("消息接收者接收到来自【login队列一】的消息,消息内容:{}", objectName); - - List transInfoList = getOssAccountInfo(objectName); + public void doMessage(String objectName) { + logger.info("消息接收者接收到来自【login队列一】的消息,消息内容:{}", objectName); + List transInfoList = getOssAccountInfo(objectName); for(val transInfo:transInfoList){ checkAccount(transInfo.getTransNo(), transInfo.getMemberCardNo(), transInfo.getAmount(), transInfo.getTime()); } diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/payment/utils/RabbitMQReceiver.java b/service-trade/src/main/java/com/neusoft/smart/pos/mq/payment/PaymentMQReceiverHelper.java similarity index 56% rename from service-trade/src/main/java/com/neusoft/smart/pos/payment/utils/RabbitMQReceiver.java rename to service-trade/src/main/java/com/neusoft/smart/pos/mq/payment/PaymentMQReceiverHelper.java index bde750a..d660f7c 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/payment/utils/RabbitMQReceiver.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/mq/payment/PaymentMQReceiverHelper.java @@ -1,29 +1,41 @@ -package com.neusoft.smart.pos.payment.utils; +package com.neusoft.smart.pos.mq.payment; import com.neusoft.smart.pos.dto.order.response.GetAllOrderInfoResponse; import org.apache.commons.lang3.SerializationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.neusoft.smart.pos.dto.user.LoginInfo; +import com.neusoft.smart.pos.mq.util.JsonUtil; import com.neusoft.smart.pos.payment.dto.request.FumaoLoginRequest; import com.neusoft.smart.pos.payment.service.FumaoPayService; @Component -public class RabbitMQReceiver { +public class PaymentMQReceiverHelper { - private static Logger logger = LoggerFactory.getLogger(RabbitMQReceiver.class); + private static Logger logger = LoggerFactory.getLogger(PaymentMQReceiverHelper.class); @Autowired FumaoPayService fumaoPayService; - @RabbitListener(queues = "login.queue1.name") + //rabbitmq public void processLoginMessage(byte[] content) { logger.info("消息接收者接收到来自【login队列一】的消息,消息内容:{}",content); LoginInfo info = (LoginInfo)SerializationUtils.deserialize(content); logger.info("反序列化消息内容:{}",info); + processLoginMessage(info); + } + + //aliyunRocketMq + public void processLoginStringMessage(String content) { + logger.info("消息接收者接收到来自【login队列一】的消息,消息内容:{}",content); + LoginInfo info = (LoginInfo)JsonUtil.readValue(content, LoginInfo.class); + logger.info("反序列化消息内容:{}",info); + processLoginMessage(info); + } + + private void processLoginMessage(LoginInfo info) { FumaoLoginRequest fumaoLoginRequest = new FumaoLoginRequest(); fumaoLoginRequest.setPhone(info.getUsername()); fumaoLoginRequest.setPassword(info.getPassword()); @@ -31,11 +43,21 @@ public class RabbitMQReceiver { fumaoPayService.fumaoCheckUser(fumaoLoginRequest); } - @RabbitListener(queues = "order.complete.queue1.name") + //rabbitmq public void processOrderCompleteMessage(byte[] content) { logger.info("消息接收者接收到来自【order.complete队列一】的消息,消息内容:{}",content); GetAllOrderInfoResponse info = (GetAllOrderInfoResponse)SerializationUtils.deserialize(content); logger.info("反序列化消息内容:{}",info); fumaoPayService.posOrderSync(info); } + + //aliyunRocketMq + public void processOrderCompleteStringMessage(String content) { + logger.info("消息接收者接收到来自【order.complete队列一】的消息,消息内容:{}",content); + GetAllOrderInfoResponse info = (GetAllOrderInfoResponse)JsonUtil.readValue(content, GetAllOrderInfoResponse.class); + logger.info("反序列化消息内容:{}",info); + fumaoPayService.posOrderSync(info); + } + + } \ No newline at end of file diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/order/service/OrderService.java b/service-trade/src/main/java/com/neusoft/smart/pos/order/service/OrderService.java index 220b261..f8bd976 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/order/service/OrderService.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/order/service/OrderService.java @@ -11,6 +11,7 @@ import com.neusoft.smart.pos.framework.exception.BusinessCommonException; import com.neusoft.smart.pos.framework.utils.BeanUtil; import com.neusoft.smart.pos.framework.utils.DateUtils; import com.neusoft.smart.pos.framework.utils.ListUtils; +import com.neusoft.smart.pos.mq.rabbitmq.RabbitMQSender; import com.neusoft.smart.pos.order.constants.TradeErrorCode; import com.neusoft.smart.pos.order.persistent.domain.OrderDelivery; import com.neusoft.smart.pos.order.persistent.domain.OrderMaster; @@ -27,7 +28,6 @@ import com.neusoft.smart.pos.payorder.repository.PayRefundOrderRepository; import com.neusoft.smart.pos.payorder.service.PayOrderService; import com.neusoft.smart.pos.strategy.service.StrategyService; import com.neusoft.smart.pos.utils.PosDeviceRedisUtils; -import com.neusoft.smart.pos.utils.RabbitMQSender; import com.neusoft.smart.pos.utils.RequestHeaderUtil; import lombok.val; import org.springframework.beans.BeanUtils; diff --git a/service-user/src/main/java/com/neusoft/smart/pos/user/controller/LoginController.java b/service-user/src/main/java/com/neusoft/smart/pos/user/controller/LoginController.java index b94fff1..cde46bc 100644 --- a/service-user/src/main/java/com/neusoft/smart/pos/user/controller/LoginController.java +++ b/service-user/src/main/java/com/neusoft/smart/pos/user/controller/LoginController.java @@ -4,10 +4,11 @@ import com.google.code.kaptcha.Producer; import com.neusoft.smart.pos.dto.user.*; import com.neusoft.smart.pos.framework.config.RabbitExchangeConfiguration; import com.neusoft.smart.pos.framework.dto.ResponseData; +import com.neusoft.smart.pos.mq.rabbitmq.RabbitMQSender; import com.neusoft.smart.pos.user.dto.request.LoginRequest; import com.neusoft.smart.pos.user.dto.request.LogoutRequest; import com.neusoft.smart.pos.user.service.UserService; -import com.neusoft.smart.pos.utils.RabbitMQSender; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils;