| Аутор | SHA1 | Порука | Датум |
|---|---|---|---|
|
|
a490b64e8c | fix bug | пре 4 година |
|
|
34fa54fd25 | fix bug | пре 4 година |
|
|
49d33540df | fix bug | пре 4 година |
|
|
9a3e3b77aa | fix bug | пре 4 година |
|
|
5c4ae76b98 | fix bug | пре 4 година |
|
|
735e933737 | fix bug | пре 4 година |
|
|
b490e477f6 | fix bug | пре 4 година |
|
|
439bc79ec5 | add log | пре 4 година |
|
|
03a5e5544b | fix bug | пре 4 година |
|
|
7bb0d8bfdf | fix bug | пре 4 година |
|
|
02031ee0f4 | fix debug | пре 4 година |
|
|
f73082c856 | add log | пре 4 година |
|
|
1690a71615 | fix log level | пре 4 година |
|
|
faee574fcc | fix config | пре 4 година |
|
|
6fe325c86d | fix config | пре 4 година |
|
|
fd2921a255 | fix config | пре 4 година |
|
|
93e747a912 | fix config | пре 4 година |
|
|
d170421365 | fix config | пре 4 година |
|
|
4b2ff3373b | add test | пре 4 година |
|
|
dae279e8a2 | fix org config | пре 4 година |
|
|
0d3e675603 | fix bug | пре 4 година |
|
|
abb66b08f8 | fix bug | пре 4 година |
|
|
dac06ade4b | fix log | пре 4 година |
|
|
e9fa9334fb | add log | пре 4 година |
|
|
714345354c | add version | пре 4 година |
|
|
ec66d1df21 | fix pos | пре 4 година |
|
|
6d3203d91d | fix pos | пре 4 година |
|
|
f328a05020 | fix pos | пре 4 година |
|
|
f5965744f3 | fix pos | пре 4 година |
|
|
edb36afe9a | fix dev config | пре 4 година |
|
|
e9cc095804 | fix pos | пре 4 година |
|
|
be3a0197d8 | fix aliyunrocketmq | пре 4 година |
|
|
e7a8df91bc | fix bug | пре 4 година |
|
|
d03ce15784 | fix env | пре 4 година |
| @@ -20,6 +20,16 @@ | |||
| <artifactId>framework</artifactId> | |||
| <version>1.0-SNAPSHOT</version> | |||
| </dependency> | |||
| <dependency> | |||
| <groupId>net.sf.dozer</groupId> | |||
| <artifactId>dozer</artifactId> | |||
| <version>5.5.1</version> | |||
| </dependency> | |||
| <dependency> | |||
| <groupId>com.aliyun.openservices</groupId> | |||
| <artifactId>ons-client</artifactId> | |||
| <version>1.8.4.Final</version> | |||
| </dependency> | |||
| <!-- MySql数据库驱动 --> | |||
| <dependency> | |||
| <groupId>mysql</groupId> | |||
| @@ -24,10 +24,14 @@ public class GetOrderPayStatusResponse { | |||
| @ApiModelProperty(name = "paidTime", value = "支付完成时间", dataType = "String" ,example="2018-07-09 09:40:53") | |||
| public String paidTime = DateUtils.format(new Date(),DateUtils.FORMAT_LONG); | |||
| @ApiModelProperty(name = "mOrderNumber", value = "mOrderNumber", dataType = "String" ,example="132509533344") | |||
| public String mOrderNumber; | |||
| public GetOrderPayStatusResponse(String payStatus,String payType) { | |||
| public GetOrderPayStatusResponse(String payStatus,String payType,String mOrderNumber) { | |||
| this.payStatus = payStatus; | |||
| this.payType = payType; | |||
| this.mOrderNumber = mOrderNumber; | |||
| } | |||
| public GetOrderPayStatusResponse() { | |||
| @@ -0,0 +1,8 @@ | |||
| package com.neusoft.smart.pos.mq; | |||
| public class MQConfig { | |||
| public static class Impl { | |||
| public static final String RABBIT_MQ = "rabbitmq"; | |||
| public static final String ALIYUN_ROCKET_MQ = "aliyunRocketmq"; | |||
| } | |||
| } | |||
| @@ -0,0 +1,11 @@ | |||
| package com.neusoft.smart.pos.mq; | |||
| import java.io.Serializable; | |||
| public interface MqProducer { | |||
| public void sendMessage(String exchange, String routingKey, Serializable object); | |||
| public void sendMessage(String exchange, String routingKey, String msg); | |||
| } | |||
| @@ -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); | |||
| } | |||
| @@ -0,0 +1,132 @@ | |||
| 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; | |||
| /** | |||
| * @Auther: zfy 阿里云rocketmq | |||
| * @Date: 2019-01-31 | |||
| * @Description: RocketMQ消息生产者 | |||
| */ | |||
| @Service | |||
| @Profile(MQConfig.Impl.ALIYUN_ROCKET_MQ) | |||
| public class AliyunRocketMqMessageProducer implements MqProducer { | |||
| private final Logger log = LoggerFactory.getLogger(this.getClass()); | |||
| @Value("${spring.aliyunRocketmq.accessKeyId}") | |||
| private String accessKeyId; | |||
| @Value("${spring.aliyunRocketmq.accessKeySecret}") | |||
| private String accessKeySecret; | |||
| @Value("${spring.aliyunRocketmq.namesrvAddr}") | |||
| private String namesrvAddr; | |||
| //@Autowired | |||
| //private WxMsgRecordMapper wxMsgRecordMapper; | |||
| //@Autowired | |||
| //private WxMsgRecordService wxMsgRecordService; | |||
| private static Map<String,Producer> producerMap = null; | |||
| @PostConstruct | |||
| public void init() { | |||
| producerMap = new HashMap<String,Producer>(); | |||
| for (EnumMsgTopic topic: EnumMsgTopic.values()) { | |||
| Properties properties = new Properties(); | |||
| properties.setProperty(PropertyKeyConst.GROUP_ID, topic.getGroupId()); | |||
| // AccessKey 阿里云身份验证,在阿里云服务器管理控制台创建 | |||
| properties.put(PropertyKeyConst.AccessKey,accessKeyId); | |||
| // SecretKey 阿里云身份验证,在阿里云服务器管理控制台创建 | |||
| properties.put(PropertyKeyConst.SecretKey, accessKeySecret); | |||
| //设置发送超时时间,单位毫秒 | |||
| properties.setProperty(PropertyKeyConst.SendMsgTimeoutMillis, "3000"); | |||
| // 设置 TCP 接入域名,到控制台的实例基本信息中查看 | |||
| properties.put(PropertyKeyConst.NAMESRV_ADDR,namesrvAddr); | |||
| Producer producer = ONSFactory.createProducer(properties); | |||
| // 在发送消息前,必须调用 start 方法来启动 Producer,只需调用一次即可 | |||
| producer.start(); | |||
| log.info("aliyunrocketmq producer info :"+JSON.toJSONString(producer)); | |||
| producerMap.put(topic.getTopic(), producer); | |||
| } | |||
| } | |||
| @Override | |||
| 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."); | |||
| return; | |||
| } | |||
| if (producer.isClosed()) { | |||
| producer.start(); | |||
| } | |||
| 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) { | |||
| 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); | |||
| } | |||
| } | |||
| } | |||
| // 在应用退出前,销毁 Producer 对象 | |||
| // 注意:如果不销毁也没有问题 | |||
| //producer.shutdown(); | |||
| } | |||
| } | |||
| @@ -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; | |||
| } | |||
| } | |||
| @@ -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; | |||
| } | |||
| } | |||
| @@ -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(); | |||
| @@ -0,0 +1,128 @@ | |||
| package com.neusoft.smart.pos.mq.util; | |||
| import com.fasterxml.jackson.annotation.JsonInclude; | |||
| import com.fasterxml.jackson.core.JsonGenerator; | |||
| import com.fasterxml.jackson.core.JsonParser; | |||
| import com.fasterxml.jackson.core.JsonProcessingException; | |||
| import com.fasterxml.jackson.databind.DeserializationFeature; | |||
| import com.fasterxml.jackson.databind.JsonSerializer; | |||
| import com.fasterxml.jackson.databind.ObjectMapper; | |||
| import com.fasterxml.jackson.databind.SerializerProvider; | |||
| import com.fasterxml.jackson.databind.module.SimpleModule; | |||
| import org.slf4j.Logger; | |||
| import org.slf4j.LoggerFactory; | |||
| import java.io.IOException; | |||
| import java.text.SimpleDateFormat; | |||
| import java.util.HashMap; | |||
| import java.util.Iterator; | |||
| import java.util.Map; | |||
| public final class JsonUtil { | |||
| private static Logger log = LoggerFactory.getLogger(JsonUtil.class); | |||
| public static final ObjectMapper mapper = new ObjectMapper(); | |||
| private JsonUtil() { | |||
| } | |||
| public static String obj2Json(Object obj) { | |||
| if(obj != null) { | |||
| try { | |||
| return mapper.writeValueAsString(obj); | |||
| } catch (JsonProcessingException var2) { | |||
| throw new RuntimeException(var2); | |||
| } | |||
| } else { | |||
| return null; | |||
| } | |||
| } | |||
| public static byte[] obj2Byte(Object obj) { | |||
| if(obj != null) { | |||
| try { | |||
| return mapper.writeValueAsBytes(obj); | |||
| } catch (JsonProcessingException var2) { | |||
| var2.printStackTrace(); | |||
| } | |||
| } | |||
| return new byte[0]; | |||
| } | |||
| public static Object readValue(String json, Class<?> clazz) { | |||
| Object t = null; | |||
| try { | |||
| return mapper.readValue(json, clazz); | |||
| } catch (Exception var4) { | |||
| log.info("解析对象:{}", json); | |||
| log.error("json解析错误:{}", var4.getMessage(), var4); | |||
| return t; | |||
| } | |||
| } | |||
| // public static <T> T readValue(String json, TypeReference type) { | |||
| // Object object = null; | |||
| // | |||
| // try { | |||
| // object = mapper.readValue(json, type); | |||
| // } catch (Exception var4) { | |||
| // log.info("解析对象:{}", json); | |||
| // log.error("json解析错误:{}", var4.getMessage(), var4); | |||
| // } | |||
| // | |||
| // return object; | |||
| // } | |||
| // | |||
| // public static <T> T readValue(byte[] json, TypeReference type) { | |||
| // Object object = null; | |||
| // | |||
| // try { | |||
| // object = mapper.readValue(json, type); | |||
| // } catch (Exception var4) { | |||
| // log.info("解析对象:{}", json); | |||
| // log.error("json解析错误:{}", var4.getMessage(), var4); | |||
| // } | |||
| // | |||
| // return object; | |||
| // } | |||
| // | |||
| // public static Map<String, Object> readValueAsMap(String json) { | |||
| // return (Map)readValue(json, new TypeReference<HashMap<String, Object>>() { | |||
| // }); | |||
| // } | |||
| static { | |||
| mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); | |||
| mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, true); | |||
| mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true); | |||
| mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); | |||
| mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); | |||
| SimpleModule module = new SimpleModule(); | |||
| module.addSerializer(HashMap.class, new JsonUtil.HashMapSerializer()); | |||
| mapper.registerModule(module); | |||
| } | |||
| public static class HashMapSerializer extends JsonSerializer<HashMap> { | |||
| public HashMapSerializer() { | |||
| } | |||
| public void serialize(HashMap value, JsonGenerator jgen, SerializerProvider provider) throws IOException { | |||
| jgen.writeStartObject(); | |||
| Iterator var4 = value.entrySet().iterator(); | |||
| while(var4.hasNext()) { | |||
| Object entry = var4.next(); | |||
| if(entry instanceof Map.Entry) { | |||
| Map.Entry en = (Map.Entry)entry; | |||
| if(en.getValue() != null && en.getKey() != null) { | |||
| jgen.writeObjectField(en.getKey().toString(), en.getValue()); | |||
| } | |||
| } | |||
| } | |||
| jgen.writeEndObject(); | |||
| } | |||
| } | |||
| } | |||
| @@ -0,0 +1,16 @@ | |||
| package com.neusoft.smart.pos.config; | |||
| import org.springframework.web.bind.annotation.GetMapping; | |||
| import org.springframework.web.bind.annotation.RequestMapping; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @RestController | |||
| @RequestMapping("/test") | |||
| public class TestVersionController { | |||
| @GetMapping("/version") | |||
| public String version() { | |||
| return "{\"result\":\"1\"}"; | |||
| } | |||
| } | |||
| @@ -11,6 +11,6 @@ spring: | |||
| server: | |||
| port: 1001 | |||
| logging: | |||
| level: | |||
| root: info | |||
| #logging: | |||
| # level: | |||
| # root: info | |||
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <configuration scan="true" scanPeriod="10 seconds"> | |||
| <!-- 外部指定路径 --> | |||
| <springProperty scop="context" name="logPath" source="logging.path" /> | |||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | |||
| <encoder> | |||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||
| </encoder> | |||
| </appender> | |||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/trace.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| </appender> | |||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/info.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>INFO</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/debug.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>DEBUG</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/warn.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>WARN</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/error.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>ERROR</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <root level="TRACE"> | |||
| <appender-ref ref="TRACE_FILE" /> | |||
| <appender-ref ref="INFO_FILE" /> | |||
| <!-- <appender-ref ref="DEBUG_FILE" /> --> | |||
| <!-- <appender-ref ref="WARN_FILE" /> --> | |||
| <appender-ref ref="ERROR_FILE" /> | |||
| </root> | |||
| <root level="INFO"> | |||
| <appender-ref ref="STDOUT" /> | |||
| </root> | |||
| </configuration> | |||
| @@ -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 | |||
| @@ -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: \ | |||
| @@ -9,15 +9,17 @@ mybatis: | |||
| mapper-locations: classpath:mybatis/mapping/*.xml | |||
| type-aliases-package: com.neusoft.smart.pos.persistent.domain | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| redis: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -40,10 +42,14 @@ spring: | |||
| multipart: | |||
| location: / | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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 | |||
| @@ -221,20 +227,22 @@ smart: | |||
| 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 | |||
| accessId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKey: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| host: https://formall.oss-accelerate.aliyuncs.com | |||
| bucketName: formall | |||
| 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 | |||
| host: https://formall.oss-accelerate.aliyuncs.com/ | |||
| ota: https://formall.oss-accelerate.aliyuncs.com/otadev/ | |||
| media: https://formall.oss-accelerate.aliyuncs.com/media/ | |||
| config: https://formall.oss-accelerate.aliyuncs.com/config/ | |||
| codeLib: https://formall.oss-accelerate.aliyuncs.com/codeLib/ | |||
| img: https://formall.oss-accelerate.aliyuncs.com/img/ | |||
| qrCode: https://formall.oss-accelerate.aliyuncs.com/qrCode/ | |||
| storeLogo: https://formall.oss-accelerate.aliyuncs.com/logo/ | |||
| apk: https://formall.oss-accelerate.aliyuncs.com/apk | |||
| upload: | |||
| path: /tmp | |||
| relativePath: /tmp | |||
| relativePath: /tmp | |||
| fmapi: | |||
| url: https://ptest.malls.iformall.com | |||
| @@ -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 | |||
| @@ -209,20 +215,22 @@ smart: | |||
| 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 | |||
| accessId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKey: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| host: https://formall.oss-accelerate.aliyuncs.com | |||
| bucketName: formall | |||
| 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 | |||
| host: https://formall.oss-accelerate.aliyuncs.com/ | |||
| ota: https://formall.oss-accelerate.aliyuncs.com/otadev/ | |||
| media: https://formall.oss-accelerate.aliyuncs.com/media/ | |||
| config: https://formall.oss-accelerate.aliyuncs.com/config/ | |||
| codeLib: https://formall.oss-accelerate.aliyuncs.com/codeLib/ | |||
| img: https://formall.oss-accelerate.aliyuncs.com/img/ | |||
| qrCode: https://formall.oss-accelerate.aliyuncs.com/qrCode/ | |||
| storeLogo: https://formall.oss-accelerate.aliyuncs.com/logo/ | |||
| apk: https://formall.oss-accelerate.aliyuncs.com/apk | |||
| upload: | |||
| path: /tmp | |||
| relativePath: /tmp | |||
| relativePath: /tmp | |||
| fmapi: | |||
| url: https://pos.malls.iformall.com | |||
| @@ -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: \ | |||
| @@ -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 | |||
| @@ -16,12 +16,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -49,11 +51,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -74,10 +76,14 @@ spring: | |||
| charset: UTF-8 | |||
| enabled: true | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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 | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -14,12 +14,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +49,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -72,10 +74,14 @@ spring: | |||
| charset: UTF-8 | |||
| enabled: true | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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 | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -17,9 +17,9 @@ 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +47,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -70,7 +70,7 @@ spring: | |||
| http: | |||
| encoding: | |||
| charset: UTF-8 | |||
| enabled: true | |||
| enabled: true | |||
| server: | |||
| tomcat: | |||
| uri-encoding: UTF-8 | |||
| @@ -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 | |||
| @@ -20,12 +20,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -53,11 +55,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -71,10 +73,14 @@ spring: | |||
| upload: | |||
| path: /tmp | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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: | |||
| @@ -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: | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -17,12 +17,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -50,11 +52,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -75,10 +77,14 @@ spring: | |||
| charset: UTF-8 | |||
| enabled: true | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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 | |||
| @@ -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 | |||
| @@ -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#/ | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -13,12 +13,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -46,11 +48,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -62,10 +64,14 @@ spring: | |||
| #连接超时时间 | |||
| timeout: 0 | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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= | |||
| @@ -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= | |||
| @@ -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= | |||
| @@ -14,12 +14,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +49,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -72,10 +74,14 @@ spring: | |||
| charset: UTF-8 | |||
| enabled: true | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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 | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -14,12 +14,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +49,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -66,10 +68,14 @@ spring: | |||
| date-format: yyyy-MM-dd HH:mm:ss | |||
| time-zone: GMT+8 | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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 | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -17,9 +17,9 @@ 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +47,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: localhost | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -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 | |||
| @@ -14,12 +14,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +49,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -73,10 +75,14 @@ spring: | |||
| enabled: true | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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 | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -14,12 +14,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +49,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -68,10 +70,14 @@ spring: | |||
| date-format: yyyy-MM-dd HH:mm:ss | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| port: 5672 | |||
| aliyunRocketmq: | |||
| accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 | |||
| smart: | |||
| pos: | |||
| ssl: | |||
| @@ -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: | |||
| @@ -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 | |||
| @@ -13,16 +13,18 @@ mybatis: | |||
| logging: | |||
| level: | |||
| root: info | |||
| root: trace | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -50,11 +52,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: localhost | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -76,28 +78,34 @@ spring: | |||
| location: / | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| port: 5672 | |||
| aliyunRocketmq: | |||
| accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 | |||
| 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 | |||
| endpoint: oss-cn-beijing.aliyuncs.com | |||
| accessId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKey: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| host: https://formall.oss-accelerate.aliyuncs.com | |||
| bucketName: formall | |||
| url: | |||
| host: https://formall.oss-accelerate.aliyuncs.com/ | |||
| ota: https://formall.oss-accelerate.aliyuncs.com/otadev/ | |||
| media: https://formall.oss-accelerate.aliyuncs.com/media/ | |||
| config: https://formall.oss-accelerate.aliyuncs.com/config/ | |||
| codeLib: https://formall.oss-accelerate.aliyuncs.com/codeLib/ | |||
| img: https://formall.oss-accelerate.aliyuncs.com/img/ | |||
| qrCode: https://formall.oss-accelerate.aliyuncs.com/qrCode/ | |||
| storeLogo: https://formall.oss-accelerate.aliyuncs.com/logo/ | |||
| apk: https://formall.oss-accelerate.aliyuncs.com/apk | |||
| fmapi: | |||
| url: https://ptest.malls.iformall.com | |||
| @@ -14,6 +14,8 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| datasource: | |||
| type: com.alibaba.druid.pool.DruidDataSource | |||
| driverClassName: com.mysql.jdbc.Driver | |||
| @@ -76,24 +78,30 @@ 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: | |||
| #微信点餐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 | |||
| endpoint: oss-cn-beijing.aliyuncs.com | |||
| accessId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKey: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| host: https://formall.oss-accelerate.aliyuncs.com | |||
| bucketName: formall | |||
| url: | |||
| host: https://formall.oss-accelerate.aliyuncs.com/ | |||
| ota: https://formall.oss-accelerate.aliyuncs.com/otadev/ | |||
| media: https://formall.oss-accelerate.aliyuncs.com/media/ | |||
| config: https://formall.oss-accelerate.aliyuncs.com/config/ | |||
| codeLib: https://formall.oss-accelerate.aliyuncs.com/codeLib/ | |||
| img: https://formall.oss-accelerate.aliyuncs.com/img/ | |||
| qrCode: https://formall.oss-accelerate.aliyuncs.com/qrCode/ | |||
| storeLogo: https://formall.oss-accelerate.aliyuncs.com/logo/ | |||
| apk: https://formall.oss-accelerate.aliyuncs.com/apk | |||
| fmapi: | |||
| url: https://pos.malls.iformall.com | |||
| @@ -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 | |||
| @@ -9,16 +9,18 @@ mybatis: | |||
| logging: | |||
| level: | |||
| root: info | |||
| root: trace | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -46,11 +48,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -63,10 +65,14 @@ spring: | |||
| timeout: 0 | |||
| rabbitmq: | |||
| host: localhost | |||
| username: fmpos | |||
| password: fmpos@server123 | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| 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: | |||
| @@ -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: | |||
| @@ -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: | |||
| - /** | |||
| @@ -14,12 +14,14 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| 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 | |||
| url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false | |||
| username: root | |||
| password: fm2020test | |||
| #初始化大小,最小,最大 | |||
| initialSize: 5 | |||
| minIdle: 5 | |||
| @@ -47,11 +49,11 @@ spring: | |||
| #数据库索引 | |||
| database: 0 | |||
| #主机地址 | |||
| host: 127.0.0.1 | |||
| host: 101.200.130.134 | |||
| #主机端口 | |||
| port: 6379 | |||
| #密码 | |||
| password: | |||
| password: iF0rm@2l2ol9 | |||
| #最大连接数,为负表示不限制 | |||
| maxTotal: 8 | |||
| #最大阻塞等待时间,为负表示不限制 | |||
| @@ -62,6 +64,15 @@ spring: | |||
| minIdle: 0 | |||
| #连接超时时间 | |||
| timeout: 0 | |||
| rabbitmq: | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| port: 5672 | |||
| aliyunRocketmq: | |||
| accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 | |||
| wechat: | |||
| open: | |||
| componentAppId: wxe68326867a19a32b | |||
| @@ -14,6 +14,8 @@ logging: | |||
| #DataSource配置,默认主数据源 | |||
| spring: | |||
| profiles: | |||
| include: rabbitmq | |||
| datasource: | |||
| type: com.alibaba.druid.pool.DruidDataSource | |||
| driverClassName: com.mysql.jdbc.Driver | |||
| @@ -62,6 +64,15 @@ spring: | |||
| minIdle: 0 | |||
| #连接超时时间 | |||
| timeout: 0 | |||
| rabbitmq: | |||
| host: 172.17.173.169 | |||
| username: fumao | |||
| password: f9l98 | |||
| port: 5672 | |||
| aliyunRocketmq: | |||
| accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V | |||
| accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry | |||
| namesrvAddr: http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080 | |||
| wechat: | |||
| open: | |||
| componentAppId: wxe68326867a19a32b | |||
| @@ -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: | |||
| @@ -1,10 +1,10 @@ | |||
| version: "3" | |||
| services: | |||
| redis: | |||
| image: redis:alpine | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| # redis: | |||
| # image: redis:alpine | |||
| # restart: always | |||
| # networks: | |||
| # - backend | |||
| config: | |||
| build: | |||
| context: ./config-server | |||
| @@ -51,7 +51,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -65,7 +65,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -79,7 +79,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -93,7 +93,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -103,11 +103,11 @@ services: | |||
| args: | |||
| JAR_FILE: target/service-member-1.0-SNAPSHOT.jar | |||
| expose: | |||
| - "2009" | |||
| - "2010" | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -117,11 +117,11 @@ services: | |||
| args: | |||
| JAR_FILE: target/service-inventory-1.0-SNAPSHOT.jar | |||
| expose: | |||
| - "2207" | |||
| - "2208" | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -135,7 +135,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -149,7 +149,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -163,7 +163,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -177,7 +177,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -191,7 +191,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -205,7 +205,7 @@ services: | |||
| depends_on: | |||
| - config | |||
| - eureka | |||
| - redis | |||
| # - redis | |||
| restart: always | |||
| networks: | |||
| - backend | |||
| @@ -1,6 +1,8 @@ | |||
| FROM openjdk:8-jdk-alpine | |||
| VOLUME /tmp | |||
| ARG PROFILE_ENV | |||
| ENV profile_env=$PROFILE_ENV | |||
| ARG JAR_FILE | |||
| ADD ${JAR_FILE} app.jar | |||
| RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=prod","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| @@ -0,0 +1,16 @@ | |||
| package com.neusoft.smart.pos.eureka; | |||
| import org.springframework.web.bind.annotation.GetMapping; | |||
| import org.springframework.web.bind.annotation.RequestMapping; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @RestController | |||
| @RequestMapping("/test") | |||
| public class TestVersionController { | |||
| @GetMapping("/version") | |||
| public String version() { | |||
| return "{\"result\":\"1\"}"; | |||
| } | |||
| } | |||
| @@ -3,7 +3,9 @@ spring: | |||
| name: eureka-server | |||
| cloud: | |||
| config: | |||
| uri: http://config:1001/ | |||
| #docker config | |||
| #uri: http://config:1001/ | |||
| uri: http://localhost:1001/ | |||
| profile: dev | |||
| name: eureka-server | |||
| server: | |||
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <configuration scan="true" scanPeriod="10 seconds"> | |||
| <!-- 外部指定路径 --> | |||
| <springProperty scop="context" name="logPath" source="logging.path" /> | |||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | |||
| <encoder> | |||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||
| </encoder> | |||
| </appender> | |||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/trace.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| </appender> | |||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/info.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>INFO</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/debug.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>DEBUG</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/warn.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>WARN</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/error.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>ERROR</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <root level="TRACE"> | |||
| <appender-ref ref="TRACE_FILE" /> | |||
| <appender-ref ref="INFO_FILE" /> | |||
| <!-- <appender-ref ref="DEBUG_FILE" /> --> | |||
| <!-- <appender-ref ref="WARN_FILE" /> --> | |||
| <appender-ref ref="ERROR_FILE" /> | |||
| </root> | |||
| <root level="INFO"> | |||
| <appender-ref ref="STDOUT" /> | |||
| </root> | |||
| </configuration> | |||
| @@ -1,6 +1,8 @@ | |||
| FROM openjdk:8-jdk-alpine | |||
| VOLUME /tmp | |||
| ARG PROFILE_ENV | |||
| ENV profile_env=$PROFILE_ENV | |||
| ARG JAR_FILE | |||
| ADD ${JAR_FILE} app.jar | |||
| RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=prod","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| @@ -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; | |||
| @@ -0,0 +1,17 @@ | |||
| package com.neusoft.smart.pos.gateway.controller; | |||
| import com.neusoft.smart.pos.framework.dto.ResponseData; | |||
| import org.springframework.web.bind.annotation.GetMapping; | |||
| import org.springframework.web.bind.annotation.RequestMapping; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @RestController | |||
| @RequestMapping("/test") | |||
| public class TestVersionController { | |||
| @GetMapping("/version") | |||
| public ResponseData<String> version() { | |||
| return new ResponseData<>("1"); | |||
| } | |||
| } | |||
| @@ -3,7 +3,9 @@ spring: | |||
| name: gateway | |||
| cloud: | |||
| config: | |||
| uri: http://config:1001/ | |||
| #docker config | |||
| #uri: http://config:1001/ | |||
| uri: http://localhost:1001/ | |||
| profile: dev | |||
| name: gateway | |||
| server: | |||
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <configuration scan="true" scanPeriod="10 seconds"> | |||
| <!-- 外部指定路径 --> | |||
| <springProperty scop="context" name="logPath" source="logging.path" /> | |||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | |||
| <encoder> | |||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||
| </encoder> | |||
| </appender> | |||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/trace.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| </appender> | |||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/info.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>INFO</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/debug.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>DEBUG</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/warn.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>WARN</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/error.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>ERROR</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <root level="TRACE"> | |||
| <appender-ref ref="TRACE_FILE" /> | |||
| <appender-ref ref="INFO_FILE" /> | |||
| <!-- <appender-ref ref="DEBUG_FILE" /> --> | |||
| <!-- <appender-ref ref="WARN_FILE" /> --> | |||
| <appender-ref ref="ERROR_FILE" /> | |||
| </root> | |||
| <root level="INFO"> | |||
| <appender-ref ref="STDOUT" /> | |||
| </root> | |||
| </configuration> | |||
| @@ -1,6 +1,8 @@ | |||
| FROM openjdk:8-jdk-alpine | |||
| VOLUME /tmp | |||
| ARG PROFILE_ENV | |||
| ENV profile_env=$PROFILE_ENV | |||
| ARG JAR_FILE | |||
| ADD ${JAR_FILE} app.jar | |||
| RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=prod","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| @@ -0,0 +1,17 @@ | |||
| package com.neusoft.smart.pos.advertisement.controller; | |||
| import com.neusoft.smart.pos.framework.dto.ResponseData; | |||
| import org.springframework.web.bind.annotation.GetMapping; | |||
| import org.springframework.web.bind.annotation.RequestMapping; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @RestController | |||
| @RequestMapping("/test") | |||
| public class TestVersionController { | |||
| @GetMapping("/version") | |||
| public ResponseData<String> version() { | |||
| return new ResponseData<>("1"); | |||
| } | |||
| } | |||
| @@ -3,7 +3,9 @@ spring: | |||
| name: service-advertisement | |||
| cloud: | |||
| config: | |||
| uri: http://config:1001/ | |||
| #docker config | |||
| #uri: http://config:1001/ | |||
| uri: http://localhost:1001/ | |||
| profile: dev | |||
| name: service-advertisement | |||
| server: | |||
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <configuration scan="true" scanPeriod="10 seconds"> | |||
| <!-- 外部指定路径 --> | |||
| <springProperty scop="context" name="logPath" source="logging.path" /> | |||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | |||
| <encoder> | |||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||
| </encoder> | |||
| </appender> | |||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/trace.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| </appender> | |||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/info.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>INFO</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/debug.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>DEBUG</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/warn.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>WARN</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/error.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>ERROR</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <root level="TRACE"> | |||
| <appender-ref ref="TRACE_FILE" /> | |||
| <appender-ref ref="INFO_FILE" /> | |||
| <!-- <appender-ref ref="DEBUG_FILE" /> --> | |||
| <!-- <appender-ref ref="WARN_FILE" /> --> | |||
| <appender-ref ref="ERROR_FILE" /> | |||
| </root> | |||
| <root level="INFO"> | |||
| <appender-ref ref="STDOUT" /> | |||
| </root> | |||
| </configuration> | |||
| @@ -1,6 +1,8 @@ | |||
| FROM openjdk:8-jdk-alpine | |||
| VOLUME /tmp | |||
| ARG PROFILE_ENV | |||
| ENV profile_env=$PROFILE_ENV | |||
| ARG JAR_FILE | |||
| ADD ${JAR_FILE} app.jar | |||
| RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=prod","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| @@ -0,0 +1,17 @@ | |||
| package com.neusoft.smart.pos.device.controller; | |||
| import com.neusoft.smart.pos.framework.dto.ResponseData; | |||
| import org.springframework.web.bind.annotation.GetMapping; | |||
| import org.springframework.web.bind.annotation.RequestMapping; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @RestController | |||
| @RequestMapping("/test") | |||
| public class TestVersionController { | |||
| @GetMapping("/version") | |||
| public ResponseData<String> version() { | |||
| return new ResponseData<>("1"); | |||
| } | |||
| } | |||
| @@ -3,7 +3,9 @@ spring: | |||
| name: service-device | |||
| cloud: | |||
| config: | |||
| uri: http://config:1001/ | |||
| #docker config | |||
| #uri: http://config:1001/ | |||
| uri: http://localhost:1001/ | |||
| profile: dev | |||
| name: service-device | |||
| server: | |||
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <configuration scan="true" scanPeriod="10 seconds"> | |||
| <!-- 外部指定路径 --> | |||
| <springProperty scop="context" name="logPath" source="logging.path" /> | |||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | |||
| <encoder> | |||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||
| </encoder> | |||
| </appender> | |||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/trace.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| </appender> | |||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/info.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>INFO</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/debug.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>DEBUG</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/warn.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>WARN</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/error.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>ERROR</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <root level="TRACE"> | |||
| <appender-ref ref="TRACE_FILE" /> | |||
| <appender-ref ref="INFO_FILE" /> | |||
| <!-- <appender-ref ref="DEBUG_FILE" /> --> | |||
| <!-- <appender-ref ref="WARN_FILE" /> --> | |||
| <appender-ref ref="ERROR_FILE" /> | |||
| </root> | |||
| <root level="INFO"> | |||
| <appender-ref ref="STDOUT" /> | |||
| </root> | |||
| </configuration> | |||
| @@ -0,0 +1,17 @@ | |||
| package com.neusoft.smart.pos.fumao.controller; | |||
| import com.neusoft.smart.pos.framework.dto.ResponseData; | |||
| import org.springframework.web.bind.annotation.GetMapping; | |||
| import org.springframework.web.bind.annotation.RequestMapping; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @RestController | |||
| @RequestMapping("/test") | |||
| public class TestVersionController { | |||
| @GetMapping("/version") | |||
| public ResponseData<String> version() { | |||
| return new ResponseData<>("1"); | |||
| } | |||
| } | |||
| @@ -3,7 +3,9 @@ spring: | |||
| name: service-fumao | |||
| cloud: | |||
| config: | |||
| uri: http://config:1001/ | |||
| #docker config | |||
| #uri: http://config:1001/ | |||
| uri: http://localhost:1001/ | |||
| profile: dev | |||
| name: service-fumao | |||
| server: | |||
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <configuration scan="true" scanPeriod="10 seconds"> | |||
| <!-- 外部指定路径 --> | |||
| <springProperty scop="context" name="logPath" source="logging.path" /> | |||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | |||
| <encoder> | |||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||
| </encoder> | |||
| </appender> | |||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/trace.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| </appender> | |||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/info.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>INFO</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/debug.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>DEBUG</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/warn.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>WARN</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/error.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>ERROR</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <root level="TRACE"> | |||
| <appender-ref ref="TRACE_FILE" /> | |||
| <appender-ref ref="INFO_FILE" /> | |||
| <!-- <appender-ref ref="DEBUG_FILE" /> --> | |||
| <!-- <appender-ref ref="WARN_FILE" /> --> | |||
| <appender-ref ref="ERROR_FILE" /> | |||
| </root> | |||
| <root level="INFO"> | |||
| <appender-ref ref="STDOUT" /> | |||
| </root> | |||
| </configuration> | |||
| @@ -1,6 +1,8 @@ | |||
| FROM openjdk:8-jdk-alpine | |||
| VOLUME /tmp | |||
| ARG PROFILE_ENV | |||
| ENV profile_env=$PROFILE_ENV | |||
| ARG JAR_FILE | |||
| ADD ${JAR_FILE} app.jar | |||
| RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=prod","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| @@ -28,6 +28,7 @@ public enum InventoryErrorCode implements CommonCode { | |||
| this.message = message; | |||
| } | |||
| public String getCode() { | |||
| return code; | |||
| } | |||
| @@ -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) { | |||
| @@ -38,6 +38,7 @@ public class InventoryCheckStockController { | |||
| return new ResponseData<>(checkStockService.getList(request)); | |||
| } | |||
| @ApiOperation(value = "库存盘点详情接口") | |||
| @GetMapping("/detail") | |||
| public ResponseData<InventoryCheckStockDetailResponse> detail(InventoryCheckStockDetailRequest request) { | |||
| @@ -40,6 +40,7 @@ public class InventoryGoodsCategoryController { | |||
| return new ResponseData<>(categoryService.selectCategories(request)); | |||
| } | |||
| @ApiOperation(value = "创建类别接口") | |||
| @PostMapping("") | |||
| public ResponseData<CategoryResponse> createCategory(@RequestBody CreateCategoryRequest request) { | |||
| @@ -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) { | |||
| @@ -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) { | |||
| @@ -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) { | |||
| @@ -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,0 +1,17 @@ | |||
| package com.neusoft.smart.pos.inventory.controller; | |||
| import com.neusoft.smart.pos.framework.dto.ResponseData; | |||
| import org.springframework.web.bind.annotation.GetMapping; | |||
| import org.springframework.web.bind.annotation.RequestMapping; | |||
| import org.springframework.web.bind.annotation.RestController; | |||
| @RestController | |||
| @RequestMapping("/test") | |||
| public class TestVersionController { | |||
| @GetMapping("/version") | |||
| public ResponseData<String> version() { | |||
| return new ResponseData<>("1"); | |||
| } | |||
| } | |||
| @@ -3,7 +3,9 @@ spring: | |||
| name: service-inventory | |||
| cloud: | |||
| config: | |||
| uri: http://config:1001/ | |||
| #docker config | |||
| #uri: http://config:1001/ | |||
| uri: http://localhost:1001/ | |||
| profile: dev | |||
| name: service-inventory | |||
| server: | |||
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <configuration scan="true" scanPeriod="10 seconds"> | |||
| <!-- 外部指定路径 --> | |||
| <springProperty scop="context" name="logPath" source="logging.path" /> | |||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | |||
| <encoder> | |||
| <Pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n</Pattern> | |||
| </encoder> | |||
| </appender> | |||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/trace.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| </appender> | |||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/info.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>INFO</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/debug.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>DEBUG</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/warn.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>WARN</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | |||
| <file>${logPath}/error.log</file> | |||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | |||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||
| <maxHistory>30</maxHistory> <!-- 保留180天 --> | |||
| </rollingPolicy> | |||
| <layout> | |||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | |||
| </layout> | |||
| <filter class="ch.qos.logback.classic.filter.LevelFilter"> | |||
| <level>ERROR</level> | |||
| <onMatch>ACCEPT</onMatch> | |||
| <onMismatch>DENY</onMismatch> | |||
| </filter> | |||
| </appender> | |||
| <root level="TRACE"> | |||
| <appender-ref ref="TRACE_FILE" /> | |||
| <appender-ref ref="INFO_FILE" /> | |||
| <!-- <appender-ref ref="DEBUG_FILE" /> --> | |||
| <!-- <appender-ref ref="WARN_FILE" /> --> | |||
| <appender-ref ref="ERROR_FILE" /> | |||
| </root> | |||
| <root level="INFO"> | |||
| <appender-ref ref="STDOUT" /> | |||
| </root> | |||
| </configuration> | |||
| @@ -1,6 +1,8 @@ | |||
| FROM openjdk:8-jdk-alpine | |||
| VOLUME /tmp | |||
| ARG PROFILE_ENV | |||
| ENV profile_env=$PROFILE_ENV | |||
| ARG JAR_FILE | |||
| ADD ${JAR_FILE} app.jar | |||
| RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=prod","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] | |||
| @@ -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; | |||
| @@ -98,6 +98,7 @@ public class CardController { | |||
| return new ResponseData<>(); | |||
| } | |||
| @Transactional | |||
| @ApiOperation(value = "deactivate card") | |||
| @PostMapping("/card/deactivate") | |||
| @@ -80,6 +80,7 @@ public class CardTradeController { | |||
| return new ResponseData<>(afterBalance); | |||
| } | |||
| @Transactional | |||
| @PostMapping("/transfer/{snCode}") | |||
| @ApiOperation(value = "转账接口", notes = "转账接口") | |||