Bladeren bron

fix pos

release
xiaohanzi 3 jaren geleden
bovenliggende
commit
e9cc095804
88 gewijzigde bestanden met toevoegingen van 585 en 2413 verwijderingen
  1. +0
    -75
      common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqConsumer.java
  2. +0
    -45
      common/src/main/java/com/neusoft/smart/pos/mq/EnumMsgMqTopic.java
  3. +2
    -3
      common/src/main/java/com/neusoft/smart/pos/mq/MQConfig.java
  4. +5
    -1
      common/src/main/java/com/neusoft/smart/pos/mq/MqProducer.java
  5. +96
    -0
      common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqConsumer.java
  6. +50
    -36
      common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqMessageProducer.java
  7. +31
    -0
      common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopic.java
  8. +49
    -0
      common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopicTags.java
  9. +8
    -2
      common/src/main/java/com/neusoft/smart/pos/mq/rabbitmq/RabbitMQSender.java
  10. +1
    -1
      common/src/main/java/com/neusoft/smart/pos/mq/util/JsonUtil.java
  11. +0
    -15
      config-server/src/main/resources/yml-config/eureka-server-test.yml
  12. +0
    -224
      config-server/src/main/resources/yml-config/gateway-dalianshitang.yml
  13. +6
    -0
      config-server/src/main/resources/yml-config/gateway-dev.yml
  14. +6
    -0
      config-server/src/main/resources/yml-config/gateway-prod.yml
  15. +0
    -220
      config-server/src/main/resources/yml-config/gateway-shenyangshitang.yml
  16. +0
    -226
      config-server/src/main/resources/yml-config/gateway-test.yml
  17. +6
    -0
      config-server/src/main/resources/yml-config/service-advertisement-dev.yml
  18. +6
    -0
      config-server/src/main/resources/yml-config/service-advertisement-prod.yml
  19. +0
    -83
      config-server/src/main/resources/yml-config/service-advertisement-test.yml
  20. +6
    -0
      config-server/src/main/resources/yml-config/service-device-dev.yml
  21. +6
    -0
      config-server/src/main/resources/yml-config/service-device-prod.yml
  22. +0
    -81
      config-server/src/main/resources/yml-config/service-device-test.yml
  23. +1
    -1
      config-server/src/main/resources/yml-config/service-fumao-dev.yml
  24. +0
    -118
      config-server/src/main/resources/yml-config/service-fumao-test.yml
  25. +6
    -0
      config-server/src/main/resources/yml-config/service-inventory-dev.yml
  26. +6
    -0
      config-server/src/main/resources/yml-config/service-inventory-prod.yml
  27. +0
    -75
      config-server/src/main/resources/yml-config/service-inventory-shenyangshitang.yml
  28. +0
    -76
      config-server/src/main/resources/yml-config/service-inventory-test.yml
  29. +6
    -0
      config-server/src/main/resources/yml-config/service-member-dev.yml
  30. +6
    -0
      config-server/src/main/resources/yml-config/service-member-prod.yml
  31. +0
    -90
      config-server/src/main/resources/yml-config/service-member-test.yml
  32. +0
    -87
      config-server/src/main/resources/yml-config/service-order-dev.yml.bak
  33. +0
    -83
      config-server/src/main/resources/yml-config/service-order-prod.yml.bak
  34. +0
    -84
      config-server/src/main/resources/yml-config/service-order-test.yml.bak
  35. +6
    -0
      config-server/src/main/resources/yml-config/service-org-dev.yml
  36. +6
    -0
      config-server/src/main/resources/yml-config/service-org-prod.yml
  37. +0
    -71
      config-server/src/main/resources/yml-config/service-org-test.yml
  38. +6
    -0
      config-server/src/main/resources/yml-config/service-ota-dev.yml
  39. +6
    -0
      config-server/src/main/resources/yml-config/service-ota-prod.yml
  40. +0
    -81
      config-server/src/main/resources/yml-config/service-ota-test.yml
  41. +6
    -0
      config-server/src/main/resources/yml-config/service-payment-dev.yml
  42. +6
    -0
      config-server/src/main/resources/yml-config/service-payment-prod.yml
  43. +0
    -75
      config-server/src/main/resources/yml-config/service-payment-test.yml
  44. +0
    -78
      config-server/src/main/resources/yml-config/service-payorder-test.yml
  45. +6
    -0
      config-server/src/main/resources/yml-config/service-promotion-dev.yml
  46. +6
    -0
      config-server/src/main/resources/yml-config/service-promotion-prod.yml
  47. +0
    -124
      config-server/src/main/resources/yml-config/service-promotion-test.yml
  48. +6
    -0
      config-server/src/main/resources/yml-config/service-ssl-dev.yml
  49. +6
    -0
      config-server/src/main/resources/yml-config/service-ssl-prod.yml
  50. +0
    -86
      config-server/src/main/resources/yml-config/service-ssl-test.yml
  51. +6
    -0
      config-server/src/main/resources/yml-config/service-trade-dev.yml
  52. +6
    -0
      config-server/src/main/resources/yml-config/service-trade-prod.yml
  53. +0
    -100
      config-server/src/main/resources/yml-config/service-trade-test.yml
  54. +6
    -0
      config-server/src/main/resources/yml-config/service-user-dev.yml
  55. +6
    -0
      config-server/src/main/resources/yml-config/service-user-prod.yml
  56. +0
    -72
      config-server/src/main/resources/yml-config/service-user-test.yml
  57. +0
    -75
      config-server/src/main/resources/yml-config/service-wxopen-test.yml
  58. +2
    -1
      gateway/src/main/java/com/neusoft/smart/pos/gateway/controller/OssReconciliationController.java
  59. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/constants/InventoryErrorCode.java
  60. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/GoodsCateringMenuController.java
  61. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryCheckStockController.java
  62. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsCategoryController.java
  63. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsTagController.java
  64. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreBatchController.java
  65. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreController.java
  66. +1
    -0
      service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/SupplierController.java
  67. +0
    -2
      service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardCapitalChangeController.java
  68. +1
    -0
      service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardController.java
  69. +1
    -0
      service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardTradeController.java
  70. +27
    -0
      service-member/src/main/java/com/neusoft/smart/pos/mq/MemberAliyunRocketMQReceiver.java
  71. +22
    -0
      service-member/src/main/java/com/neusoft/smart/pos/mq/MemberRabbitMQReceiver.java
  72. +22
    -5
      service-member/src/main/java/com/neusoft/smart/pos/mq/helper/MemberMQReceiverHelper.java
  73. +1
    -0
      service-org/src/main/java/com/neusoft/smart/pos/org/controller/TableGroupsController.java
  74. +1
    -0
      service-org/src/main/java/com/neusoft/smart/pos/org/controller/TablesController.java
  75. +1
    -0
      service-org/src/main/java/com/neusoft/smart/pos/org/persistent/domain/OrgExample.java
  76. +1
    -0
      service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradePackageController.java
  77. +1
    -0
      service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradeStrategyController.java
  78. +1
    -0
      service-promotion/src/main/java/com/neusoft/smart/pos/promotion/persistent/repository/PromotionPayChannelRepository.java
  79. +1
    -0
      service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/ManualPromotionCalculate.java
  80. +1
    -0
      service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/MemberPromotionCalculate.java
  81. +1
    -0
      service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PaymentPromotionCalculate.java
  82. +1
    -0
      service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PromotionService.java
  83. +33
    -0
      service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeAliyunRocketMQReceiver.java
  84. +34
    -0
      service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeRabbitMQReceiver.java
  85. +7
    -9
      service-trade/src/main/java/com/neusoft/smart/pos/mq/order/OrderMQReceiverHelper.java
  86. +28
    -6
      service-trade/src/main/java/com/neusoft/smart/pos/mq/payment/PaymentMQReceiverHelper.java
  87. +1
    -1
      service-trade/src/main/java/com/neusoft/smart/pos/order/service/OrderService.java
  88. +2
    -1
      service-user/src/main/java/com/neusoft/smart/pos/user/controller/LoginController.java

+ 0
- 75
common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqConsumer.java Bestand weergeven

@@ -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));
}
}
}

+ 0
- 45
common/src/main/java/com/neusoft/smart/pos/mq/EnumMsgMqTopic.java Bestand weergeven

@@ -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;
}
}

+ 2
- 3
common/src/main/java/com/neusoft/smart/pos/mq/MQConfig.java Bestand weergeven

@@ -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";
}
}

+ 5
- 1
common/src/main/java/com/neusoft/smart/pos/mq/MqProducer.java Bestand weergeven

@@ -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);
}

+ 96
- 0
common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqConsumer.java Bestand weergeven

@@ -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<EnumMsgTopicTags> 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);
}

common/src/main/java/com/neusoft/smart/pos/mq/AliyunRocketMqMessageProducer.java → common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/AliyunRocketMqMessageProducer.java Bestand weergeven

@@ -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<String,Producer>();
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<EnumMsgTopicTags> 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();
}
}
}

+ 31
- 0
common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopic.java Bestand weergeven

@@ -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;
}
}

+ 49
- 0
common/src/main/java/com/neusoft/smart/pos/mq/aliyunRocketMq/EnumMsgTopicTags.java Bestand weergeven

@@ -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<EnumMsgTopicTags> getTagsByTopic(String topic) {
List<EnumMsgTopicTags> list = new ArrayList<EnumMsgTopicTags>();
for (EnumMsgTopicTags emtt: EnumMsgTopicTags.values()) {
if (emtt.getTopic().equals(topic)) {
list.add(emtt);
}
}
if (list.size() <= 0) {
return null;
}
return list;
}
}

common/src/main/java/com/neusoft/smart/pos/utils/RabbitMQSender.java → common/src/main/java/com/neusoft/smart/pos/mq/rabbitmq/RabbitMQSender.java Bestand weergeven

@@ -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();

common/src/main/java/com/neusoft/smart/pos/mq/JsonUtil.java → common/src/main/java/com/neusoft/smart/pos/mq/util/JsonUtil.java Bestand weergeven

@@ -1,4 +1,4 @@
package com.neusoft.smart.pos.mq;
package com.neusoft.smart.pos.mq.util;


import com.fasterxml.jackson.annotation.JsonInclude;

+ 0
- 15
config-server/src/main/resources/yml-config/eureka-server-test.yml Bestand weergeven

@@ -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

+ 0
- 224
config-server/src/main/resources/yml-config/gateway-dalianshitang.yml Bestand weergeven

@@ -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: \

+ 6
- 0
config-server/src/main/resources/yml-config/gateway-dev.yml Bestand weergeven

@@ -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


+ 6
- 0
config-server/src/main/resources/yml-config/gateway-prod.yml Bestand weergeven

@@ -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


+ 0
- 220
config-server/src/main/resources/yml-config/gateway-shenyangshitang.yml Bestand weergeven

@@ -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: \

+ 0
- 226
config-server/src/main/resources/yml-config/gateway-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-advertisement-dev.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-advertisement-prod.yml Bestand weergeven

@@ -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

+ 0
- 83
config-server/src/main/resources/yml-config/service-advertisement-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-device-dev.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-device-prod.yml Bestand weergeven

@@ -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

+ 0
- 81
config-server/src/main/resources/yml-config/service-device-test.yml Bestand weergeven

@@ -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

+ 1
- 1
config-server/src/main/resources/yml-config/service-fumao-dev.yml Bestand weergeven

@@ -70,7 +70,7 @@ spring:
http:
encoding:
charset: UTF-8
enabled: true
enabled: true
server:
tomcat:
uri-encoding: UTF-8


+ 0
- 118
config-server/src/main/resources/yml-config/service-fumao-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-inventory-dev.yml Bestand weergeven

@@ -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:


+ 6
- 0
config-server/src/main/resources/yml-config/service-inventory-prod.yml Bestand weergeven

@@ -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:


+ 0
- 75
config-server/src/main/resources/yml-config/service-inventory-shenyangshitang.yml Bestand weergeven

@@ -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

+ 0
- 76
config-server/src/main/resources/yml-config/service-inventory-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-member-dev.yml Bestand weergeven

@@ -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


+ 6
- 0
config-server/src/main/resources/yml-config/service-member-prod.yml Bestand weergeven

@@ -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


