Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
36307334
Commit
36307334
authored
Jul 19, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加积分消息队列接口
parent
c5e1870f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
19 deletions
+12
-19
RabbitConstant.java
...wxiaoqi/security/common/config/rabbit/RabbitConstant.java
+4
-2
RabbitActivityConfig.java
...m/xxfc/platform/activity/config/RabbitActivityConfig.java
+1
-2
ImCommentBiz.java
.../src/main/java/com/xxfc/platform/im/biz/ImCommentBiz.java
+2
-2
ImQuestionBiz.java
...src/main/java/com/xxfc/platform/im/biz/ImQuestionBiz.java
+2
-2
MQconstant.java
...java/com/xxfc/platform/universal/constant/MQconstant.java
+0
-8
OrderPayBiz.java
...ain/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
+3
-3
No files found.
ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java
View file @
36307334
...
@@ -13,14 +13,16 @@ public class RabbitConstant {
...
@@ -13,14 +13,16 @@ public class RabbitConstant {
public
static
final
String
ADMIN_TOPIC
=
ADMIN
+
TOPIC_EXC
;
public
static
final
String
ADMIN_TOPIC
=
ADMIN
+
TOPIC_EXC
;
public
static
final
String
ORDER
=
"order"
;
public
static
final
String
ORDER
=
"order"
;
public
static
final
String
ORDER_TOPIC
=
ORDER
+
TOPIC_EXC
;
public
static
final
String
ORDER_TOPIC
=
ORDER
+
TOPIC_EXC
;
public
static
final
String
INTEGRAL
=
"integral"
;
public
static
final
String
INTEGRAL_TOPIC
=
INTEGRAL
+
TOPIC_EXC
;
/**************************key*********************************/
/**************************key*********************************/
public
static
final
String
KEY_REGISTER_SUCCESS
=
"register.success"
;
public
static
final
String
KEY_REGISTER_SUCCESS
=
"register.success"
;
public
static
final
String
INTEGRAL_ROUTING_KEY
=
"integral_routing_key"
;
static
{
static
{
exchangeTopicSet
=
new
HashSet
<
String
>()
{{
exchangeTopicSet
=
new
HashSet
<
String
>()
{{
add
(
ADMIN_TOPIC
);
add
(
ADMIN_TOPIC
);
add
(
ORDER_TOPIC
);
add
(
ORDER_TOPIC
);
add
(
INTEGRAL_TOPIC
);
}};
}};
}
}
}
}
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java
View file @
36307334
...
@@ -3,7 +3,6 @@ package com.xxfc.platform.activity.config;
...
@@ -3,7 +3,6 @@ package com.xxfc.platform.activity.config;
import
com.github.wxiaoqi.security.common.config.RabbitCommonConfig
;
import
com.github.wxiaoqi.security.common.config.RabbitCommonConfig
;
import
com.github.wxiaoqi.security.common.config.rabbit.BindDTO
;
import
com.github.wxiaoqi.security.common.config.rabbit.BindDTO
;
import
com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant
;
import
com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant
;
import
com.xxfc.platform.universal.constant.MQconstant
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -29,7 +28,7 @@ public class RabbitActivityConfig extends RabbitCommonConfig {
...
@@ -29,7 +28,7 @@ public class RabbitActivityConfig extends RabbitCommonConfig {
add
(
new
BindDTO
(
POPULARZIE_0101_QUEUE
,
RabbitConstant
.
ADMIN_TOPIC
,
"appUser.auth"
));
add
(
new
BindDTO
(
POPULARZIE_0101_QUEUE
,
RabbitConstant
.
ADMIN_TOPIC
,
"appUser.auth"
));
add
(
new
BindDTO
(
ACTIVITY_NEW_QUEUE
,
RabbitConstant
.
ADMIN_TOPIC
,
"appUser.register"
));
add
(
new
BindDTO
(
ACTIVITY_NEW_QUEUE
,
RabbitConstant
.
ADMIN_TOPIC
,
"appUser.register"
));
add
(
new
BindDTO
(
ACTIVITY_NEW_QUEUE
,
RabbitConstant
.
ADMIN_TOPIC
,
"appUser.auth"
));
add
(
new
BindDTO
(
ACTIVITY_NEW_QUEUE
,
RabbitConstant
.
ADMIN_TOPIC
,
"appUser.auth"
));
add
(
new
BindDTO
(
INTEGRAL_HANDLE_QUEUE
,
MQconstant
.
INTEGRAL_EXCHANGE
,
MQc
onstant
.
INTEGRAL_ROUTING_KEY
));
add
(
new
BindDTO
(
INTEGRAL_HANDLE_QUEUE
,
RabbitConstant
.
INTEGRAL_TOPIC
,
RabbitC
onstant
.
INTEGRAL_ROUTING_KEY
));
}};
}};
}
}
...
...
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/ImCommentBiz.java
View file @
36307334
...
@@ -3,13 +3,13 @@ package com.xxfc.platform.im.biz;
...
@@ -3,13 +3,13 @@ package com.xxfc.platform.im.biz;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.im.dto.MsgTypeEnum
;
import
com.xxfc.platform.im.dto.MsgTypeEnum
;
import
com.xxfc.platform.im.dto.UpdateTypeEnum
;
import
com.xxfc.platform.im.dto.UpdateTypeEnum
;
import
com.xxfc.platform.im.entity.ImComment
;
import
com.xxfc.platform.im.entity.ImComment
;
import
com.xxfc.platform.im.entity.ImQuestion
;
import
com.xxfc.platform.im.entity.ImQuestion
;
import
com.xxfc.platform.im.mapper.ImCommentMapper
;
import
com.xxfc.platform.im.mapper.ImCommentMapper
;
import
com.xxfc.platform.universal.constant.MQconstant
;
import
com.xxfc.platform.universal.feign.MQSenderFeign
;
import
com.xxfc.platform.universal.feign.MQSenderFeign
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -55,7 +55,7 @@ public class ImCommentBiz extends BaseBiz<ImCommentMapper, ImComment> {
...
@@ -55,7 +55,7 @@ public class ImCommentBiz extends BaseBiz<ImCommentMapper, ImComment> {
jsonObject
.
put
(
"userId"
,
appUserDTO
.
getUserid
());
jsonObject
.
put
(
"userId"
,
appUserDTO
.
getUserid
());
jsonObject
.
put
(
"channelId"
,
newValue
.
getId
());
jsonObject
.
put
(
"channelId"
,
newValue
.
getId
());
jsonObject
.
put
(
"integralRuleCode"
,
"COMMENTPUBLISH"
);
jsonObject
.
put
(
"integralRuleCode"
,
"COMMENTPUBLISH"
);
mqSenderFeign
.
sendMessage
(
MQconstant
.
INTEGRAL_EXCHANGE
,
MQc
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
mqSenderFeign
.
sendMessage
(
RabbitConstant
.
INTEGRAL_TOPIC
,
RabbitC
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
return
ObjectRestResponse
.
succ
();
return
ObjectRestResponse
.
succ
();
}
}
...
...
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/ImQuestionBiz.java
View file @
36307334
...
@@ -3,6 +3,7 @@ package com.xxfc.platform.im.biz;
...
@@ -3,6 +3,7 @@ package com.xxfc.platform.im.biz;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.util.Query
;
import
com.github.wxiaoqi.security.common.util.Query
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
...
@@ -11,7 +12,6 @@ import com.xxfc.platform.im.dto.QuestionParamDto;
...
@@ -11,7 +12,6 @@ import com.xxfc.platform.im.dto.QuestionParamDto;
import
com.xxfc.platform.im.dto.UpdateTypeEnum
;
import
com.xxfc.platform.im.dto.UpdateTypeEnum
;
import
com.xxfc.platform.im.entity.ImQuestion
;
import
com.xxfc.platform.im.entity.ImQuestion
;
import
com.xxfc.platform.im.mapper.ImQuestionMapper
;
import
com.xxfc.platform.im.mapper.ImQuestionMapper
;
import
com.xxfc.platform.universal.constant.MQconstant
;
import
com.xxfc.platform.universal.feign.MQSenderFeign
;
import
com.xxfc.platform.universal.feign.MQSenderFeign
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -70,7 +70,7 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
...
@@ -70,7 +70,7 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
jsonObject
.
put
(
"userId"
,
appUserDTO
.
getUserid
());
jsonObject
.
put
(
"userId"
,
appUserDTO
.
getUserid
());
jsonObject
.
put
(
"channelId"
,
newValue
.
getId
());
jsonObject
.
put
(
"channelId"
,
newValue
.
getId
());
jsonObject
.
put
(
"integralRuleCode"
,
"PUBLISH"
);
jsonObject
.
put
(
"integralRuleCode"
,
"PUBLISH"
);
mqSenderFeign
.
sendMessage
(
MQconstant
.
INTEGRAL_EXCHANGE
,
MQc
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
mqSenderFeign
.
sendMessage
(
RabbitConstant
.
INTEGRAL_TOPIC
,
RabbitC
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
return
ObjectRestResponse
.
succ
();
return
ObjectRestResponse
.
succ
();
}
}
...
...
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/MQconstant.java
deleted
100644 → 0
View file @
c5e1870f
package
com
.
xxfc
.
platform
.
universal
.
constant
;
public
class
MQconstant
{
public
static
final
String
INTEGRAL_EXCHANGE
=
"integral_exchange"
;
public
static
final
String
INTEGRAL_ROUTING_KEY
=
"integral_routing_key"
;
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
View file @
36307334
...
@@ -11,13 +11,13 @@ import com.alipay.api.internal.util.AlipaySignature;
...
@@ -11,13 +11,13 @@ import com.alipay.api.internal.util.AlipaySignature;
import
com.alipay.api.request.*
;
import
com.alipay.api.request.*
;
import
com.alipay.api.response.*
;
import
com.alipay.api.response.*
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.util.HTTPSUtils
;
import
com.github.wxiaoqi.security.common.util.HTTPSUtils
;
import
com.github.wxiaoqi.security.common.util.OrderUtil
;
import
com.github.wxiaoqi.security.common.util.OrderUtil
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.process.SystemConfig
;
import
com.github.wxiaoqi.security.common.util.process.SystemConfig
;
import
com.github.wxiaoqi.security.common.util.result.JsonResultUtil
;
import
com.github.wxiaoqi.security.common.util.result.JsonResultUtil
;
import
com.xxfc.platform.universal.constant.MQconstant
;
import
com.xxfc.platform.universal.entity.Dictionary
;
import
com.xxfc.platform.universal.entity.Dictionary
;
import
com.xxfc.platform.universal.entity.OrderPay
;
import
com.xxfc.platform.universal.entity.OrderPay
;
import
com.xxfc.platform.universal.mapper.OrderPayMapper
;
import
com.xxfc.platform.universal.mapper.OrderPayMapper
;
...
@@ -157,8 +157,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
...
@@ -157,8 +157,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
jsonObject
.
put
(
"integralRuleCode"
,
"BUYMEMBER"
);
jsonObject
.
put
(
"integralRuleCode"
,
"BUYMEMBER"
);
}
}
log
.
info
(
"支付订单号:orderNo = {}, orderType = {}"
,
newValue
.
getOrderNo
(),
newValue
.
getChannel
());
log
.
info
(
"支付订单号:orderNo = {}, orderType = {}"
,
newValue
.
getOrderNo
(),
newValue
.
getChannel
());
log
.
info
(
"支付成功获取积分:发送消息 exchange = {}, routingKey = {}, json = {}"
,
MQconstant
.
INTEGRAL_EXCHANGE
,
MQc
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
log
.
info
(
"支付成功获取积分:发送消息 exchange = {}, routingKey = {}, json = {}"
,
RabbitConstant
.
INTEGRAL_TOPIC
,
RabbitC
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
mqServiceBiZ
.
sendMessage
(
MQconstant
.
INTEGRAL_EXCHANGE
,
MQc
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
mqServiceBiZ
.
sendMessage
(
RabbitConstant
.
INTEGRAL_TOPIC
,
RabbitC
onstant
.
INTEGRAL_ROUTING_KEY
,
jsonObject
.
toJSONString
());
}
}
if
(
StringUtils
.
isNotBlank
(
pay
.
getNotifyUrl
())){
if
(
StringUtils
.
isNotBlank
(
pay
.
getNotifyUrl
())){
String
url
=
pay
.
getNotifyUrl
();
String
url
=
pay
.
getNotifyUrl
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment