Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Jeepay
Commits
eb1c12bd
Commit
eb1c12bd
authored
Jul 27, 2021
by
terrfly
Browse files
修改充值类型,避免fastjson反序列化异常的问题。
parent
f2d1b1b8
Changes
10
Hide whitespace changes
Inline
Side-by-side
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetIsvMchAppInfoConfigMQ.java
View file @
eb1c12bd
...
...
@@ -42,16 +42,18 @@ public class ResetIsvMchAppInfoConfigMQ extends AbstractMQ {
/** 内置msg 消息体定义 **/
private
MsgPayload
payload
;
// 重置类型 (枚举类型,无法json反序列化)
public
static
final
byte
RESET_TYPE_ISV_INFO
=
1
;
public
static
final
byte
RESET_TYPE_MCH_INFO
=
2
;
public
static
final
byte
RESET_TYPE_MCH_APP
=
3
;
/** 【!重要配置项!】 定义Msg消息载体 **/
@Data
@AllArgsConstructor
public
static
class
MsgPayload
{
public
enum
RESET_TYPE
{
ISV_INFO
,
MCH_INFO
,
MCH_APP
}
/** 重置类型 **/
private
Enum
resetType
;
private
Byte
resetType
;
/** isvNo **/
private
String
isvNo
;
...
...
@@ -82,7 +84,7 @@ public class ResetIsvMchAppInfoConfigMQ extends AbstractMQ {
}
/** 【!重要配置项!】 构造MQModel , 一般用于发送MQ时 **/
public
static
ResetIsvMchAppInfoConfigMQ
build
(
Enum
resetType
,
String
isvNo
,
String
mchNo
,
String
appId
){
public
static
ResetIsvMchAppInfoConfigMQ
build
(
Byte
resetType
,
String
isvNo
,
String
mchNo
,
String
appId
){
return
new
ResetIsvMchAppInfoConfigMQ
(
new
MsgPayload
(
resetType
,
isvNo
,
mchNo
,
appId
));
}
...
...
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java
View file @
eb1c12bd
...
...
@@ -98,7 +98,7 @@ public class IsvInfoController extends CommonCtrl {
isvInfoService
.
removeByIsvNo
(
isvNo
);
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
ISV_INFO
,
isvNo
,
null
,
null
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
ISV_INFO
,
isvNo
,
null
,
null
));
return
ApiRes
.
ok
();
}
...
...
@@ -116,7 +116,7 @@ public class IsvInfoController extends CommonCtrl {
boolean
result
=
isvInfoService
.
updateById
(
isvInfo
);
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
ISV_INFO
,
isvNo
,
null
,
null
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
ISV_INFO
,
isvNo
,
null
,
null
));
if
(!
result
)
return
ApiRes
.
fail
(
ApiCodeEnum
.
SYS_OPERATION_FAIL_UPDATE
);
return
ApiRes
.
ok
();
...
...
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvPayInterfaceConfigController.java
View file @
eb1c12bd
...
...
@@ -133,7 +133,7 @@ public class IsvPayInterfaceConfigController extends CommonCtrl {
}
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
ISV_INFO
,
infoId
,
null
,
null
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
ISV_INFO
,
infoId
,
null
,
null
));
return
ApiRes
.
ok
();
}
...
...
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java
View file @
eb1c12bd
...
...
@@ -114,7 +114,7 @@ public class MchAppController extends CommonCtrl {
return
ApiRes
.
fail
(
ApiCodeEnum
.
SYS_OPERATION_FAIL_UPDATE
);
}
// 推送修改应用消息
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
return
ApiRes
.
ok
();
}
...
...
@@ -132,7 +132,7 @@ public class MchAppController extends CommonCtrl {
mchAppService
.
removeByAppId
(
appId
);
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
return
ApiRes
.
ok
();
}
...
...
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java
View file @
eb1c12bd
...
...
@@ -118,7 +118,7 @@ public class MchInfoController extends CommonCtrl {
mqSender
.
send
(
CleanMchLoginAuthCacheMQ
.
build
(
userIdList
));
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_INFO
,
null
,
mchNo
,
null
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_INFO
,
null
,
mchNo
,
null
));
return
ApiRes
.
ok
();
}
...
...
@@ -173,7 +173,7 @@ public class MchInfoController extends CommonCtrl {
}
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_INFO
,
null
,
mchNo
,
null
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_INFO
,
null
,
mchNo
,
null
));
return
ApiRes
.
ok
();
}
...
...
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayInterfaceConfigController.java
View file @
eb1c12bd
...
...
@@ -155,7 +155,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
}
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
infoId
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
infoId
));
return
ApiRes
.
ok
();
}
...
...
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
View file @
eb1c12bd
...
...
@@ -121,7 +121,7 @@ public class MchAppController extends CommonCtrl {
return
ApiRes
.
fail
(
ApiCodeEnum
.
SYS_OPERATION_FAIL_UPDATE
);
}
// 推送修改应用消息
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
return
ApiRes
.
ok
();
}
...
...
@@ -143,7 +143,7 @@ public class MchAppController extends CommonCtrl {
mchAppService
.
removeByAppId
(
appId
);
// 推送mq到目前节点进行更新数据
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
appId
));
return
ApiRes
.
ok
();
}
...
...
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayInterfaceConfigController.java
View file @
eb1c12bd
...
...
@@ -154,7 +154,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
if
(!
result
)
{
throw
new
BizException
(
"配置失败"
);
}
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
,
null
,
getCurrentMchNo
(),
infoId
));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
,
null
,
getCurrentMchNo
(),
infoId
));
return
ApiRes
.
ok
();
}
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/ctrl/AlipayBizController.java
View file @
eb1c12bd
...
...
@@ -144,7 +144,7 @@ public class AlipayBizController extends AbstractCtrl {
MchApp
mchApp
=
mchAppService
.
getById
(
mchAppId
);
// 更新应用配置信息
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
mchApp
.
getAppId
()));
mqSender
.
send
(
ResetIsvMchAppInfoConfigMQ
.
build
(
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
,
null
,
mchApp
.
getMchNo
(),
mchApp
.
getAppId
()));
}
}
catch
(
Exception
e
)
{
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/mq/ResetIsvMchAppInfoMQReceiver.java
View file @
eb1c12bd
...
...
@@ -38,11 +38,11 @@ public class ResetIsvMchAppInfoMQReceiver implements ResetIsvMchAppInfoConfigMQ.
@Override
public
void
receive
(
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
payload
)
{
if
(
payload
.
getResetType
()
==
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
ISV_INFO
){
if
(
payload
.
getResetType
()
==
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
ISV_INFO
){
this
.
modifyIsvInfo
(
payload
.
getIsvNo
());
}
else
if
(
payload
.
getResetType
()
==
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_INFO
){
}
else
if
(
payload
.
getResetType
()
==
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_INFO
){
this
.
modifyMchInfo
(
payload
.
getMchNo
());
}
else
if
(
payload
.
getResetType
()
==
ResetIsvMchAppInfoConfigMQ
.
MsgPayload
.
RESET_TYPE
.
MCH_APP
){
}
else
if
(
payload
.
getResetType
()
==
ResetIsvMchAppInfoConfigMQ
.
RESET_TYPE
_
MCH_APP
){
this
.
modifyMchApp
(
payload
.
getMchNo
(),
payload
.
getAppId
());
}
...
...
Write
Preview
Supports
Markdown
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