+ 0
- 90
config-server/src/main/resources/yml-config/service-member-test.yml Bestand weergeven

@@ -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#/

+ 0
- 87
config-server/src/main/resources/yml-config/service-order-dev.yml.bak Bestand weergeven

@@ -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

+ 0
- 83
config-server/src/main/resources/yml-config/service-order-prod.yml.bak Bestand weergeven

@@ -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

+ 0
- 84
config-server/src/main/resources/yml-config/service-order-test.yml.bak Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-org-dev.yml Bestand weergeven

@@ -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=

+ 6
- 0
config-server/src/main/resources/yml-config/service-org-prod.yml Bestand weergeven

@@ -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=

+ 0
- 71
config-server/src/main/resources/yml-config/service-org-test.yml Bestand weergeven

@@ -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=

+ 6
- 0
config-server/src/main/resources/yml-config/service-ota-dev.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-ota-prod.yml Bestand weergeven

@@ -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

+ 0
- 81
config-server/src/main/resources/yml-config/service-ota-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-payment-dev.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-payment-prod.yml Bestand weergeven

@@ -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

+ 0
- 75
config-server/src/main/resources/yml-config/service-payment-test.yml Bestand weergeven

@@ -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

+ 0
- 78
config-server/src/main/resources/yml-config/service-payorder-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-promotion-dev.yml Bestand weergeven

@@ -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


+ 6
- 0
config-server/src/main/resources/yml-config/service-promotion-prod.yml Bestand weergeven

@@ -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


+ 0
- 124
config-server/src/main/resources/yml-config/service-promotion-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-ssl-dev.yml Bestand weergeven

@@ -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:


+ 6
- 0
config-server/src/main/resources/yml-config/service-ssl-prod.yml Bestand weergeven

@@ -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:


+ 0
- 86
config-server/src/main/resources/yml-config/service-ssl-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-trade-dev.yml Bestand weergeven

@@ -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:


+ 6
- 0
config-server/src/main/resources/yml-config/service-trade-prod.yml Bestand weergeven

@@ -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:


+ 0
- 100
config-server/src/main/resources/yml-config/service-trade-test.yml Bestand weergeven

@@ -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

+ 6
- 0
config-server/src/main/resources/yml-config/service-user-dev.yml Bestand weergeven

@@ -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:

+ 6
- 0
config-server/src/main/resources/yml-config/service-user-prod.yml Bestand weergeven

@@ -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:

+ 0
- 72
config-server/src/main/resources/yml-config/service-user-test.yml Bestand weergeven

