Toggle navigation
Toggle navigation
This project
Loading...
Sign in
YOHOBUY
/
yohobuy-union
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
wangshusheng
7 years ago
Commit
850c65e48a9c675279bb4e4954575afd4d075f82
1 parent
d7ad78c9
去掉message依赖
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 additions
and
43 deletions
channel/pom.xml
server/pom.xml
server/src/main/java/com/yoho/unions/server/mqconsumer/OrderPushConsumer.java
web/src/main/resources/config.properties
web/src/main/webapp/META-INF/autoconf/config.properties
channel/pom.xml
View file @
850c65e
...
...
@@ -49,10 +49,6 @@
<artifactId>
yoho-core-rest-client-simple
</artifactId>
</dependency>
<dependency>
<groupId>
com.yoho.core
</groupId>
<artifactId>
yoho-core-message
</artifactId>
</dependency>
<dependency>
<groupId>
dom4j
</groupId>
<artifactId>
dom4j
</artifactId>
<version>
1.6.1
</version>
...
...
server/pom.xml
View file @
850c65e
...
...
@@ -45,10 +45,6 @@
<artifactId>
yoho-core-rest-client-simple
</artifactId>
</dependency>
<dependency>
<groupId>
com.yoho.core
</groupId>
<artifactId>
yoho-core-message
</artifactId>
</dependency>
<dependency>
<groupId>
dom4j
</groupId>
<artifactId>
dom4j
</artifactId>
<version>
1.6.1
</version>
...
...
server/src/main/java/com/yoho/unions/server/mqconsumer/OrderPushConsumer.java
View file @
850c65e
...
...
@@ -2,15 +2,12 @@ package com.yoho.unions.server.mqconsumer;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.yoho.core.message.YhMessageConsumer
;
import
com.yoho.core.rabbitmq.YhConsumer
;
import
com.yoho.unions.common.utils.DateUtil
;
import
com.yoho.unions.dal.IUserOrdersDAO
;
import
com.yoho.unions.dal.IUserOrdersRelationDAO
;
import
com.yoho.unions.dal.model.UserOrders
;
import
com.yoho.unions.dal.model.UserOrdersRelation
;
import
com.yoho.unions.message.CommonMessageConsumer
;
import
com.yoho.unions.server.service.IOrderPushService
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
web/src/main/resources/config.properties
View file @
850c65e
####暂时不使用,待到订单上线的时候恢复使用#########
#MQ
rabbit.mq.host
=
192.168.102.45
rabbit.mq.port
=
5672
rabbit.mq.username
=
yoho
rabbit.mq.password
=
yoho
#rabbit.mq.virtualHost=/yoho
rabbit_host
=
192.168.102.45:5672
rabbit_user
=
yoho
rabbit_password
=
yoho
#激活有效期(秒)
activeTime
=
3600
...
...
@@ -33,24 +22,13 @@ redis.proxy.port=6379
redis.proxy.auth
=
redis.proxy.database
=
1
########## common rabbitmq ##########
#aws
rabbit_common_aws
=
192.168.102.22:5672
rabbit_common_aws_user
=
yoho
rabbit_common_aws_password
=
yoho
#qq
rabbit_common_qq
=
192.168.102.22:5672
rabbit_common_qq_user
=
yoho
rabbit_common_qq_password
=
yoho
##########common rabbitmq ##########
#-------------七牛云配置-------------------#
qiniu.accesskey
=
atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
qiniu.secretkey
=
pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm
qiniu.domain
=
test
qiniu.bucket
=
test
zkAddress
=
1
27.0.0.1
:2181
zkAddress
=
1
92.168.102.45
:2181
# web context
web.context
=
union
...
...
@@ -95,11 +73,6 @@ sendSMS.password=7jVEde87bLffoTnt6tGxmw==
tencentmkt.shareUrl
=
http://union.yoho.cn/union/tencentMkt/index.html
rabbit_message_center
=
192.168.102.45:5672
rabbit_message_center_user
=
yoho
rabbit_message_center_password
=
yoho
rabbit_message_center_vhost
=
yoho
################## Import Export #####################
file.saveDir
=
E:
\\
Data
...
...
web/src/main/webapp/META-INF/autoconf/config.properties
View file @
850c65e
...
...
@@ -13,10 +13,6 @@ redis.readonly.proxy.address=${redis.union.readonly.proxy.address}
redis.readonly.proxy.port
=
${redis.union.readonly.proxy.port}
redis.readonly.proxy.auth
=
${redis.union.readonly.proxy.auth}
rabbit_host
=
${rabbit_host}
rabbit_user
=
${rabbit_user}
rabbit_password
=
${rabbit_password}
#广点通 7*24
activeTime_3
=
48
#今日头条 24
...
...
Please
register
or
login
to post a comment