YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by wangshusheng
Commit e8e28d6a22fe49edc2222e7ac362696c474401e7 2 parents c3514984 850c65e4

Merge branch 'master' into dev_180425_无效激活点击

Inline Side-by-side
Showing 5 changed files with 1 additions and 43 deletions
@@ -49,10 +49,6 @@ @@ -49,10 +49,6 @@
49 <artifactId>yoho-core-rest-client-simple</artifactId> 49 <artifactId>yoho-core-rest-client-simple</artifactId>
50 </dependency> 50 </dependency>
51 <dependency> 51 <dependency>
52 - <groupId>com.yoho.core</groupId>  
53 - <artifactId>yoho-core-message</artifactId>  
54 - </dependency>  
55 - <dependency>  
56 <groupId>dom4j</groupId> 52 <groupId>dom4j</groupId>
57 <artifactId>dom4j</artifactId> 53 <artifactId>dom4j</artifactId>
58 <version>1.6.1</version> 54 <version>1.6.1</version>
@@ -45,10 +45,6 @@ @@ -45,10 +45,6 @@
45 <artifactId>yoho-core-rest-client-simple</artifactId> 45 <artifactId>yoho-core-rest-client-simple</artifactId>
46 </dependency> 46 </dependency>
47 <dependency> 47 <dependency>
48 - <groupId>com.yoho.core</groupId>  
49 - <artifactId>yoho-core-message</artifactId>  
50 - </dependency>  
51 - <dependency>  
52 <groupId>dom4j</groupId> 48 <groupId>dom4j</groupId>
53 <artifactId>dom4j</artifactId> 49 <artifactId>dom4j</artifactId>
54 <version>1.6.1</version> 50 <version>1.6.1</version>
@@ -2,15 +2,12 @@ package com.yoho.unions.server.mqconsumer; @@ -2,15 +2,12 @@ package com.yoho.unions.server.mqconsumer;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 -import com.yoho.core.message.YhMessageConsumer;  
6 import com.yoho.core.rabbitmq.YhConsumer; 5 import com.yoho.core.rabbitmq.YhConsumer;
7 import com.yoho.unions.common.utils.DateUtil; 6 import com.yoho.unions.common.utils.DateUtil;
8 import com.yoho.unions.dal.IUserOrdersDAO; 7 import com.yoho.unions.dal.IUserOrdersDAO;
9 import com.yoho.unions.dal.IUserOrdersRelationDAO; 8 import com.yoho.unions.dal.IUserOrdersRelationDAO;
10 import com.yoho.unions.dal.model.UserOrders; 9 import com.yoho.unions.dal.model.UserOrders;
11 import com.yoho.unions.dal.model.UserOrdersRelation; 10 import com.yoho.unions.dal.model.UserOrdersRelation;
12 -import com.yoho.unions.message.CommonMessageConsumer;  
13 -import com.yoho.unions.server.service.IOrderPushService;  
14 import org.apache.commons.lang.StringUtils; 11 import org.apache.commons.lang.StringUtils;
15 import org.slf4j.Logger; 12 import org.slf4j.Logger;
16 import org.slf4j.LoggerFactory; 13 import org.slf4j.LoggerFactory;
1 -####暂时不使用,待到订单上线的时候恢复使用#########  
2 -#MQ  
3 -rabbit.mq.host=192.168.102.45  
4 -rabbit.mq.port=5672  
5 -rabbit.mq.username=yoho  
6 -rabbit.mq.password=yoho  
7 -#rabbit.mq.virtualHost=/yoho  
8 -  
9 -rabbit_host=192.168.102.45:5672  
10 -rabbit_user=yoho  
11 -rabbit_password =yoho  
12 1
13 #激活有效期（秒） 2 #激活有效期（秒）
14 activeTime=3600 3 activeTime=3600
@@ -33,24 +22,13 @@ redis.proxy.port=6379 @@ -33,24 +22,13 @@ redis.proxy.port=6379
33 redis.proxy.auth= 22 redis.proxy.auth=
34 redis.proxy.database=1 23 redis.proxy.database=1
35 24
36 -########## common rabbitmq ##########  
37 -#aws  
38 -rabbit_common_aws=192.168.102.22:5672  
39 -rabbit_common_aws_user=yoho  
40 -rabbit_common_aws_password=yoho  
41 -#qq  
42 -rabbit_common_qq=192.168.102.22:5672  
43 -rabbit_common_qq_user=yoho  
44 -rabbit_common_qq_password=yoho  
45 -##########common rabbitmq ##########  
46 -  
47 #-------------七牛云配置-------------------# 25 #-------------七牛云配置-------------------#
48 qiniu.accesskey=atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m 26 qiniu.accesskey=atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
49 qiniu.secretkey=pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm 27 qiniu.secretkey=pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm
50 qiniu.domain = test 28 qiniu.domain = test
51 qiniu.bucket = test 29 qiniu.bucket = test
52 30
53 -zkAddress=127.0.0.1:2181 31 +zkAddress=192.168.102.45:2181
54 # web context 32 # web context
55 web.context=union 33 web.context=union
56 34
@@ -95,11 +73,6 @@ sendSMS.password=7jVEde87bLffoTnt6tGxmw== @@ -95,11 +73,6 @@ sendSMS.password=7jVEde87bLffoTnt6tGxmw==
95 73
96 tencentmkt.shareUrl=http://union.yoho.cn/union/tencentMkt/index.html 74 tencentmkt.shareUrl=http://union.yoho.cn/union/tencentMkt/index.html
97 75
98 -rabbit_message_center = 192.168.102.45:5672  
99 -rabbit_message_center_user = yoho  
100 -rabbit_message_center_password = yoho  
101 -rabbit_message_center_vhost = yoho  
102 -  
103 ################## Import Export ##################### 76 ################## Import Export #####################
104 file.saveDir=E:\\Data 77 file.saveDir=E:\\Data
105 78
@@ -13,10 +13,6 @@ redis.readonly.proxy.address=${redis.union.readonly.proxy.address} @@ -13,10 +13,6 @@ redis.readonly.proxy.address=${redis.union.readonly.proxy.address}
13 redis.readonly.proxy.port=${redis.union.readonly.proxy.port} 13 redis.readonly.proxy.port=${redis.union.readonly.proxy.port}
14 redis.readonly.proxy.auth=${redis.union.readonly.proxy.auth} 14 redis.readonly.proxy.auth=${redis.union.readonly.proxy.auth}
15 15
16 -rabbit_host=${rabbit_host}  
17 -rabbit_user=${rabbit_user}  
18 -rabbit_password =${rabbit_password}  
19 -  
20 #广点通 7*24 16 #广点通 7*24
21 activeTime_3=48 17 activeTime_3=48
22 #今日头条 24 18 #今日头条 24