@@ -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:
- /**

+ 0
- 75
config-server/src/main/resources/yml-config/service-wxopen-test.yml Bestand weergeven

@@ -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:

+ 2
- 1
gateway/src/main/java/com/neusoft/smart/pos/gateway/controller/OssReconciliationController.java Bestand weergeven

@@ -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;


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/constants/InventoryErrorCode.java Bestand weergeven

@@ -28,6 +28,7 @@ public enum InventoryErrorCode implements CommonCode {
this.message = message;
}
public String getCode() {
return code;
}


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/GoodsCateringMenuController.java Bestand weergeven

@@ -64,6 +64,7 @@ public class GoodsCateringMenuController {
return new ResponseData<>(menuService.selectMenus(request));
}
@ApiOperation(value = "微信查询菜单列表接口")
@GetMapping("/menus/shop/{shopId}")
public ResponseData<MenuListResponse> getList(@PathVariable Integer shopId) {


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryCheckStockController.java Bestand weergeven

@@ -38,6 +38,7 @@ public class InventoryCheckStockController {
return new ResponseData<>(checkStockService.getList(request));
}
@ApiOperation(value = "库存盘点详情接口")
@GetMapping("/detail")
public ResponseData<InventoryCheckStockDetailResponse> detail(InventoryCheckStockDetailRequest request) {


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsCategoryController.java Bestand weergeven

@@ -40,6 +40,7 @@ public class InventoryGoodsCategoryController {
return new ResponseData<>(categoryService.selectCategories(request));
}
@ApiOperation(value = "创建类别接口")
@PostMapping("")
public ResponseData<CategoryResponse> createCategory(@RequestBody CreateCategoryRequest request) {


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryGoodsTagController.java Bestand weergeven

@@ -45,6 +45,7 @@ public class InventoryGoodsTagController {
return new ResponseData<>(tagService.selectTags(request));
}
@ApiOperation(value = "标签列表接口")
@GetMapping("/flavor/pos/{snCode}")
public ResponseData<List<String>> getFlavorTagsByPos(@PathVariable String snCode) {


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreBatchController.java Bestand weergeven

@@ -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<PostInventoryStoreBatchResponse> userReturn(@RequestBody PostInventoryStoreBatchRequest request) {


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/InventoryStoreController.java Bestand weergeven

@@ -46,6 +46,7 @@ public class InventoryStoreController {
return new ResponseData<>(inventoryStoreService.getList(request));
}
@ApiOperation(value = "后台库存总金额接口")
@GetMapping("/total-amount")
public ResponseData<InventoryTotalAmountResponse> getTotalAmount(@RequestParam(value = "shop_id") Integer shopId) {


+ 1
- 0
service-inventory/src/main/java/com/neusoft/smart/pos/inventory/controller/SupplierController.java Bestand weergeven

@@ -35,6 +35,7 @@ public class SupplierController {
return new ResponseData<>(supplierService.getList(request));
}
@ApiOperation(value = "供应商查询接口")
@GetMapping("/{id}")
public ResponseData<SupplierResponse> detail(@PathVariable Integer id) {


+ 0
- 2
service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardCapitalChangeController.java Bestand weergeven

@@ -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;


+ 1
- 0
service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardController.java Bestand weergeven

@@ -98,6 +98,7 @@ public class CardController {
return new ResponseData<>();
}

@Transactional
@ApiOperation(value = "deactivate card")
@PostMapping("/card/deactivate")


+ 1
- 0
service-member/src/main/java/com/neusoft/smart/pos/card/controller/CardTradeController.java Bestand weergeven

@@ -80,6 +80,7 @@ public class CardTradeController {
return new ResponseData<>(afterBalance);
}

@Transactional
@PostMapping("/transfer/{snCode}")
@ApiOperation(value = "转账接口", notes = "转账接口")


+ 27
- 0
service-member/src/main/java/com/neusoft/smart/pos/mq/MemberAliyunRocketMQReceiver.java Bestand weergeven

@@ -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);
}
}

}

+ 22
- 0
service-member/src/main/java/com/neusoft/smart/pos/mq/MemberRabbitMQReceiver.java Bestand weergeven

@@ -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);
}

}

service-member/src/main/java/com/neusoft/smart/pos/card/utils/RabbitMQReceiver.java → service-member/src/main/java/com/neusoft/smart/pos/mq/helper/MemberMQReceiverHelper.java Bestand weergeven

@@ -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<GetAllOrderInfoResponse.PayInfo> payInfos = info.getPayInfos();
@@ -84,6 +99,8 @@ public class RabbitMQReceiver {
}
}
}

public void doRecharge(RechargeRequest rechargeRequest, String sn, Integer orgId, Integer shopId) {
logger.info("doRecharge");

+ 1
- 0
service-org/src/main/java/com/neusoft/smart/pos/org/controller/TableGroupsController.java Bestand weergeven

@@ -36,6 +36,7 @@ public class TableGroupsController {
return new ResponseData();
}

@GetMapping("/{id}")
public ResponseData<TableGroups> selectById(@PathVariable("id") Integer id) {
return new ResponseData<>(tableGroupsMapper.selectById(id));


+ 1
- 0
service-org/src/main/java/com/neusoft/smart/pos/org/controller/TablesController.java Bestand weergeven

@@ -47,6 +47,7 @@ public class TablesController {
return new ResponseData();
}
@GetMapping("/{id}")
public ResponseData<TablesResponse> selectById(@PathVariable("id") Integer id) {
return new ResponseData<>(tableService.selectById(id));


+ 1
- 0
service-org/src/main/java/com/neusoft/smart/pos/org/persistent/domain/OrgExample.java Bestand weergeven

@@ -17,6 +17,7 @@ public class OrgExample {
public OrgExample() {
oredCriteria = new ArrayList<Criteria>();
}

public String getOrderByClause() {
return orderByClause;


+ 1
- 0
service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradePackageController.java Bestand weergeven

@@ -43,6 +43,7 @@ public class UpgradePackageController {
return new ResponseData<>();
}
@ApiOperation(value = "分页查询更新包接口", notes = "分页查询更新包接口")
@PostMapping("/upgradePackages")
public ResponseData<PaginationExtendBean<UpgradePackageResponse>> list(@RequestBody UpgradePackageQueryRequest upgradePackageQueryRequest) {


+ 1
- 0
service-ota/src/main/java/com/neusoft/smart/pos/ota/controller/UpgradeStrategyController.java Bestand weergeven

@@ -45,6 +45,7 @@ public class UpgradeStrategyController {
return new ResponseData<>();
}
@ApiOperation(value = "分页查询升级策略接口", notes = "分页查询升级策略接口")
@PostMapping("/upgradeStrategies")
public ResponseData<PaginationExtendBean<UpgradeStrategyGroupResponse>> groupList(@RequestBody UpgradeStrategyQueryRequest upgradeStrategyQueryRequest) {


+ 1
- 0
service-promotion/src/main/java/com/neusoft/smart/pos/promotion/persistent/repository/PromotionPayChannelRepository.java Bestand weergeven

@@ -27,6 +27,7 @@ public class PromotionPayChannelRepository {
promotionPayChannelMapper.insertSelective(promotionPayChannel);
}
/**
*
* @param promotionPayChannel


+ 1
- 0
service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/ManualPromotionCalculate.java Bestand weergeven

@@ -25,4 +25,5 @@ public class ManualPromotionCalculate implements IPromotionCalculate {
}
return calculateBean;
}
}

+ 1
- 0
service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/MemberPromotionCalculate.java Bestand weergeven

@@ -32,4 +32,5 @@ public class MemberPromotionCalculate implements IPromotionCalculate {
}
return calculateBean;
}
}

+ 1
- 0
service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PaymentPromotionCalculate.java Bestand weergeven

@@ -66,4 +66,5 @@ public class PaymentPromotionCalculate implements IPromotionCalculate {
}
return calculateBean;
}
}

+ 1
- 0
service-promotion/src/main/java/com/neusoft/smart/pos/promotion/service/PromotionService.java Bestand weergeven

@@ -183,6 +183,7 @@ public class PromotionService {
return getPreferentialPriceResponse;
}
// /**
// * 临时计算一下合计
// *


+ 33
- 0
service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeAliyunRocketMQReceiver.java Bestand weergeven

@@ -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);
}
}

}

+ 34
- 0
service-trade/src/main/java/com/neusoft/smart/pos/mq/TradeRabbitMQReceiver.java Bestand weergeven

@@ -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);
}
}

service-trade/src/main/java/com/neusoft/smart/pos/order/utils/OrderRabbitMQReceiver.java → service-trade/src/main/java/com/neusoft/smart/pos/mq/order/OrderMQReceiverHelper.java Bestand weergeven

@@ -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<NeusoftMemberRechargeRequest> transInfoList = getOssAccountInfo(objectName);
public void doMessage(String objectName) {
logger.info("消息接收者接收到来自【login队列一】的消息,消息内容:{}", objectName);
List<NeusoftMemberRechargeRequest> transInfoList = getOssAccountInfo(objectName);
for(val transInfo:transInfoList){
checkAccount(transInfo.getTransNo(), transInfo.getMemberCardNo(), transInfo.getAmount(), transInfo.getTime());
}

service-trade/src/main/java/com/neusoft/smart/pos/payment/utils/RabbitMQReceiver.java → service-trade/src/main/java/com/neusoft/smart/pos/mq/payment/PaymentMQReceiverHelper.java Bestand weergeven

@@ -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);
}
}

+ 1
- 1
service-trade/src/main/java/com/neusoft/smart/pos/order/service/OrderService.java Bestand weergeven

@@ -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;


+ 2
- 1
service-user/src/main/java/com/neusoft/smart/pos/user/controller/LoginController.java Bestand weergeven

@@ -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;


Laden…
Annuleren
Opslaan