From 5e57213e405b6362fe97f2618bae836e58aef929 Mon Sep 17 00:00:00 2001 From: wifibaby4u Date: Tue, 28 May 2024 18:00:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7springboot=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B02.7.18;=202.=E4=BB=A5=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=8D=87=E7=BA=A7fastjson=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=88=B02.x=EF=BC=8C=E6=9B=BF=E6=8D=A2=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=AD=E6=89=80=E6=9C=89=E4=BD=BF=E7=94=A8fastjson1.x?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9;=203.=E6=8F=90=E5=8F=96JeepayFacade?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E9=97=AE=E9=A2=98;=205.=E5=85=B6=E5=AE=83=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/model/CleanMchLoginAuthCacheMQ.java | 4 +- .../mq/model/PayOrderDivisionMQ.java | 6 +- .../mq/model/PayOrderMchNotifyMQ.java | 4 +- .../mq/model/PayOrderReissueMQ.java | 4 +- .../components/mq/model/ResetAppConfigMQ.java | 4 +- .../mq/model/ResetIsvMchAppInfoConfigMQ.java | 4 +- .../aliyunrocketmq/AliYunRocketMQSender.java | 2 +- jeepay-core/pom.xml | 4 + .../jeepay/core/beans/RequestKitBean.java | 2 +- .../jeequan/jeepay/core/cache/RedisUtil.java | 2 +- .../jeepay/core/ctrls/AbstractCtrl.java | 4 +- .../core/entity/PayInterfaceDefine.java | 2 +- .../jeequan/jeepay/core/jwt/JWTPayload.java | 6 +- .../com/jeequan/jeepay/core/jwt/JWTUtils.java | 18 +- .../com/jeequan/jeepay/core/model/ApiRes.java | 6 +- .../jeequan/jeepay/core/model/BaseModel.java | 2 +- .../core/model/DBApplicationConfig.java | 2 +- .../jeepay/core/model/params/IsvParams.java | 2 +- .../core/model/params/IsvsubMchParams.java | 2 +- .../core/model/params/NormalMchParams.java | 2 +- .../model/params/alipay/AlipayIsvParams.java | 4 +- .../params/alipay/AlipayNormalMchParams.java | 4 +- .../params/plspay/PlspayNormalMchParams.java | 4 +- .../params/pppay/PppayNormalMchParams.java | 4 +- .../model/params/wxpay/WxpayIsvParams.java | 4 +- .../params/wxpay/WxpayNormalMchParams.java | 4 +- .../params/xxpay/XxpayNormalMchParams.java | 4 +- .../model/params/ysf/YsfpayIsvParams.java | 4 +- .../core/utils/ApiResBodyAdviceKit.java | 6 +- .../jeequan/jeepay/core/utils/JsonKit.java | 2 +- .../jeequan/jeepay/core/utils/StringKit.java | 2 +- .../jeepay/core/utils/TreeDataBuilder.java | 4 +- jeepay-manager/pom.xml | 21 +- .../jeequan/jeepay/mgr/aop/MethodLogAop.java | 4 +- .../jeepay/mgr/bootstrap/InitRunner.java | 11 +- .../mgr/bootstrap/JeepayMgrApplication.java | 28 +- .../mgr/ctrl/CurrentUserController.java | 6 +- .../jeepay/mgr/ctrl/anon/AuthController.java | 2 +- .../mgr/ctrl/config/MainChartController.java | 2 +- .../mgr/ctrl/config/SysConfigController.java | 5 +- .../mgr/ctrl/isv/IsvInfoController.java | 4 +- .../isv/IsvPayInterfaceConfigController.java | 4 +- .../mgr/ctrl/merchant/MchAppController.java | 4 +- .../mgr/ctrl/merchant/MchInfoController.java | 8 +- .../MchPayInterfaceConfigController.java | 6 +- .../MchPayPassageConfigController.java | 4 +- .../mgr/ctrl/order/MchNotifyController.java | 2 +- .../mgr/ctrl/order/PayOrderController.java | 2 +- .../mgr/ctrl/order/RefundOrderController.java | 2 +- .../ctrl/order/TransferOrderController.java | 2 +- .../PayInterfaceDefineController.java | 4 +- .../mgr/ctrl/sysuser/SysEntController.java | 6 +- .../mgr/ctrl/sysuser/SysLogController.java | 2 +- .../mgr/ctrl/sysuser/SysRoleController.java | 2 +- .../sysuser/SysUserRoleRelaController.java | 2 +- .../mgr/secruity/WebSecurityConfig.java | 35 +-- .../src/main/resources/application.yml | 2 +- jeepay-merchant/pom.xml | 21 +- .../jeequan/jeepay/mch/aop/MethodLogAop.java | 4 +- .../jeepay/mch/bootstrap/InitRunner.java | 12 +- .../mch/bootstrap/JeepayMchApplication.java | 28 +- .../mch/ctrl/CurrentUserController.java | 6 +- .../jeepay/mch/ctrl/anon/AuthController.java | 2 +- .../PayOrderDivisionRecordController.java | 2 +- .../ctrl/merchant/MainChartController.java | 4 +- .../mch/ctrl/merchant/MchAppController.java | 4 +- .../MchPayInterfaceConfigController.java | 6 +- .../MchPayPassageConfigController.java | 4 +- .../mch/ctrl/order/PayOrderController.java | 2 +- .../mch/ctrl/order/RefundOrderController.java | 2 +- .../ctrl/order/TransferOrderController.java | 2 +- .../mch/ctrl/paytest/PaytestController.java | 2 +- .../ctrl/paytest/PaytestNotifyController.java | 2 +- .../mch/ctrl/sysuser/SysEntController.java | 6 +- .../mch/ctrl/sysuser/SysRoleController.java | 2 +- .../sysuser/SysRoleEntRelaController.java | 2 +- .../sysuser/SysUserRoleRelaController.java | 2 +- .../ChannelUserIdNotifyController.java | 2 +- .../ctrl/transfer/MchTransferController.java | 2 +- .../mch/secruity/WebSecurityConfig.java | 36 +-- .../websocket/server/WsPayOrderServer.java | 2 +- .../src/main/resources/application.yml | 2 +- jeepay-payment/pom.xml | 27 +- .../jeepay/pay/bootstrap/InitRunner.java | 12 +- .../pay/bootstrap/JeepayPayApplication.java | 30 +- .../channel/AbstractChannelNoticeService.java | 2 +- .../AbstractChannelRefundNoticeService.java | 2 +- ...actDivisionRecordChannelNotifyService.java | 2 +- .../AbstractTransferNoticeService.java | 2 +- .../pay/channel/IChannelUserService.java | 2 +- .../alipay/AlipayChannelNoticeService.java | 2 +- .../alipay/AlipayChannelUserService.java | 2 +- ...payDivisionRecordChannelNotifyService.java | 4 +- .../channel/alipay/AlipayDivisionService.java | 2 +- .../alipay/AlipayTransferNoticeService.java | 2 +- .../alipay/ctrl/AlipayBizController.java | 2 +- .../plspay/PlspayChannelNoticeService.java | 2 +- .../PlspayChannelRefundNoticeService.java | 2 +- .../pay/channel/plspay/payway/AliApp.java | 2 +- .../pay/channel/plspay/payway/AliBar.java | 2 +- .../pay/channel/plspay/payway/AliJsapi.java | 2 +- .../pay/channel/plspay/payway/AliLite.java | 2 +- .../pay/channel/plspay/payway/WxApp.java | 2 +- .../pay/channel/plspay/payway/WxBar.java | 2 +- .../pay/channel/plspay/payway/WxJsapi.java | 2 +- .../pay/channel/plspay/payway/WxLite.java | 2 +- .../pay/channel/pppay/PppayRefundService.java | 2 +- .../wxpay/WxpayChannelNoticeService.java | 2 +- .../WxpayChannelRefundNoticeService.java | 2 +- .../wxpay/WxpayChannelUserService.java | 2 +- .../channel/wxpay/WxpayDivisionService.java | 6 +- .../wxpay/WxpayPayOrderCloseService.java | 2 +- .../wxpay/WxpayPayOrderQueryService.java | 2 +- .../channel/wxpay/WxpayPaymentService.java | 2 +- .../pay/channel/wxpay/WxpayRefundService.java | 2 +- .../pay/channel/wxpay/kits/WxpayV3Util.java | 4 +- .../wxpay/model/WxpayV3OrderRequestModel.java | 2 +- .../pay/channel/wxpay/payway/WxApp.java | 4 +- .../pay/channel/wxpay/payway/WxJsapi.java | 4 +- .../pay/channel/wxpay/payway/WxLite.java | 4 +- .../pay/channel/wxpay/paywayV3/WxApp.java | 4 +- .../pay/channel/wxpay/paywayV3/WxH5.java | 2 +- .../pay/channel/wxpay/paywayV3/WxJsapi.java | 4 +- .../pay/channel/wxpay/paywayV3/WxLite.java | 4 +- .../pay/channel/wxpay/paywayV3/WxNative.java | 2 +- .../xxpay/XxpayChannelNoticeService.java | 2 +- .../XxpayChannelRefundNoticeService.java | 2 +- .../xxpay/XxpayPayOrderQueryService.java | 2 +- .../channel/xxpay/XxpayPaymentService.java | 2 +- .../pay/channel/xxpay/XxpayRefundService.java | 2 +- .../pay/channel/xxpay/payway/AliJsapi.java | 2 +- .../pay/channel/xxpay/payway/WxJsapi.java | 2 +- .../ysfpay/YsfpayChannelNoticeService.java | 4 +- .../ysfpay/YsfpayPayOrderCloseService.java | 2 +- .../ysfpay/YsfpayPayOrderQueryService.java | 2 +- .../channel/ysfpay/YsfpayPaymentService.java | 2 +- .../channel/ysfpay/YsfpayRefundService.java | 2 +- .../pay/channel/ysfpay/payway/AliBar.java | 2 +- .../pay/channel/ysfpay/payway/AliJsapi.java | 4 +- .../pay/channel/ysfpay/payway/WxBar.java | 2 +- .../pay/channel/ysfpay/payway/WxJsapi.java | 2 +- .../pay/channel/ysfpay/payway/YsfBar.java | 2 +- .../pay/channel/ysfpay/payway/YsfJsapi.java | 2 +- .../pay/channel/ysfpay/utils/YsfHttpUtil.java | 2 +- .../channel/ysfpay/utils/YsfSignUtils.java | 2 +- .../jeepay/pay/ctrl/ApiController.java | 4 +- .../PayOrderDivisionExecController.java | 6 +- .../pay/ctrl/qr/ChannelUserIdController.java | 4 +- .../jeequan/jeepay/pay/rqrs/AbstractRS.java | 2 +- .../pay/rqrs/payorder/ClosePayOrderRS.java | 2 +- .../pay/rqrs/payorder/UnifiedOrderRQ.java | 4 +- .../pay/rqrs/payorder/UnifiedOrderRS.java | 2 +- .../pay/service/PayMchNotifyService.java | 10 +- .../jeequan/jeepay/pay/util/CodeImgUtil.java | 4 +- jeepay-service/pom.xml | 2 +- .../jeequan/jeepay/facade/JeepayFacade.java | 292 ++++++++++++++++++ .../jeepay/service/impl/IsvInfoService.java | 32 -- .../jeepay/service/impl/MchAppService.java | 28 -- .../jeepay/service/impl/MchInfoService.java | 134 -------- .../service/impl/MchPayPassageService.java | 2 +- .../impl/PayInterfaceConfigService.java | 103 ------ .../jeepay/service/impl/PayOrderService.java | 6 +- .../service/impl/RefundOrderService.java | 2 +- .../jeepay/service/impl/SysConfigService.java | 7 +- .../service/impl/TransferOrderService.java | 2 +- .../service/mapper/MchPayPassageMapper.java | 2 +- .../service/mapper/MchPayPassageMapper.xml | 2 +- jeepay-z-codegen/pom.xml | 6 +- pom.xml | 36 ++- 169 files changed, 664 insertions(+), 700 deletions(-) create mode 100644 jeepay-service/src/main/java/com/jeequan/jeepay/facade/JeepayFacade.java diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/CleanMchLoginAuthCacheMQ.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/CleanMchLoginAuthCacheMQ.java index 7fbdb6a..592fba1 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/CleanMchLoginAuthCacheMQ.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/CleanMchLoginAuthCacheMQ.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.components.mq.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.constant.MQSendTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderDivisionMQ.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderDivisionMQ.java index f756dc7..f09b7b9 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderDivisionMQ.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderDivisionMQ.java @@ -15,9 +15,9 @@ */ package com.jeequan.jeepay.components.mq.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.constant.MQSendTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderMchNotifyMQ.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderMchNotifyMQ.java index af4515a..0b51143 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderMchNotifyMQ.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderMchNotifyMQ.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.components.mq.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.constant.MQSendTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderReissueMQ.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderReissueMQ.java index 785078d..97ac43e 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderReissueMQ.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/PayOrderReissueMQ.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.components.mq.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.constant.MQSendTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetAppConfigMQ.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetAppConfigMQ.java index 023a54f..668bf10 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetAppConfigMQ.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetAppConfigMQ.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.components.mq.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.constant.MQSendTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetIsvMchAppInfoConfigMQ.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetIsvMchAppInfoConfigMQ.java index 6ea991e..1a5794d 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetIsvMchAppInfoConfigMQ.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetIsvMchAppInfoConfigMQ.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.components.mq.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.constant.MQSendTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java index e02759b..22d834b 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQSender.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.components.mq.vender.aliyunrocketmq; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.aliyun.openservices.ons.api.Message; import com.aliyun.openservices.ons.api.Producer; import com.aliyun.openservices.ons.api.SendResult; diff --git a/jeepay-core/pom.xml b/jeepay-core/pom.xml index e409290..807a2ab 100644 --- a/jeepay-core/pom.xml +++ b/jeepay-core/pom.xml @@ -73,6 +73,10 @@ com.alibaba fastjson + + com.alibaba.fastjson2 + fastjson2-extension-spring5 + diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/beans/RequestKitBean.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/beans/RequestKitBean.java index fc4c4fb..db77bb9 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/beans/RequestKitBean.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/beans/RequestKitBean.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.core.beans; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.ApiCodeEnum; import com.jeequan.jeepay.core.exception.BizException; import lombok.extern.slf4j.Slf4j; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/cache/RedisUtil.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/cache/RedisUtil.java index 1cff16e..95730a9 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/cache/RedisUtil.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/cache/RedisUtil.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.core.cache; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.jeequan.jeepay.core.utils.SpringBeansUtil; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/ctrls/AbstractCtrl.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/ctrls/AbstractCtrl.java index d5e4824..a113f20 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/ctrls/AbstractCtrl.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/ctrls/AbstractCtrl.java @@ -16,8 +16,8 @@ package com.jeequan.jeepay.core.ctrls; import cn.hutool.core.text.CharSequenceUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jeequan.jeepay.core.beans.RequestKitBean; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/PayInterfaceDefine.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/PayInterfaceDefine.java index 16e6a11..23302cf 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/PayInterfaceDefine.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/PayInterfaceDefine.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.core.entity; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTPayload.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTPayload.java index 33c04d9..273a081 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTPayload.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTPayload.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.core.jwt; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.security.JeeUserDetails; import lombok.Data; @@ -40,7 +40,7 @@ public class JWTPayload { private Long created; //创建时间, 格式：13位时间戳 private String cacheKey; //redis保存的key - protected JWTPayload(){} + public JWTPayload(){} public JWTPayload(JeeUserDetails jeeUserDetails){ @@ -52,7 +52,7 @@ public class JWTPayload { /** toMap **/ public Map toMap(){ - JSONObject json = (JSONObject)JSONObject.toJSON(this); + JSONObject json = JSONObject.from(this); return json.toJavaObject(Map.class); } diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTUtils.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTUtils.java index bd8aa17..a1af3ab 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTUtils.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/jwt/JWTUtils.java @@ -18,6 +18,11 @@ package com.jeequan.jeepay.core.jwt; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; /* * JWT工具包 @@ -30,18 +35,22 @@ public class JWTUtils { /** 生成token **/ public static String generateToken(JWTPayload jwtPayload, String jwtSecret) { +// byte[] keyBytes = Decoders.BASE64.decode(jwtSecret); + byte[] keyBytes = jwtSecret.getBytes(StandardCharsets.UTF_8); return Jwts.builder() - .setClaims(jwtPayload.toMap()) + .claims(jwtPayload.toMap()) //过期时间 = 当前时间 + （设置过期时间[单位 ：s ] ） token放置redis 过期时间无意义 //.setExpiration(new Date(System.currentTimeMillis() + (jwtExpiration * 1000) )) - .signWith(SignatureAlgorithm.HS512, jwtSecret) + .signWith(Keys.hmacShaKeyFor(keyBytes)) .compact(); } /** 根据token与秘钥 解析token并转换为 JWTPayload **/ - public static JWTPayload parseToken(String token, String secret){ + public static JWTPayload parseToken(String token, String jwtSecret){ +// byte[] keyBytes = Decoders.BASE64.decode(jwtSecret); + byte[] keyBytes = jwtSecret.getBytes(StandardCharsets.UTF_8); try { - Claims claims = Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody(); + Claims claims = Jwts.parser().verifyWith(Keys.hmacShaKeyFor(keyBytes)).build().parseSignedClaims(token).getPayload(); JWTPayload result = new JWTPayload(); result.setSysUserId(claims.get("sysUserId", Long.class)); @@ -55,5 +64,4 @@ public class JWTUtils { } } - } diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/ApiRes.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/ApiRes.java index bd29e74..76e4855 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/ApiRes.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/ApiRes.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.constants.ApiCodeEnum; import com.jeequan.jeepay.core.utils.JeepayKit; @@ -73,7 +73,7 @@ public class ApiRes implements Serializable { return new ApiRes(ApiCodeEnum.SUCCESS.getCode(), ApiCodeEnum.SUCCESS.getMsg(), null, null); } - JSONObject jsonObject = (JSONObject)JSONObject.toJSON(data); + JSONObject jsonObject = JSONObject.from(data); String sign = JeepayKit.getSign(jsonObject, mchKey); return new ApiRes(ApiCodeEnum.SUCCESS.getCode(), ApiCodeEnum.SUCCESS.getMsg(), data, sign); } diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/BaseModel.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/BaseModel.java index a867c7f..67210c5 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/BaseModel.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/BaseModel.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.core.model; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/DBApplicationConfig.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/DBApplicationConfig.java index 809e0a8..6815aa9 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/DBApplicationConfig.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/DBApplicationConfig.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.core.model; import cn.hutool.core.util.URLUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.utils.JeepayKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvParams.java index 4392f04..d8c9b06 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvParams.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.core.model.params; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; /** * 抽象类 isv参数定义 diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvsubMchParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvsubMchParams.java index 085fd94..c7059e4 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvsubMchParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/IsvsubMchParams.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.core.model.params; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; /* * 抽象类 特约商户参数定义 diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/NormalMchParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/NormalMchParams.java index 73d9346..747df77 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/NormalMchParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/NormalMchParams.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.core.model.params; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; /* * 抽象类 普通商户参数定义 diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayIsvParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayIsvParams.java index 2e1a7c8..b2943c7 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayIsvParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayIsvParams.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model.params.alipay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.IsvParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayNormalMchParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayNormalMchParams.java index 470efa8..b149a3b 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayNormalMchParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayNormalMchParams.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model.params.alipay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.NormalMchParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/plspay/PlspayNormalMchParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/plspay/PlspayNormalMchParams.java index 9d1cf1c..c32c3a7 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/plspay/PlspayNormalMchParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/plspay/PlspayNormalMchParams.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model.params.plspay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.NormalMchParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/pppay/PppayNormalMchParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/pppay/PppayNormalMchParams.java index 18071f0..b198735 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/pppay/PppayNormalMchParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/pppay/PppayNormalMchParams.java @@ -1,7 +1,7 @@ package com.jeequan.jeepay.core.model.params.pppay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.NormalMchParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayIsvParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayIsvParams.java index 82217c0..94ac87d 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayIsvParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayIsvParams.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model.params.wxpay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.IsvParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayNormalMchParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayNormalMchParams.java index f4509d9..600c83f 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayNormalMchParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/wxpay/WxpayNormalMchParams.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model.params.wxpay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.NormalMchParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/xxpay/XxpayNormalMchParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/xxpay/XxpayNormalMchParams.java index c6a7d3e..8955965 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/xxpay/XxpayNormalMchParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/xxpay/XxpayNormalMchParams.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model.params.xxpay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.NormalMchParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/ysf/YsfpayIsvParams.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/ysf/YsfpayIsvParams.java index 9570e2b..637205a 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/ysf/YsfpayIsvParams.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/ysf/YsfpayIsvParams.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.model.params.ysf; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.params.IsvParams; import com.jeequan.jeepay.core.utils.StringKit; import lombok.Data; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/ApiResBodyAdviceKit.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/ApiResBodyAdviceKit.java index 856d379..5d2bfdb 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/ApiResBodyAdviceKit.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/ApiResBodyAdviceKit.java @@ -15,9 +15,9 @@ */ package com.jeequan.jeepay.core.utils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.OriginalRes; import com.jeequan.jeepay.core.model.ApiRes; import org.springframework.core.io.InputStreamResource; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/JsonKit.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/JsonKit.java index 5e2e139..5a498a4 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/JsonKit.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/JsonKit.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.core.utils; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; /* * json工具类 diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/StringKit.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/StringKit.java index 06cec79..399a670 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/StringKit.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/StringKit.java @@ -17,7 +17,7 @@ package com.jeequan.jeepay.core.utils; import cn.hutool.core.net.url.UrlBuilder; import cn.hutool.core.util.URLUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import org.apache.commons.lang3.StringUtils; import java.util.Map; diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/TreeDataBuilder.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/TreeDataBuilder.java index 2716634..4cdd320 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/TreeDataBuilder.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/TreeDataBuilder.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.core.utils; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import java.util.ArrayList; import java.util.Collection; diff --git a/jeepay-manager/pom.xml b/jeepay-manager/pom.xml index afa6b62..2df5d36 100644 --- a/jeepay-manager/pom.xml +++ b/jeepay-manager/pom.xml @@ -41,25 +41,10 @@ org.springframework.boot spring-boot-starter-web - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - + - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.fasterxml.jackson.module - jackson-module-parameter-names - - - org.hibernate.validator - hibernate-validator + org.springframework.boot + spring-boot-starter-json diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java index 62f8f1c..740917f 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.aop; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.core.constants.CS; @@ -90,7 +90,7 @@ public class MethodLogAop { try { // 基础日志信息 setBaseLogInfo(point, sysLog, JeeUserDetails.getCurrentUserDetails()); - sysLog.setOptResInfo(JSONObject.toJSON(result).toString()); + sysLog.setOptResInfo(JSONObject.toJSONString(result)); scheduledThreadPool.execute(() -> sysLogService.save(sysLog)); } catch (Exception e) { logger.error("methodLogError", e); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/InitRunner.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/InitRunner.java index 7cbb703..90fb653 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/InitRunner.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/InitRunner.java @@ -16,10 +16,7 @@ package com.jeequan.jeepay.mgr.bootstrap; import cn.hutool.core.date.DatePattern; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializeConfig; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; +import com.alibaba.fastjson2.JSON; import com.jeequan.jeepay.mgr.config.SystemYmlConfig; import com.jeequan.jeepay.service.impl.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +47,7 @@ public class InitRunner implements CommandLineRunner { SysConfigService.IS_USE_CACHE = systemYmlConfig.getCacheConfig(); //初始化处理fastjson格式 - SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance(); - serializeConfig.put(Date.class, new SimpleDateFormatSerializer(DatePattern.NORM_DATETIME_PATTERN)); - - //解决json 序列化时候的 $ref：问题 - JSON.DEFAULT_GENERATE_FEATURE |= SerializerFeature.DisableCircularReferenceDetect.getMask(); + JSON.configWriterDateFormat(DatePattern.NORM_DATETIME_PATTERN); } } diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/JeepayMgrApplication.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/JeepayMgrApplication.java index 94323b2..89eedb6 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/JeepayMgrApplication.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/JeepayMgrApplication.java @@ -15,10 +15,11 @@ */ package com.jeequan.jeepay.mgr.bootstrap; -import com.alibaba.fastjson.parser.ParserConfig; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.alibaba.fastjson2.support.config.FastJsonConfig; +import com.alibaba.fastjson2.support.spring.http.converter.FastJsonHttpMessageConverter; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import io.swagger.annotations.ApiOperation; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -35,6 +36,7 @@ import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; +import java.nio.charset.StandardCharsets; import java.util.Arrays; /* @@ -68,13 +70,13 @@ public class JeepayMgrApplication { //新建fast-json转换器 FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter(); - // 开启 FastJSON 安全模式！ - ParserConfig.getGlobalInstance().setSafeMode(true); - //fast-json 配置信息 FastJsonConfig config = new FastJsonConfig(); config.setDateFormat("yyyy-MM-dd HH:mm:ss"); +// config.setReaderFeatures(JSONReader.Feature.FieldBased, JSONReader.Feature.SupportArrayToBean); +// config.setWriterFeatures(JSONWriter.Feature.WriteMapNullValue, JSONWriter.Feature.PrettyFormat); converter.setFastJsonConfig(config); + converter.setDefaultCharset(StandardCharsets.UTF_8); //设置响应的 Content-Type converter.setSupportedMediaTypes(Arrays.asList(new MediaType[]{MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON_UTF8})); @@ -83,13 +85,11 @@ public class JeepayMgrApplication { /** Mybatis plus 分页插件 **/ @Bean - public PaginationInterceptor paginationInterceptor() { - PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); - // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求 默认false - // paginationInterceptor.setOverflow(false); - // 设置最大单页限制数量，默认 500 条，-1 不受限制 - // paginationInterceptor.setLimit(500); - return paginationInterceptor; + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加 + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; } diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java index 2e0d607..b73d8ef 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java @@ -16,9 +16,9 @@ package com.jeequan.jeepay.mgr.ctrl; import cn.hutool.core.codec.Base64; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.cache.ITokenService; import com.jeequan.jeepay.core.constants.CS; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java index d6204fa..7abb370 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java @@ -19,7 +19,7 @@ import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.LineCaptcha; import cn.hutool.core.codec.Base64; import cn.hutool.core.lang.UUID; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.cache.RedisUtil; import com.jeequan.jeepay.core.constants.CS; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/MainChartController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/MainChartController.java index 0073b9e..33dcb00 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/MainChartController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/MainChartController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.config; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.mgr.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.PayOrderService; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/SysConfigController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/SysConfigController.java index 1c0ed2e..00bacb2 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/SysConfigController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/SysConfigController.java @@ -15,7 +15,8 @@ */ package com.jeequan.jeepay.mgr.ctrl.config; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jeequan.jeepay.components.mq.model.ResetAppConfigMQ; import com.jeequan.jeepay.components.mq.vender.IMQSender; @@ -102,7 +103,7 @@ public class SysConfigController extends CommonCtrl { @RequestMapping(value="/{groupKey}", method = RequestMethod.PUT) public ApiRes update(@PathVariable("groupKey") String groupKey) { JSONObject paramJSON = getReqParamJSON(); - Map updateMap = JSONObject.toJavaObject(paramJSON, Map.class); + Map updateMap = JSON.toJavaObject(paramJSON, Map.class); int update = sysConfigService.updateByConfigKey(updateMap); if(update <= 0) { return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "更新失败"); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java index 2719afb..11cdcdd 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java @@ -25,6 +25,7 @@ import com.jeequan.jeepay.core.constants.ApiCodeEnum; import com.jeequan.jeepay.core.entity.IsvInfo; import com.jeequan.jeepay.core.model.ApiPageRes; import com.jeequan.jeepay.core.model.ApiRes; +import com.jeequan.jeepay.facade.JeepayFacade; import com.jeequan.jeepay.mgr.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.IsvInfoService; import io.swagger.annotations.Api; @@ -51,6 +52,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/isvInfo") public class IsvInfoController extends CommonCtrl { + @Autowired private JeepayFacade jeepayFacade; @Autowired private IsvInfoService isvInfoService; @Autowired private IMQSender mqSender; @@ -134,7 +136,7 @@ public class IsvInfoController extends CommonCtrl { @MethodLog(remark = "删除服务商") @RequestMapping(value="/{isvNo}", method = RequestMethod.DELETE) public ApiRes delete(@PathVariable("isvNo") String isvNo) { - isvInfoService.removeByIsvNo(isvNo); + jeepayFacade.removeByIsvNo(isvNo); // 推送mq到目前节点进行更新数据 mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_ISV_INFO, isvNo, null, null)); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvPayInterfaceConfigController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvPayInterfaceConfigController.java index 50deca9..d5d6c78 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvPayInterfaceConfigController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvPayInterfaceConfigController.java @@ -25,6 +25,7 @@ import com.jeequan.jeepay.core.entity.PayInterfaceDefine; import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.core.model.params.IsvParams; import com.jeequan.jeepay.core.utils.StringKit; +import com.jeequan.jeepay.facade.JeepayFacade; import com.jeequan.jeepay.mgr.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.PayInterfaceConfigService; import io.swagger.annotations.Api; @@ -51,6 +52,7 @@ import java.util.List; @RequestMapping("/api/isv/payConfigs") public class IsvPayInterfaceConfigController extends CommonCtrl { + @Autowired private JeepayFacade jeepayFacade; @Autowired private PayInterfaceConfigService payInterfaceConfigService; @Autowired private IMQSender mqSender; @@ -68,7 +70,7 @@ public class IsvPayInterfaceConfigController extends CommonCtrl { @GetMapping public ApiRes> list() { - List list = payInterfaceConfigService.selectAllPayIfConfigListByIsvNo(CS.INFO_TYPE_ISV, getValStringRequired("isvNo")); + List list = jeepayFacade.selectAllPayIfConfigListByIsvNo(CS.INFO_TYPE_ISV, getValStringRequired("isvNo")); return ApiRes.ok(list); } diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java index a029285..b999d55 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java @@ -24,6 +24,7 @@ import com.jeequan.jeepay.core.constants.ApiCodeEnum; import com.jeequan.jeepay.core.entity.MchApp; import com.jeequan.jeepay.core.model.ApiPageRes; import com.jeequan.jeepay.core.model.ApiRes; +import com.jeequan.jeepay.facade.JeepayFacade; import com.jeequan.jeepay.mgr.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.MchAppService; import com.jeequan.jeepay.service.impl.MchInfoService; @@ -48,6 +49,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/api/mchApps") public class MchAppController extends CommonCtrl { + @Autowired private JeepayFacade jeepayFacade; @Autowired private MchInfoService mchInfoService; @Autowired private MchAppService mchAppService; @Autowired private IMQSender mqSender; @@ -175,7 +177,7 @@ public class MchAppController extends CommonCtrl { public ApiRes delete(@PathVariable("appId") String appId) { MchApp mchApp = mchAppService.getById(appId); - mchAppService.removeByAppId(appId); + jeepayFacade.removeByAppId(appId); // 推送mq到目前节点进行更新数据 mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), appId)); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java index df2d347..f4654d9 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java @@ -17,7 +17,7 @@ package com.jeequan.jeepay.mgr.ctrl.merchant; import cn.hutool.core.codec.Base64; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.components.mq.model.CleanMchLoginAuthCacheMQ; @@ -30,6 +30,7 @@ import com.jeequan.jeepay.core.entity.MchInfo; import com.jeequan.jeepay.core.entity.SysUser; import com.jeequan.jeepay.core.model.ApiPageRes; import com.jeequan.jeepay.core.model.ApiRes; +import com.jeequan.jeepay.facade.JeepayFacade; import com.jeequan.jeepay.mgr.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.MchInfoService; import com.jeequan.jeepay.service.impl.SysUserAuthService; @@ -60,6 +61,7 @@ import java.util.*; @RequestMapping("/api/mchInfo") public class MchInfoController extends CommonCtrl { + @Autowired private JeepayFacade jeepayFacade; @Autowired private MchInfoService mchInfoService; @Autowired private SysUserService sysUserService; @Autowired private SysUserAuthService sysUserAuthService; @@ -140,7 +142,7 @@ public class MchInfoController extends CommonCtrl { mchInfo.setCreatedUid(sysUser.getSysUserId()); mchInfo.setCreatedBy(sysUser.getRealname()); - mchInfoService.addMch(mchInfo, loginUserName); + jeepayFacade.addMch(mchInfo, loginUserName); return ApiRes.ok(); } @@ -158,7 +160,7 @@ public class MchInfoController extends CommonCtrl { @MethodLog(remark = "删除商户") @RequestMapping(value="/{mchNo}", method = RequestMethod.DELETE) public ApiRes delete(@PathVariable("mchNo") String mchNo) { - List userIdList = mchInfoService.removeByMchNo(mchNo); + List userIdList = jeepayFacade.removeByMchNo(mchNo); // 推送mq删除redis用户缓存 mqSender.send(CleanMchLoginAuthCacheMQ.build(userIdList)); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayInterfaceConfigController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayInterfaceConfigController.java index a377372..a55c1cf 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayInterfaceConfigController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayInterfaceConfigController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.merchant; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ; import com.jeequan.jeepay.components.mq.vender.IMQSender; import com.jeequan.jeepay.core.aop.MethodLog; @@ -29,6 +29,7 @@ import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.core.model.DBApplicationConfig; import com.jeequan.jeepay.core.model.params.NormalMchParams; import com.jeequan.jeepay.core.utils.StringKit; +import com.jeequan.jeepay.facade.JeepayFacade; import com.jeequan.jeepay.mgr.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.MchAppService; import com.jeequan.jeepay.service.impl.MchInfoService; @@ -58,6 +59,7 @@ import java.util.List; @RequestMapping("/api/mch/payConfigs") public class MchPayInterfaceConfigController extends CommonCtrl { + @Autowired private JeepayFacade jeepayFacade; @Autowired private PayInterfaceConfigService payInterfaceConfigService; @Autowired private MchAppService mchAppService; @Autowired private IMQSender mqSender; @@ -78,7 +80,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl { @GetMapping public ApiRes> list() { - List list = payInterfaceConfigService.selectAllPayIfConfigListByAppId(getValStringRequired("appId")); + List list = jeepayFacade.selectAllPayIfConfigListByAppId(getValStringRequired("appId")); return ApiRes.ok(list); } diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayPassageConfigController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayPassageConfigController.java index f1b205d..698a0b5 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayPassageConfigController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayPassageConfigController.java @@ -16,8 +16,8 @@ package com.jeequan.jeepay.mgr.ctrl.merchant; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.aop.MethodLog; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java index fd9fccb..f9b8bab 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.order; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.components.mq.model.PayOrderMchNotifyMQ; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java index cc9609a..70e5a10 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.order; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.JeepayClient; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java index 2825fe2..210af3b 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.order; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.constants.ApiCodeEnum; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java index 4083b4e..7947469 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.order; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.constants.ApiCodeEnum; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/payconfig/PayInterfaceDefineController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/payconfig/PayInterfaceDefineController.java index 4a0e97e..bc2dc6d 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/payconfig/PayInterfaceDefineController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/payconfig/PayInterfaceDefineController.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.mgr.ctrl.payconfig; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.constants.ApiCodeEnum; import com.jeequan.jeepay.core.entity.PayInterfaceConfig; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysEntController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysEntController.java index 8cc1d69..a35378f 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysEntController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysEntController.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.mgr.ctrl.sysuser; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.entity.SysEntitlement; import com.jeequan.jeepay.core.model.ApiRes; @@ -104,7 +104,7 @@ public class SysEntController extends CommonCtrl { List list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, getValStringRequired("sysType"))); //转换为json树状结构 - JSONArray jsonArray = (JSONArray) JSONArray.toJSON(list); + JSONArray jsonArray = JSONArray.from(list); List leftMenuTree = new TreeDataBuilder(jsonArray, "entId", "pid", "children", "entSort", true) .buildTreeObject(); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java index 8630a06..3f4601a 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.sysuser; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.aop.MethodLog; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysRoleController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysRoleController.java index c69149e..d26ce00 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysRoleController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysRoleController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.sysuser; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysUserRoleRelaController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysUserRoleRelaController.java index a028d65..1ec8583 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysUserRoleRelaController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysUserRoleRelaController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mgr.ctrl.sysuser; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.aop.MethodLog; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/secruity/WebSecurityConfig.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/secruity/WebSecurityConfig.java index 56e1592..5307660 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/secruity/WebSecurityConfig.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/secruity/WebSecurityConfig.java @@ -27,10 +27,12 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @@ -46,33 +48,29 @@ import org.springframework.web.filter.CorsFilter; @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) //开启@PreAuthorize @PostAuthorize 等前置后置安全校验注解 -public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ +public class WebSecurityConfig { @Autowired private UserDetailsService userDetailsService; @Autowired private JeeAuthenticationEntryPoint unauthorizedHandler; @Autowired private SystemYmlConfig systemYmlConfig; - @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); - } - - /** * 使用BCrypt强哈希函数 实现PasswordEncoder * **/ @Bean - public PasswordEncoder passwordEncoder() { + public BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } - @Autowired - public void configureAuthentication(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception { - authenticationManagerBuilder + @Bean + public AuthenticationManager authenticationManager(HttpSecurity http, BCryptPasswordEncoder bCryptPasswordEncoder) + throws Exception { + return http.getSharedObject(AuthenticationManagerBuilder.class) .userDetailsService(this.userDetailsService) - .passwordEncoder(passwordEncoder()); + .passwordEncoder(bCryptPasswordEncoder) + .and() + .build(); } /** 允许跨域请求 **/ @@ -92,8 +90,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ return new CorsFilter(source); } - @Override - protected void configure(HttpSecurity httpSecurity) throws Exception { + @Bean + public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { httpSecurity // 由于使用的是JWT，我们这里不需要csrf .csrf().disable() @@ -116,14 +114,15 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ // 禁用缓存 httpSecurity.headers().cacheControl(); + return httpSecurity.build(); } - @Override - public void configure(WebSecurity web) throws Exception { + @Bean + public WebSecurityCustomizer webSecurityCustomizer() { //ignore文件 ： 无需进入spring security 框架 // 1.允许对于网站静态资源的无授权访问 // 2.对于获取token的rest api要允许匿名访问 - web.ignoring().antMatchers( + return (web) -> web.ignoring().antMatchers( HttpMethod.GET, "/", "/*.html", diff --git a/jeepay-manager/src/main/resources/application.yml b/jeepay-manager/src/main/resources/application.yml index eb2b822..3d60065 100644 --- a/jeepay-manager/src/main/resources/application.yml +++ b/jeepay-manager/src/main/resources/application.yml @@ -7,4 +7,4 @@ spring: #系统业务参数 isys: - jwt-secret: t7w3P8X6472qWc3u #生成jwt的秘钥。 要求每个系统有单独的秘钥管理机制。 + jwt-secret: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 #生成jwt的秘钥。 要求每个系统有单独的秘钥管理机制。 diff --git a/jeepay-merchant/pom.xml b/jeepay-merchant/pom.xml index e7959cf..a250ee4 100644 --- a/jeepay-merchant/pom.xml +++ b/jeepay-merchant/pom.xml @@ -41,25 +41,10 @@ org.springframework.boot spring-boot-starter-web - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - + - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.fasterxml.jackson.module - jackson-module-parameter-names - - - org.hibernate.validator - hibernate-validator + org.springframework.boot + spring-boot-starter-json diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java index 4c78dd6..e3ab3f3 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.aop; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.core.constants.CS; @@ -90,7 +90,7 @@ public class MethodLogAop{ try { // 基础日志信息 setBaseLogInfo(point, sysLog, JeeUserDetails.getCurrentUserDetails()); - sysLog.setOptResInfo(JSONObject.toJSON(result).toString()); + sysLog.setOptResInfo(JSONObject.toJSONString(result)); scheduledThreadPool.execute(new Runnable() { @Override public void run() { diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/InitRunner.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/InitRunner.java index 64d4ce2..c9e6fff 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/InitRunner.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/InitRunner.java @@ -16,11 +16,7 @@ package com.jeequan.jeepay.mch.bootstrap; import cn.hutool.core.date.DatePattern; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializeConfig; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; -import com.jeequan.jeepay.core.utils.DateKit; +import com.alibaba.fastjson2.JSON; import com.jeequan.jeepay.mch.config.SystemYmlConfig; import com.jeequan.jeepay.service.impl.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +47,7 @@ public class InitRunner implements CommandLineRunner { SysConfigService.IS_USE_CACHE = systemYmlConfig.getCacheConfig(); //初始化处理fastjson格式 - SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance(); - serializeConfig.put(Date.class, new SimpleDateFormatSerializer(DatePattern.NORM_DATETIME_PATTERN)); - - //解决json 序列化时候的 $ref：问题 - JSON.DEFAULT_GENERATE_FEATURE |= SerializerFeature.DisableCircularReferenceDetect.getMask(); + JSON.configWriterDateFormat(DatePattern.NORM_DATETIME_PATTERN); } } diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/JeepayMchApplication.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/JeepayMchApplication.java index 3e594c9..4d1f9f7 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/JeepayMchApplication.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/bootstrap/JeepayMchApplication.java @@ -15,10 +15,11 @@ */ package com.jeequan.jeepay.mch.bootstrap; -import com.alibaba.fastjson.parser.ParserConfig; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.alibaba.fastjson2.support.config.FastJsonConfig; +import com.alibaba.fastjson2.support.spring.http.converter.FastJsonHttpMessageConverter; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import io.swagger.annotations.ApiOperation; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -35,6 +36,7 @@ import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; +import java.nio.charset.StandardCharsets; import java.util.Arrays; /** @@ -68,13 +70,13 @@ public class JeepayMchApplication { //新建fast-json转换器 FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter(); - // 开启 FastJSON 安全模式！ - ParserConfig.getGlobalInstance().setSafeMode(true); - //fast-json 配置信息 FastJsonConfig config = new FastJsonConfig(); config.setDateFormat("yyyy-MM-dd HH:mm:ss"); +// config.setReaderFeatures(JSONReader.Feature.FieldBased, JSONReader.Feature.SupportArrayToBean); +// config.setWriterFeatures(JSONWriter.Feature.WriteMapNullValue, JSONWriter.Feature.PrettyFormat); converter.setFastJsonConfig(config); + converter.setDefaultCharset(StandardCharsets.UTF_8); //设置响应的 Content-Type converter.setSupportedMediaTypes(Arrays.asList(new MediaType[]{MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON_UTF8})); @@ -83,13 +85,11 @@ public class JeepayMchApplication { /** Mybatis plus 分页插件 **/ @Bean - public PaginationInterceptor paginationInterceptor() { - PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); - // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求 默认false - // paginationInterceptor.setOverflow(false); - // 设置最大单页限制数量，默认 500 条，-1 不受限制 - // paginationInterceptor.setLimit(500); - return paginationInterceptor; + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加 + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; } diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java index fb6e6c9..7c655ab 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java @@ -16,9 +16,9 @@ package com.jeequan.jeepay.mch.ctrl; import cn.hutool.core.codec.Base64; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.cache.ITokenService; import com.jeequan.jeepay.core.constants.CS; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java index c103831..7b551ee 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java @@ -19,7 +19,7 @@ import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.LineCaptcha; import cn.hutool.core.codec.Base64; import cn.hutool.core.lang.UUID; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.cache.RedisUtil; import com.jeequan.jeepay.core.constants.CS; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/division/PayOrderDivisionRecordController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/division/PayOrderDivisionRecordController.java index 3fb0e11..af8fd2d 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/division/PayOrderDivisionRecordController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/division/PayOrderDivisionRecordController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.division; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.components.mq.model.PayOrderDivisionMQ; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MainChartController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MainChartController.java index 4c6fe73..20f8c8d 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MainChartController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MainChartController.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.mch.ctrl.merchant; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.MchInfo; import com.jeequan.jeepay.core.entity.SysUser; import com.jeequan.jeepay.core.model.ApiRes; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java index 9c6e48e..c71bba9 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java @@ -25,6 +25,7 @@ import com.jeequan.jeepay.core.entity.MchApp; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.ApiPageRes; import com.jeequan.jeepay.core.model.ApiRes; +import com.jeequan.jeepay.facade.JeepayFacade; import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.MchAppService; import io.swagger.annotations.Api; @@ -47,6 +48,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/api/mchApps") public class MchAppController extends CommonCtrl { + @Autowired private JeepayFacade jeepayFacade; @Autowired private MchAppService mchAppService; @Autowired private IMQSender mqSender; @@ -179,7 +181,7 @@ public class MchAppController extends CommonCtrl { throw new BizException("无权操作！"); } - mchAppService.removeByAppId(appId); + jeepayFacade.removeByAppId(appId); // 推送mq到目前节点进行更新数据 mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), appId)); diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayInterfaceConfigController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayInterfaceConfigController.java index 0061722..d08426b 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayInterfaceConfigController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayInterfaceConfigController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.merchant; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ; import com.jeequan.jeepay.components.mq.vender.IMQSender; import com.jeequan.jeepay.core.aop.MethodLog; @@ -27,6 +27,7 @@ import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.core.model.DBApplicationConfig; import com.jeequan.jeepay.core.model.params.NormalMchParams; import com.jeequan.jeepay.core.utils.StringKit; +import com.jeequan.jeepay.facade.JeepayFacade; import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.service.impl.*; import io.swagger.annotations.Api; @@ -55,6 +56,7 @@ import java.util.Set; @RequestMapping("/api/mch/payConfigs") public class MchPayInterfaceConfigController extends CommonCtrl { + @Autowired private JeepayFacade jeepayFacade; @Autowired private PayInterfaceConfigService payInterfaceConfigService; @Autowired private MchInfoService mchInfoService; @Autowired private MchAppService mchAppService; @@ -75,7 +77,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl { @GetMapping public ApiRes> list() { MchInfo mchInfo = mchInfoService.getById(getCurrentUser().getSysUser().getBelongInfoId()); - List list = payInterfaceConfigService.selectAllPayIfConfigListByAppId(getValStringRequired("appId")); + List list = jeepayFacade.selectAllPayIfConfigListByAppId(getValStringRequired("appId")); for (PayInterfaceDefine define : list) { define.addExt("mchParams", mchInfo.getType() == CS.MCH_TYPE_NORMAL ? define.getNormalMchParams() : define.getIsvsubMchParams()); diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayPassageConfigController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayPassageConfigController.java index 86aae36..16bbe70 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayPassageConfigController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayPassageConfigController.java @@ -16,8 +16,8 @@ package com.jeequan.jeepay.mch.ctrl.merchant; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.aop.MethodLog; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java index 2153897..5096aed 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.order; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.JeepayClient; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java index 6a298de..c585c53 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.order; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.constants.ApiCodeEnum; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java index 778f004..06c35c4 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.order; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.constants.ApiCodeEnum; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestController.java index 576dd59..e12437a 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.paytest; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.JeepayClient; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.MchApp; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestNotifyController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestNotifyController.java index e125b0c..ea3353e 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestNotifyController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestNotifyController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.paytest; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.MchApp; import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.websocket.server.WsPayOrderServer; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysEntController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysEntController.java index 6f6d38c..f24fbc8 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysEntController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysEntController.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.mch.ctrl.sysuser; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.SysEntitlement; import com.jeequan.jeepay.core.model.ApiRes; @@ -64,7 +64,7 @@ public class SysEntController extends CommonCtrl { List list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, CS.SYS_TYPE.MCH)); //4. 转换为json树状结构 - JSONArray jsonArray = (JSONArray) JSONArray.toJSON(list); + JSONArray jsonArray = JSONArray.from(list); List leftMenuTree = new TreeDataBuilder(jsonArray, "entId", "pid", "children", "entSort", true) .buildTreeObject(); diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleController.java index cb4e6ac..000fe92 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.sysuser; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleEntRelaController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleEntRelaController.java index 7c0f4cc..28a1e5f 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleEntRelaController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleEntRelaController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.sysuser; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.constants.ApiCodeEnum; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserRoleRelaController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserRoleRelaController.java index 317b4bf..284653a 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserRoleRelaController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserRoleRelaController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.sysuser; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jeequan.jeepay.core.constants.ApiCodeEnum; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/ChannelUserIdNotifyController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/ChannelUserIdNotifyController.java index ea98221..3f05697 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/ChannelUserIdNotifyController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/ChannelUserIdNotifyController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.transfer; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.websocket.server.WsChannelUserIdServer; import io.swagger.annotations.Api; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/MchTransferController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/MchTransferController.java index 2f93530..9b30c61 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/MchTransferController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/transfer/MchTransferController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.ctrl.transfer; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.JeepayClient; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.MchApp; diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/secruity/WebSecurityConfig.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/secruity/WebSecurityConfig.java index 58d49a1..725ffd7 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/secruity/WebSecurityConfig.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/secruity/WebSecurityConfig.java @@ -27,10 +27,12 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @@ -46,33 +48,28 @@ import org.springframework.web.filter.CorsFilter; @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) //开启@PreAuthorize @PostAuthorize 等前置后置安全校验注解 -public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ +public class WebSecurityConfig { @Autowired private UserDetailsService userDetailsService; @Autowired private JeeAuthenticationEntryPoint unauthorizedHandler; @Autowired private SystemYmlConfig systemYmlConfig; - @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); - } - - - /** * 使用BCrypt强哈希函数 实现PasswordEncoder * **/ @Bean - public PasswordEncoder passwordEncoder() { + public BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } - @Autowired - public void configureAuthentication(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception { - authenticationManagerBuilder + @Bean + public AuthenticationManager authenticationManager(HttpSecurity http, BCryptPasswordEncoder bCryptPasswordEncoder) + throws Exception { + return http.getSharedObject(AuthenticationManagerBuilder.class) .userDetailsService(this.userDetailsService) - .passwordEncoder(passwordEncoder()); + .passwordEncoder(bCryptPasswordEncoder) + .and() + .build(); } /** 允许跨域请求 **/ @@ -92,8 +89,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ return new CorsFilter(source); } - @Override - protected void configure(HttpSecurity httpSecurity) throws Exception { + @Bean + protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { httpSecurity // 由于使用的是JWT，我们这里不需要csrf .csrf().disable() @@ -116,14 +113,15 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ // 禁用缓存 httpSecurity.headers().cacheControl(); + return httpSecurity.build(); } - @Override - public void configure(WebSecurity web) throws Exception { + @Bean + public WebSecurityCustomizer webSecurityCustomizer() { //ignore文件 ： 无需进入spring security 框架 // 1.允许对于网站静态资源的无授权访问 // 2.对于获取token的rest api要允许匿名访问 - web.ignoring().antMatchers( + return (web) -> web.ignoring().antMatchers( HttpMethod.GET, "/", "/*.html", diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/websocket/server/WsPayOrderServer.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/websocket/server/WsPayOrderServer.java index 8d0d40f..ce43d14 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/websocket/server/WsPayOrderServer.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/websocket/server/WsPayOrderServer.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.mch.websocket.server; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/jeepay-merchant/src/main/resources/application.yml b/jeepay-merchant/src/main/resources/application.yml index d869ebd..489ec02 100644 --- a/jeepay-merchant/src/main/resources/application.yml +++ b/jeepay-merchant/src/main/resources/application.yml @@ -7,5 +7,5 @@ spring: #系统业务参数 isys: - jwt-secret: ARNXp4MzjOOQqxtv #生成jwt的秘钥。 要求每个系统有单独的秘钥管理机制。 + jwt-secret: cd372fb85148700fa88095e3492d3f9f5beb43e555e5ff26d95f5a6adc36f8e6 #生成jwt的秘钥。 要求每个系统有单独的秘钥管理机制。 diff --git a/jeepay-payment/pom.xml b/jeepay-payment/pom.xml index 2e2c44f..3d5e294 100644 --- a/jeepay-payment/pom.xml +++ b/jeepay-payment/pom.xml @@ -46,24 +46,13 @@ org.springframework.boot spring-boot-starter-web - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.fasterxml.jackson.module - jackson-module-parameter-names - - + + + + + + + @@ -127,7 +116,7 @@ com.jeequan jeepay-sdk-java - pls-1.3.0 + pls-1.4.3 diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/InitRunner.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/InitRunner.java index 79310d5..f66e69c 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/InitRunner.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/InitRunner.java @@ -16,10 +16,8 @@ package com.jeequan.jeepay.pay.bootstrap; import cn.hutool.core.date.DatePattern; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializeConfig; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; import com.jeequan.jeepay.pay.config.SystemYmlConfig; import com.jeequan.jeepay.service.impl.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +49,7 @@ public class InitRunner implements CommandLineRunner { SysConfigService.IS_USE_CACHE = systemYmlConfig.getCacheConfig(); //初始化处理fastjson格式 - SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance(); - serializeConfig.put(Date.class, new SimpleDateFormatSerializer(DatePattern.NORM_DATETIME_PATTERN)); - - //解决json 序列化时候的 $ref：问题 - JSON.DEFAULT_GENERATE_FEATURE |= SerializerFeature.DisableCircularReferenceDetect.getMask(); + JSON.configWriterDateFormat(DatePattern.NORM_DATETIME_PATTERN); } } diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/JeepayPayApplication.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/JeepayPayApplication.java index b093212..e72518a 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/JeepayPayApplication.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/bootstrap/JeepayPayApplication.java @@ -15,10 +15,11 @@ */ package com.jeequan.jeepay.pay.bootstrap; -import com.alibaba.fastjson.parser.ParserConfig; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.alibaba.fastjson2.support.config.FastJsonConfig; +import com.alibaba.fastjson2.support.spring.http.converter.FastJsonHttpMessageConverter; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.jeequan.jeepay.pay.config.SystemYmlConfig; import org.hibernate.validator.HibernateValidator; import org.mybatis.spring.annotation.MapperScan; @@ -38,6 +39,7 @@ import org.springframework.web.filter.CorsFilter; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; +import java.nio.charset.StandardCharsets; import java.util.Arrays; /** @@ -66,18 +68,16 @@ public class JeepayPayApplication { /** fastJson 配置信息 **/ @Bean public HttpMessageConverters fastJsonConfig(){ - //新建fast-json转换器 FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter(); - // 开启 FastJSON 安全模式！ - ParserConfig.getGlobalInstance().setSafeMode(true); - //fast-json 配置信息 FastJsonConfig config = new FastJsonConfig(); config.setDateFormat("yyyy-MM-dd HH:mm:ss"); +// config.setReaderFeatures(JSONReader.Feature.FieldBased, JSONReader.Feature.SupportArrayToBean); +// config.setWriterFeatures(JSONWriter.Feature.WriteMapNullValue, JSONWriter.Feature.PrettyFormat); converter.setFastJsonConfig(config); - + converter.setDefaultCharset(StandardCharsets.UTF_8); //设置响应的 Content-Type converter.setSupportedMediaTypes(Arrays.asList(new MediaType[]{MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON_UTF8})); return new HttpMessageConverters(converter); @@ -85,13 +85,11 @@ public class JeepayPayApplication { /** Mybatis plus 分页插件 **/ @Bean - public PaginationInterceptor paginationInterceptor() { - PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); - // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求 默认false - // paginationInterceptor.setOverflow(false); - // 设置最大单页限制数量，默认 500 条，-1 不受限制 - // paginationInterceptor.setLimit(500); - return paginationInterceptor; + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加 + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; } /** 默认为 失败快速返回模式 **/ diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelNoticeService.java index 79f353b..f8d457b 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.pay.service.ConfigContextQueryService; import com.jeequan.jeepay.pay.util.ChannelCertConfigKitBean; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelRefundNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelRefundNoticeService.java index 18d02aa..2fbbad9 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelRefundNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractChannelRefundNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.pay.service.ConfigContextQueryService; import com.jeequan.jeepay.pay.util.ChannelCertConfigKitBean; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractDivisionRecordChannelNotifyService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractDivisionRecordChannelNotifyService.java index 2ba9e04..f728fa5 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractDivisionRecordChannelNotifyService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractDivisionRecordChannelNotifyService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.core.entity.PayOrderDivisionRecord; import com.jeequan.jeepay.pay.model.MchAppConfigContext; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractTransferNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractTransferNoticeService.java index 993a9ff..2b42f77 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractTransferNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractTransferNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.pay.service.ConfigContextQueryService; import com.jeequan.jeepay.pay.util.ChannelCertConfigKitBean; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/IChannelUserService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/IChannelUserService.java index ee0cc07..4120562 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/IChannelUserService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/IChannelUserService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.pay.model.MchAppConfigContext; /* diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelNoticeService.java index 1c6dab8..bc67126 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.alipay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.alipay.api.internal.util.AlipaySignature; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java index 2208c2b..46b084c 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.alipay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.alipay.api.request.AlipaySystemOauthTokenRequest; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.exception.BizException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionRecordChannelNotifyService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionRecordChannelNotifyService.java index 78b8ab0..bc1d4d1 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionRecordChannelNotifyService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionRecordChannelNotifyService.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.channel.alipay; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.alipay.api.internal.util.AlipaySignature; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrderDivisionRecord; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java index ee3958b..4ed351e 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.pay.channel.alipay; import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.alipay.api.domain.*; import com.alipay.api.request.AlipayTradeOrderSettleQueryRequest; import com.alipay.api.request.AlipayTradeOrderSettleRequest; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayTransferNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayTransferNoticeService.java index a7989f3..7b952cc 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayTransferNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayTransferNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.alipay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.alipay.api.internal.util.AlipaySignature; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.TransferOrder; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/ctrl/AlipayBizController.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/ctrl/AlipayBizController.java index 54abec5..cb69360 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/ctrl/AlipayBizController.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/ctrl/AlipayBizController.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.pay.channel.alipay.ctrl; import cn.hutool.core.util.URLUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.alipay.api.domain.AlipayOpenAuthTokenAppModel; import com.alipay.api.request.AlipayOpenAuthTokenAppRequest; import com.alipay.api.response.AlipayOpenAuthTokenAppResponse; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelNoticeService.java index 9de48ed..1cda0d2 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.ResponseException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelRefundNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelRefundNoticeService.java index 7175868..206461a 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelRefundNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelRefundNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.RefundOrder; import com.jeequan.jeepay.core.exception.ResponseException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliApp.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliApp.java index 67fd5d4..83af283 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliApp.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliApp.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliBar.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliBar.java index b095faf..a7c11fd 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliBar.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliBar.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliJsapi.java index 96e9ec4..17a66a7 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliJsapi.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliLite.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliLite.java index cfc2ba0..26b6b6f 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliLite.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliLite.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxApp.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxApp.java index 9169d37..4e2a791 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxApp.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxApp.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxBar.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxBar.java index 04b00a3..0c8f453 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxBar.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxBar.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxJsapi.java index bffdb1c..ee6cae5 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxJsapi.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxLite.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxLite.java index 7aea127..0faa536 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxLite.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/WxLite.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.plspay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/pppay/PppayRefundService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/pppay/PppayRefundService.java index cecd25e..8ce8a7a 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/pppay/PppayRefundService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/pppay/PppayRefundService.java @@ -1,7 +1,7 @@ package com.jeequan.jeepay.pay.channel.pppay; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.entity.RefundOrder; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelNoticeService.java index dd2ec27..5c0de58 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.notify.SignatureHeader; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyV3Result; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelRefundNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelRefundNoticeService.java index 2cc7818..cf3cd01 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelRefundNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelRefundNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.notify.SignatureHeader; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelUserService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelUserService.java index 9d600ad..c45ebad 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelUserService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayChannelUserService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.wxpay.WxpayIsvParams; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayDivisionService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayDivisionService.java index 3329418..9d8dfa4 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayDivisionService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayDivisionService.java @@ -15,9 +15,9 @@ */ package com.jeequan.jeepay.pay.channel.wxpay; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.profitsharing.request.*; import com.github.binarywang.wxpay.bean.profitsharing.result.*; import com.github.binarywang.wxpay.exception.WxPayException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderCloseService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderCloseService.java index 1381e7c..7eaff53 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderCloseService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderCloseService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.request.WxPayOrderCloseRequest; import com.github.binarywang.wxpay.bean.result.WxPayOrderCloseResult; import com.github.binarywang.wxpay.exception.WxPayException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderQueryService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderQueryService.java index d14c450..bbcdfe6 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderQueryService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPayOrderQueryService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.request.WxPayOrderQueryRequest; import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult; import com.github.binarywang.wxpay.exception.WxPayException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPaymentService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPaymentService.java index 067f401..68a6105 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPaymentService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayPaymentService.java @@ -17,7 +17,7 @@ package com.jeequan.jeepay.pay.channel.wxpay; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.service.WxPayService; import com.jeequan.jeepay.core.constants.CS; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java index 68fe708..b752bab 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayRefundService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.request.WxPayRefundQueryRequest; import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest; import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/kits/WxpayV3Util.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/kits/WxpayV3Util.java index 1c6b015..f02b303 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/kits/WxpayV3Util.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/kits/WxpayV3Util.java @@ -16,8 +16,8 @@ package com.jeequan.jeepay.pay.channel.wxpay.kits; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.constant.WxPayConstants; import com.github.binarywang.wxpay.exception.WxPayException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/model/WxpayV3OrderRequestModel.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/model/WxpayV3OrderRequestModel.java index 62ee94b..081c061 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/model/WxpayV3OrderRequestModel.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/model/WxpayV3OrderRequestModel.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.model; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.experimental.Accessors; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxApp.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxApp.java index b30990a..837a982 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxApp.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxApp.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.payway; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.constant.WxPayConstants; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxJsapi.java index 018584f..57828d8 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxJsapi.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.payway; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.constant.WxPayConstants; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxLite.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxLite.java index 671b865..cedbbd3 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxLite.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/payway/WxLite.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.payway; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.constant.WxPayConstants; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxApp.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxApp.java index 0b5e7b6..c9ed3b8 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxApp.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxApp.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.paywayV3; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result; import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum; import com.github.binarywang.wxpay.constant.WxPayConstants; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxH5.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxH5.java index ec3773f..a75a229 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxH5.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxH5.java @@ -17,7 +17,7 @@ package com.jeequan.jeepay.pay.channel.wxpay.paywayV3; import cn.hutool.core.codec.Base64; import cn.hutool.core.net.URLEncodeUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.constant.WxPayConstants; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxJsapi.java index 154e5ff..0f12456 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxJsapi.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.paywayV3; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result; import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum; import com.github.binarywang.wxpay.constant.WxPayConstants; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxLite.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxLite.java index 8da0a1d..59d57d5 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxLite.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxLite.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.paywayV3; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result; import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum; import com.github.binarywang.wxpay.constant.WxPayConstants; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxNative.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxNative.java index 5764852..23ce3b2 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxNative.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/paywayV3/WxNative.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.wxpay.paywayV3; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.constant.WxPayConstants; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelNoticeService.java index 8c2d3c0..ae8cd21 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.xxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.ResponseException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelRefundNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelRefundNoticeService.java index 15e916c..1993701 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelRefundNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayChannelRefundNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.xxpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.RefundOrder; import com.jeequan.jeepay.core.exception.ResponseException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPayOrderQueryService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPayOrderQueryService.java index 9ebd5af..8c3cc69 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPayOrderQueryService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPayOrderQueryService.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.pay.channel.xxpay; import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.model.params.xxpay.XxpayNormalMchParams; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPaymentService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPaymentService.java index 362fc83..9d9cf40 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPaymentService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayPaymentService.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.pay.channel.xxpay; import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.model.params.xxpay.XxpayNormalMchParams; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayRefundService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayRefundService.java index b916032..3f3fc54 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayRefundService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/XxpayRefundService.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.pay.channel.xxpay; import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.entity.RefundOrder; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/AliJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/AliJsapi.java index ef70616..3e39d54 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/AliJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/AliJsapi.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.xxpay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.alipay.api.domain.AlipayTradeCreateModel; import com.alipay.api.request.AlipayTradeCreateRequest; import com.alipay.api.response.AlipayTradeCreateResponse; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/WxJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/WxJsapi.java index 1850f88..8d25350 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/WxJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/xxpay/payway/WxJsapi.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.xxpay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.params.xxpay.XxpayNormalMchParams; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayChannelNoticeService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayChannelNoticeService.java index 1ddc40c..c948d8e 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayChannelNoticeService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayChannelNoticeService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.ResponseException; @@ -119,7 +119,7 @@ public class YsfpayChannelNoticeService extends AbstractChannelNoticeService { String ysfpayPublicKey = isvParams.getYsfpayPublicKey(); //验签失败 - if(!YsfSignUtils.validate((JSONObject) JSONObject.toJSON(jsonParams), ysfpayPublicKey)) { + if(!YsfSignUtils.validate(JSONObject.from(jsonParams), ysfpayPublicKey)) { log.info("【云闪付回调】 验签失败！ 回调参数：parameter = {}, ysfpayPublicKey={} ", jsonParams, ysfpayPublicKey); return false; } diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderCloseService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderCloseService.java index 08cefd3..f8ddb0b 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderCloseService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderCloseService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.pay.channel.IPayOrderCloseService; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderQueryService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderQueryService.java index 940b3da..5ce2f73 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderQueryService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPayOrderQueryService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.pay.channel.IPayOrderQueryService; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPaymentService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPaymentService.java index 97d7537..29e3f1a 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPaymentService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayPaymentService.java @@ -17,7 +17,7 @@ package com.jeequan.jeepay.pay.channel.ysfpay; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayRefundService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayRefundService.java index d47c5d0..56c5c99 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayRefundService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/YsfpayRefundService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.entity.RefundOrder; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliBar.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliBar.java index 1c59075..2280589 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliBar.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliBar.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.pay.channel.ysfpay.YsfpayPaymentService; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliJsapi.java index c462bf5..53765d5 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliJsapi.java @@ -16,8 +16,8 @@ package com.jeequan.jeepay.pay.channel.ysfpay.payway; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.utils.DateKit; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxBar.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxBar.java index f31cf37..5805a31 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxBar.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxBar.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.pay.channel.ysfpay.YsfpayPaymentService; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxJsapi.java index 5348f86..6b4f7f2 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxJsapi.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfBar.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfBar.java index 8bb45b7..8a09997 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfBar.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfBar.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.pay.channel.ysfpay.YsfpayPaymentService; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfJsapi.java index a355644..0a8dfbe 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfJsapi.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay.payway; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.pay.channel.ysfpay.YsfpayPaymentService; import com.jeequan.jeepay.pay.rqrs.AbstractRS; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfHttpUtil.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfHttpUtil.java index 346149f..1b2f173 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfHttpUtil.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfHttpUtil.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay.utils; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.jeequan.jeepay.core.constants.CS; import javax.activation.MimetypesFileTypeMap; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfSignUtils.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfSignUtils.java index f8f4ea8..2c91360 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfSignUtils.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/utils/YsfSignUtils.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.channel.ysfpay.utils; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/ApiController.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/ApiController.java index 9c46b91..02ee918 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/ApiController.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/ApiController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.ctrl; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.ctrls.AbstractCtrl; import com.jeequan.jeepay.core.entity.MchApp; @@ -94,7 +94,7 @@ public abstract class ApiController extends AbstractCtrl { String appSecret = mchApp.getAppSecret(); // 转换为 JSON - JSONObject bizReqJSON = (JSONObject)JSONObject.toJSON(bizRQ); + JSONObject bizReqJSON = JSONObject.from(bizRQ); bizReqJSON.remove("sign"); if(!sign.equalsIgnoreCase(JeepayKit.getSign(bizReqJSON, appSecret))){ throw new BizException("验签失败"); diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java index 8e1f78c..882364a 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/division/PayOrderDivisionExecController.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.ctrl.division; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.jeequan.jeepay.components.mq.model.PayOrderDivisionMQ; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.MchDivisionReceiver; @@ -161,7 +161,7 @@ public class PayOrderDivisionExecController extends ApiController { if(!receiverIdSet.isEmpty()){ - int receiverCount = mchDivisionReceiverService.count(MchDivisionReceiver.gw() + long receiverCount = mchDivisionReceiverService.count(MchDivisionReceiver.gw() .in(MchDivisionReceiver::getReceiverId, receiverIdSet) .eq(MchDivisionReceiver::getMchNo, mchNo) .eq(MchDivisionReceiver::getAppId, appId) @@ -176,7 +176,7 @@ public class PayOrderDivisionExecController extends ApiController { if(!receiverGroupIdSet.isEmpty()){ - int receiverGroupCount = mchDivisionReceiverGroupService.count(MchDivisionReceiverGroup.gw() + long receiverGroupCount = mchDivisionReceiverGroupService.count(MchDivisionReceiverGroup.gw() .in(MchDivisionReceiverGroup::getReceiverGroupId, receiverGroupIdSet) .eq(MchDivisionReceiverGroup::getMchNo, mchNo) ); diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/qr/ChannelUserIdController.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/qr/ChannelUserIdController.java index f55c728..f8af125 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/qr/ChannelUserIdController.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/qr/ChannelUserIdController.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.ctrl.qr; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.utils.JeepayKit; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/AbstractRS.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/AbstractRS.java index 827eb5f..d304ca6 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/AbstractRS.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/AbstractRS.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.rqrs; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.Data; import java.io.Serializable; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/ClosePayOrderRS.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/ClosePayOrderRS.java index 4044297..c720e52 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/ClosePayOrderRS.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/ClosePayOrderRS.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.rqrs.payorder; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import com.jeequan.jeepay.pay.rqrs.AbstractRS; import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg; import lombok.Data; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRQ.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRQ.java index 9d5cbc6..ca6dfbb 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRQ.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRQ.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.rqrs.payorder; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.annotation.JSONField; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.pay.rqrs.AbstractMchAppRQ; import com.jeequan.jeepay.pay.rqrs.payorder.payway.*; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRS.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRS.java index 5d7992f..cbf6e22 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRS.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/rqrs/payorder/UnifiedOrderRS.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.rqrs.payorder; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.pay.rqrs.AbstractRS; import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayMchNotifyService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayMchNotifyService.java index 5022264..a7a362f 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayMchNotifyService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayMchNotifyService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.pay.service; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.jeequan.jeepay.components.mq.model.PayOrderMchNotifyMQ; import com.jeequan.jeepay.components.mq.vender.IMQSender; import com.jeequan.jeepay.core.entity.MchNotifyRecord; @@ -209,7 +209,7 @@ public class PayMchNotifyService { public String createNotifyUrl(PayOrder payOrder, String appSecret) { QueryPayOrderRS queryPayOrderRS = QueryPayOrderRS.buildByPayOrder(payOrder); - JSONObject jsonObject = (JSONObject)JSONObject.toJSON(queryPayOrderRS); + JSONObject jsonObject = JSONObject.from(queryPayOrderRS); jsonObject.put("reqTime", System.currentTimeMillis()); //添加请求时间 // 报文签名 @@ -226,7 +226,7 @@ public class PayMchNotifyService { public String createNotifyUrl(RefundOrder refundOrder, String appSecret) { QueryRefundOrderRS queryRefundOrderRS = QueryRefundOrderRS.buildByRefundOrder(refundOrder); - JSONObject jsonObject = (JSONObject)JSONObject.toJSON(queryRefundOrderRS); + JSONObject jsonObject = JSONObject.from(queryRefundOrderRS); jsonObject.put("reqTime", System.currentTimeMillis()); //添加请求时间 // 报文签名 @@ -243,7 +243,7 @@ public class PayMchNotifyService { public String createNotifyUrl(TransferOrder transferOrder, String appSecret) { QueryTransferOrderRS rs = QueryTransferOrderRS.buildByRecord(transferOrder); - JSONObject jsonObject = (JSONObject)JSONObject.toJSON(rs); + JSONObject jsonObject = JSONObject.from(rs); jsonObject.put("reqTime", System.currentTimeMillis()); //添加请求时间 // 报文签名 @@ -264,7 +264,7 @@ public class PayMchNotifyService { } QueryPayOrderRS queryPayOrderRS = QueryPayOrderRS.buildByPayOrder(payOrder); - JSONObject jsonObject = (JSONObject)JSONObject.toJSON(queryPayOrderRS); + JSONObject jsonObject = JSONObject.from(queryPayOrderRS); jsonObject.put("reqTime", System.currentTimeMillis()); //添加请求时间 // 报文签名 diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/util/CodeImgUtil.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/util/CodeImgUtil.java index 98e857b..00f1c56 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/util/CodeImgUtil.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/util/CodeImgUtil.java @@ -15,8 +15,8 @@ */ package com.jeequan.jeepay.pay.util; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.google.zxing.*; import com.google.zxing.client.j2se.BufferedImageLuminanceSource; import com.google.zxing.client.j2se.MatrixToImageWriter; diff --git a/jeepay-service/pom.xml b/jeepay-service/pom.xml index 4b83d05..4b25ac5 100644 --- a/jeepay-service/pom.xml +++ b/jeepay-service/pom.xml @@ -34,7 +34,7 @@ com.alibaba druid-spring-boot-starter - 1.2.6 + 1.2.23 diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/facade/JeepayFacade.java b/jeepay-service/src/main/java/com/jeequan/jeepay/facade/JeepayFacade.java new file mode 100644 index 0000000..01b0b28 --- /dev/null +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/facade/JeepayFacade.java @@ -0,0 +1,292 @@ +package com.jeequan.jeepay.facade; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.RandomUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.jeequan.jeepay.core.constants.ApiCodeEnum; +import com.jeequan.jeepay.core.constants.CS; +import com.jeequan.jeepay.core.entity.*; +import com.jeequan.jeepay.core.exception.BizException; +import com.jeequan.jeepay.service.impl.*; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +@Service +public class JeepayFacade { + + @Autowired private MchAppService mchAppService; + @Autowired private MchInfoService mchInfoService; + @Autowired private IsvInfoService isvInfoService; + @Autowired private PayInterfaceConfigService payInterfaceConfigService; + @Autowired private PayOrderService payOrderService; + @Autowired private MchPayPassageService mchPayPassageService; + @Autowired private SysUserService sysUserService; + @Autowired private SysUserAuthService sysUserAuthService; + @Autowired private PayInterfaceDefineService payInterfaceDefineService; + + @Transactional + public void removeByIsvNo(String isvNo) { + // 0.当前服务商是否存在 + IsvInfo isvInfo = isvInfoService.getById(isvNo); + if (isvInfo == null) { + throw new BizException("该服务商不存在"); + } + + // 1.查询当前服务商下是否存在商户 + long mchCount = mchInfoService.count(MchInfo.gw().eq(MchInfo::getIsvNo, isvNo).eq(MchInfo::getType, CS.MCH_TYPE_ISVSUB)); + if (mchCount > 0) { + throw new BizException("该服务商下存在商户，不可删除"); + } + + // 2.删除当前服务商支付接口配置参数 + payInterfaceConfigService.remove(PayInterfaceConfig.gw() + .eq(PayInterfaceConfig::getInfoId, isvNo) + .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_ISV) + ); + + // 3.删除该服务商 + boolean remove = isvInfoService.removeById(isvNo); + if (!remove) { + throw new BizException("删除服务商失败"); + } + } + + @Transactional(rollbackFor = Exception.class) + public void removeByAppId(String appId) { + + // 1.查看当前应用是否存在交易数据 + long payCount = payOrderService.count(PayOrder.gw().eq(PayOrder::getAppId, appId)); + if (payCount > 0) { + throw new BizException("该应用已存在交易数据，不可删除"); + } + + // 2.删除应用关联的支付通道 + mchPayPassageService.remove(MchPayPassage.gw().eq(MchPayPassage::getAppId, appId)); + + // 3.删除应用配置的支付参数 + payInterfaceConfigService.remove(PayInterfaceConfig.gw() + .eq(PayInterfaceConfig::getInfoId, appId) + .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_MCH_APP) + ); + + // 4.删除当前应用 + if (!mchAppService.removeById(appId)) { + throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_DELETE); + } + } + + @Transactional(rollbackFor = Exception.class) + public void addMch(MchInfo mchInfo, String loginUserName) { + + // 校验特邀商户信息 + if (mchInfo.getType() == CS.MCH_TYPE_ISVSUB && StringUtils.isNotEmpty(mchInfo.getIsvNo())) { + // 当前服务商状态是否正确 + IsvInfo isvInfo = isvInfoService.getById(mchInfo.getIsvNo()); + if (isvInfo == null || isvInfo.getState() == CS.NO) { + throw new BizException("当前服务商不可用"); + } + } + + // 插入商户基本信息 + boolean saveResult = mchInfoService.save(mchInfo); + if (!saveResult) { + throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE); + } + + // 插入用户信息 + SysUser sysUser = new SysUser(); + sysUser.setLoginUsername(loginUserName); + sysUser.setRealname(mchInfo.getContactName()); + sysUser.setTelphone(mchInfo.getContactTel()); + sysUser.setUserNo(mchInfo.getMchNo()); + sysUser.setBelongInfoId(mchInfo.getMchNo()); + sysUser.setSex(CS.SEX_MALE); + sysUser.setIsAdmin(CS.YES); + sysUser.setState(mchInfo.getState()); + sysUserService.addSysUser(sysUser, CS.SYS_TYPE.MCH); + + // 插入商户默认应用 + MchApp mchApp = new MchApp(); + mchApp.setAppId(IdUtil.objectId()); + mchApp.setMchNo(mchInfo.getMchNo()); + mchApp.setAppName("默认应用"); + mchApp.setAppSecret(RandomUtil.randomString(128)); + mchApp.setState(CS.YES); + mchApp.setCreatedBy(sysUser.getRealname()); + mchApp.setCreatedUid(sysUser.getSysUserId()); + saveResult = mchAppService.save(mchApp); + if (!saveResult) { + throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE); + } + + // 存入商户默认用户ID + MchInfo updateRecord = new MchInfo(); + updateRecord.setMchNo(mchInfo.getMchNo()); + updateRecord.setInitUserId(sysUser.getSysUserId()); + saveResult = mchInfoService.updateById(updateRecord); + if (!saveResult) { + throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE); + } + + } + + /** 删除商户 **/ + @Transactional(rollbackFor = Exception.class) + public List removeByMchNo(String mchNo) { + try { + // 0.当前商户是否存在 + MchInfo mchInfo = mchInfoService.getById(mchNo); + if (mchInfo == null) { + throw new BizException("该商户不存在"); + } + + // 1.查看当前商户是否存在交易数据 + long payCount = payOrderService.count(PayOrder.gw().eq(PayOrder::getMchNo, mchNo)); + if (payCount > 0) { + throw new BizException("该商户已存在交易数据，不可删除"); + } + + // 2.删除当前商户配置的支付通道 + mchPayPassageService.remove(MchPayPassage.gw().eq(MchPayPassage::getMchNo, mchNo)); + + // 3.删除当前商户支付接口配置参数 + List appIdList = new LinkedList<>(); + mchAppService.list(MchApp.gw().eq(MchApp::getMchNo, mchNo)).forEach(item -> appIdList.add(item.getAppId())); + if (CollectionUtils.isNotEmpty(appIdList)) { + payInterfaceConfigService.remove(PayInterfaceConfig.gw() + .in(PayInterfaceConfig::getInfoId, appIdList) + .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_MCH_APP) + ); + } + + List userList = sysUserService.list(SysUser.gw() + .eq(SysUser::getBelongInfoId, mchNo) + .eq(SysUser::getSysType, CS.SYS_TYPE.MCH) + ); + + // 4.删除当前商户应用信息 + if (CollectionUtils.isNotEmpty(appIdList)) { + mchAppService.removeByIds(appIdList); + } + + // 返回的用户id + List userIdList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(userList)) { + for (SysUser user:userList) { + userIdList.add(user.getSysUserId()); + } + // 5.删除当前商户用户子用户信息 + sysUserAuthService.remove(SysUserAuth.gw().in(SysUserAuth::getUserId, userIdList)); + } + + // 6.删除当前商户的登录用户 + sysUserService.remove(SysUser.gw() + .eq(SysUser::getBelongInfoId, mchNo) + .eq(SysUser::getSysType, CS.SYS_TYPE.MCH) + ); + + // 7.删除当前商户 + boolean removeMchInfo = mchInfoService.removeById(mchNo); + if (!removeMchInfo) { + throw new BizException("删除当前商户失败"); + } + return userIdList; + }catch (Exception e) { + throw new BizException(e.getMessage()); + } + } + + /** + * @Author: ZhuXiao + * @Description: 根据 账户类型、账户号 获取支付参数配置列表 + * @Date: 14:19 2021/5/7 + */ + public List selectAllPayIfConfigListByIsvNo(Byte infoType, String infoId) { + + // 支付定义列表 + LambdaQueryWrapper queryWrapper = PayInterfaceDefine.gw(); + queryWrapper.eq(PayInterfaceDefine::getState, CS.YES); + queryWrapper.eq(PayInterfaceDefine::getIsIsvMode, CS.YES); // 支持服务商模式 + + List defineList = payInterfaceDefineService.list(queryWrapper); + + // 支付参数列表 + LambdaQueryWrapper wrapper = PayInterfaceConfig.gw(); + wrapper.eq(PayInterfaceConfig::getInfoId, infoId); + wrapper.eq(PayInterfaceConfig::getInfoType, infoType); + List configList = payInterfaceConfigService.list(wrapper); + + for (PayInterfaceDefine define : defineList) { + for (PayInterfaceConfig config : configList) { + if (define.getIfCode().equals(config.getIfCode())) { + define.addExt("ifConfigState", config.getState()); // 配置状态 + } + } + } + return defineList; + } + + public List selectAllPayIfConfigListByAppId(String appId) { + MchApp mchApp = mchAppService.getById(appId); + if (mchApp == null|| mchApp.getState() != CS.YES) { + throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE); + } + MchInfo mchInfo = mchInfoService.getById(mchApp.getMchNo()); + if (mchInfo == null || mchInfo.getState() != CS.YES) { + throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE); + } + // 支付定义列表 + LambdaQueryWrapper queryWrapper = PayInterfaceDefine.gw(); + queryWrapper.eq(PayInterfaceDefine::getState, CS.YES); + + Map isvPayConfigMap = new HashMap<>(); // 服务商支付参数配置集合 + + // 根据商户类型，添加接口是否支持该商户类型条件 + if (mchInfo.getType() == CS.MCH_TYPE_NORMAL) { + queryWrapper.eq(PayInterfaceDefine::getIsMchMode, CS.YES); // 支持普通商户模式 + } + if (mchInfo.getType() == CS.MCH_TYPE_ISVSUB) { + queryWrapper.eq(PayInterfaceDefine::getIsIsvMode, CS.YES); // 支持服务商模式 + // 商户类型为特约商户，服务商应已经配置支付参数 + List isvConfigList = payInterfaceConfigService.list(PayInterfaceConfig.gw() + .eq(PayInterfaceConfig::getInfoId, mchInfo.getIsvNo()) + .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_ISV) + .eq(PayInterfaceConfig::getState, CS.YES) + .ne(PayInterfaceConfig::getIfParams, "") + .isNotNull(PayInterfaceConfig::getIfParams)); + + for (PayInterfaceConfig config : isvConfigList) { + config.addExt("mchType", mchInfo.getType()); + isvPayConfigMap.put(config.getIfCode(), config); + } + } + + List defineList = payInterfaceDefineService.list(queryWrapper); + + // 支付参数列表 + LambdaQueryWrapper wrapper = PayInterfaceConfig.gw(); + wrapper.eq(PayInterfaceConfig::getInfoId, appId); + wrapper.eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_MCH_APP); + List configList = payInterfaceConfigService.list(wrapper); + + for (PayInterfaceDefine define : defineList) { + define.addExt("mchType", mchInfo.getType()); // 所属商户类型 + + for (PayInterfaceConfig config : configList) { + if (define.getIfCode().equals(config.getIfCode())) { + define.addExt("ifConfigState", config.getState()); // 配置状态 + } + } + + if (mchInfo.getType() == CS.MCH_TYPE_ISVSUB && isvPayConfigMap.get(define.getIfCode()) == null) { + define.addExt("subMchIsvConfig", CS.NO); // 特约商户，服务商支付参数的配置状态，0表示未配置 + } + } + return defineList; + } +} diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/IsvInfoService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/IsvInfoService.java index 78d3121..998e959 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/IsvInfoService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/IsvInfoService.java @@ -37,36 +37,4 @@ import org.springframework.transaction.annotation.Transactional; @Service public class IsvInfoService extends ServiceImpl { - @Autowired private MchInfoService mchInfoService; - - @Autowired private IsvInfoService isvInfoService; - - @Autowired private PayInterfaceConfigService payInterfaceConfigService; - - @Transactional - public void removeByIsvNo(String isvNo) { - // 0.当前服务商是否存在 - IsvInfo isvInfo = isvInfoService.getById(isvNo); - if (isvInfo == null) { - throw new BizException("该服务商不存在"); - } - - // 1.查询当前服务商下是否存在商户 - int mchCount = mchInfoService.count(MchInfo.gw().eq(MchInfo::getIsvNo, isvNo).eq(MchInfo::getType, CS.MCH_TYPE_ISVSUB)); - if (mchCount > 0) { - throw new BizException("该服务商下存在商户，不可删除"); - } - - // 2.删除当前服务商支付接口配置参数 - payInterfaceConfigService.remove(PayInterfaceConfig.gw() - .eq(PayInterfaceConfig::getInfoId, isvNo) - .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_ISV) - ); - - // 3.删除该服务商 - boolean remove = isvInfoService.removeById(isvNo); - if (!remove) { - throw new BizException("删除服务商失败"); - } - } } diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchAppService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchAppService.java index f0afe91..6c79ece 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchAppService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchAppService.java @@ -28,34 +28,6 @@ import org.springframework.transaction.annotation.Transactional; @Service public class MchAppService extends ServiceImpl { - @Autowired private PayOrderService payOrderService; - @Autowired private MchPayPassageService mchPayPassageService; - @Autowired private PayInterfaceConfigService payInterfaceConfigService; - - @Transactional(rollbackFor = Exception.class) - public void removeByAppId(String appId) { - - // 1.查看当前应用是否存在交易数据 - int payCount = payOrderService.count(PayOrder.gw().eq(PayOrder::getAppId, appId)); - if (payCount > 0) { - throw new BizException("该应用已存在交易数据，不可删除"); - } - - // 2.删除应用关联的支付通道 - mchPayPassageService.remove(MchPayPassage.gw().eq(MchPayPassage::getAppId, appId)); - - // 3.删除应用配置的支付参数 - payInterfaceConfigService.remove(PayInterfaceConfig.gw() - .eq(PayInterfaceConfig::getInfoId, appId) - .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_MCH_APP) - ); - - // 4.删除当前应用 - if (!removeById(appId)) { - throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_DELETE); - } - } - public MchApp selectById(String appId) { MchApp mchApp = this.getById(appId); if (mchApp == null) { diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java index ae274c0..ddacb37 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java @@ -44,138 +44,4 @@ import java.util.List; @Service public class MchInfoService extends ServiceImpl { - @Autowired private SysUserService sysUserService; - - @Autowired private PayOrderService payOrderService; - - @Autowired private MchPayPassageService mchPayPassageService; - - @Autowired private PayInterfaceConfigService payInterfaceConfigService; - - @Autowired private SysUserAuthService sysUserAuthService; - - @Autowired private IsvInfoService isvInfoService; - - @Autowired private MchAppService mchAppService; - - @Transactional(rollbackFor = Exception.class) - public void addMch(MchInfo mchInfo, String loginUserName) { - - // 校验特邀商户信息 - if (mchInfo.getType() == CS.MCH_TYPE_ISVSUB && StringUtils.isNotEmpty(mchInfo.getIsvNo())) { - // 当前服务商状态是否正确 - IsvInfo isvInfo = isvInfoService.getById(mchInfo.getIsvNo()); - if (isvInfo == null || isvInfo.getState() == CS.NO) { - throw new BizException("当前服务商不可用"); - } - } - - // 插入商户基本信息 - boolean saveResult = save(mchInfo); - if (!saveResult) { - throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE); - } - - // 插入用户信息 - SysUser sysUser = new SysUser(); - sysUser.setLoginUsername(loginUserName); - sysUser.setRealname(mchInfo.getContactName()); - sysUser.setTelphone(mchInfo.getContactTel()); - sysUser.setUserNo(mchInfo.getMchNo()); - sysUser.setBelongInfoId(mchInfo.getMchNo()); - sysUser.setSex(CS.SEX_MALE); - sysUser.setIsAdmin(CS.YES); - sysUser.setState(mchInfo.getState()); - sysUserService.addSysUser(sysUser, CS.SYS_TYPE.MCH); - - // 插入商户默认应用 - MchApp mchApp = new MchApp(); - mchApp.setAppId(IdUtil.objectId()); - mchApp.setMchNo(mchInfo.getMchNo()); - mchApp.setAppName("默认应用"); - mchApp.setAppSecret(RandomUtil.randomString(128)); - mchApp.setState(CS.YES); - mchApp.setCreatedBy(sysUser.getRealname()); - mchApp.setCreatedUid(sysUser.getSysUserId()); - saveResult = mchAppService.save(mchApp); - if (!saveResult) { - throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE); - } - - // 存入商户默认用户ID - MchInfo updateRecord = new MchInfo(); - updateRecord.setMchNo(mchInfo.getMchNo()); - updateRecord.setInitUserId(sysUser.getSysUserId()); - saveResult = updateById(updateRecord); - if (!saveResult) { - throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE); - } - - } - - /** 删除商户 **/ - @Transactional(rollbackFor = Exception.class) - public List removeByMchNo(String mchNo) { - try { - // 0.当前商户是否存在 - MchInfo mchInfo = getById(mchNo); - if (mchInfo == null) { - throw new BizException("该商户不存在"); - } - - // 1.查看当前商户是否存在交易数据 - int payCount = payOrderService.count(PayOrder.gw().eq(PayOrder::getMchNo, mchNo)); - if (payCount > 0) { - throw new BizException("该商户已存在交易数据，不可删除"); - } - - // 2.删除当前商户配置的支付通道 - mchPayPassageService.remove(MchPayPassage.gw().eq(MchPayPassage::getMchNo, mchNo)); - - // 3.删除当前商户支付接口配置参数 - List appIdList = new LinkedList<>(); - mchAppService.list(MchApp.gw().eq(MchApp::getMchNo, mchNo)).forEach(item -> appIdList.add(item.getAppId())); - if (CollectionUtils.isNotEmpty(appIdList)) { - payInterfaceConfigService.remove(PayInterfaceConfig.gw() - .in(PayInterfaceConfig::getInfoId, appIdList) - .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_MCH_APP) - ); - } - - List userList = sysUserService.list(SysUser.gw() - .eq(SysUser::getBelongInfoId, mchNo) - .eq(SysUser::getSysType, CS.SYS_TYPE.MCH) - ); - - // 4.删除当前商户应用信息 - if (CollectionUtils.isNotEmpty(appIdList)) { - mchAppService.removeByIds(appIdList); - } - - // 返回的用户id - List userIdList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(userList)) { - for (SysUser user:userList) { - userIdList.add(user.getSysUserId()); - } - // 5.删除当前商户用户子用户信息 - sysUserAuthService.remove(SysUserAuth.gw().in(SysUserAuth::getUserId, userIdList)); - } - - // 6.删除当前商户的登录用户 - sysUserService.remove(SysUser.gw() - .eq(SysUser::getBelongInfoId, mchNo) - .eq(SysUser::getSysType, CS.SYS_TYPE.MCH) - ); - - // 7.删除当前商户 - boolean removeMchInfo = removeById(mchNo); - if (!removeMchInfo) { - throw new BizException("删除当前商户失败"); - } - return userIdList; - }catch (Exception e) { - throw new BizException(e.getMessage()); - } - } } diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchPayPassageService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchPayPassageService.java index fdb0a45..6103f10 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchPayPassageService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchPayPassageService.java @@ -16,7 +16,7 @@ package com.jeequan.jeepay.service.impl; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.MchPayPassage; diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayInterfaceConfigService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayInterfaceConfigService.java index 6569fb7..12c152f 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayInterfaceConfigService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayInterfaceConfigService.java @@ -40,15 +40,6 @@ import java.util.Map; @Service public class PayInterfaceConfigService extends ServiceImpl { - @Autowired - private PayInterfaceDefineService payInterfaceDefineService; - - @Autowired - private MchInfoService mchInfoService; - - @Autowired - private MchAppService mchAppService; - /** * @Author: ZhuXiao * @Description: 根据 账户类型、账户号、接口类型 获取支付参数配置 @@ -62,99 +53,6 @@ public class PayInterfaceConfigService extends ServiceImpl selectAllPayIfConfigListByIsvNo(Byte infoType, String infoId) { - - // 支付定义列表 - LambdaQueryWrapper queryWrapper = PayInterfaceDefine.gw(); - queryWrapper.eq(PayInterfaceDefine::getState, CS.YES); - queryWrapper.eq(PayInterfaceDefine::getIsIsvMode, CS.YES); // 支持服务商模式 - - List defineList = payInterfaceDefineService.list(queryWrapper); - - // 支付参数列表 - LambdaQueryWrapper wrapper = PayInterfaceConfig.gw(); - wrapper.eq(PayInterfaceConfig::getInfoId, infoId); - wrapper.eq(PayInterfaceConfig::getInfoType, infoType); - List configList = this.list(wrapper); - - for (PayInterfaceDefine define : defineList) { - for (PayInterfaceConfig config : configList) { - if (define.getIfCode().equals(config.getIfCode())) { - define.addExt("ifConfigState", config.getState()); // 配置状态 - } - } - } - return defineList; - } - - - public List selectAllPayIfConfigListByAppId(String appId) { - - MchApp mchApp = mchAppService.getById(appId); - if (mchApp == null|| mchApp.getState() != CS.YES) { - throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE); - } - MchInfo mchInfo = mchInfoService.getById(mchApp.getMchNo()); - if (mchInfo == null || mchInfo.getState() != CS.YES) { - throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE); - } - // 支付定义列表 - LambdaQueryWrapper queryWrapper = PayInterfaceDefine.gw(); - queryWrapper.eq(PayInterfaceDefine::getState, CS.YES); - - Map isvPayConfigMap = new HashMap<>(); // 服务商支付参数配置集合 - - // 根据商户类型，添加接口是否支持该商户类型条件 - if (mchInfo.getType() == CS.MCH_TYPE_NORMAL) { - queryWrapper.eq(PayInterfaceDefine::getIsMchMode, CS.YES); // 支持普通商户模式 - } - if (mchInfo.getType() == CS.MCH_TYPE_ISVSUB) { - queryWrapper.eq(PayInterfaceDefine::getIsIsvMode, CS.YES); // 支持服务商模式 - // 商户类型为特约商户，服务商应已经配置支付参数 - List isvConfigList = this.list(PayInterfaceConfig.gw() - .eq(PayInterfaceConfig::getInfoId, mchInfo.getIsvNo()) - .eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_ISV) - .eq(PayInterfaceConfig::getState, CS.YES) - .ne(PayInterfaceConfig::getIfParams, "") - .isNotNull(PayInterfaceConfig::getIfParams)); - - for (PayInterfaceConfig config : isvConfigList) { - config.addExt("mchType", mchInfo.getType()); - isvPayConfigMap.put(config.getIfCode(), config); - } - } - - List defineList = payInterfaceDefineService.list(queryWrapper); - - // 支付参数列表 - LambdaQueryWrapper wrapper = PayInterfaceConfig.gw(); - wrapper.eq(PayInterfaceConfig::getInfoId, appId); - wrapper.eq(PayInterfaceConfig::getInfoType, CS.INFO_TYPE_MCH_APP); - List configList = this.list(wrapper); - - for (PayInterfaceDefine define : defineList) { - define.addExt("mchType", mchInfo.getType()); // 所属商户类型 - - for (PayInterfaceConfig config : configList) { - if (define.getIfCode().equals(config.getIfCode())) { - define.addExt("ifConfigState", config.getState()); // 配置状态 - } - } - - if (mchInfo.getType() == CS.MCH_TYPE_ISVSUB && isvPayConfigMap.get(define.getIfCode()) == null) { - define.addExt("subMchIsvConfig", CS.NO); // 特约商户，服务商支付参数的配置状态，0表示未配置 - } - } - return defineList; - } - - - /** 查询商户app使用已正确配置了通道信息 */ public boolean mchAppHasAvailableIfCode(String appId, String ifCode){ @@ -168,5 +66,4 @@ public class PayInterfaceConfigService extends ServiceImpl { public JSONObject mainPageNumCount(String mchNo) { JSONObject json = new JSONObject(); // 商户总数 - int mchCount = mchInfoMapper.selectCount(MchInfo.gw()); + long mchCount = mchInfoMapper.selectCount(MchInfo.gw()); // 服务商总数 - int isvCount = isvInfoMapper.selectCount(IsvInfo.gw()); + long isvCount = isvInfoMapper.selectCount(IsvInfo.gw()); // 总交易金额 Map payCountMap = payCount(mchNo, PayOrder.STATE_SUCCESS, null, null, null); json.put("totalMch", mchCount); diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java index f87a3ac..7a0d03f 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.service.impl; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysConfigService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysConfigService.java index a255b98..fa5960c 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysConfigService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysConfigService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.service.impl; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jeequan.jeepay.core.entity.SysConfig; import com.jeequan.jeepay.core.model.DBApplicationConfig; @@ -45,9 +45,6 @@ public class SysConfigService extends ServiceImpl im * **/ public static boolean IS_USE_CACHE = false; - @Autowired - private SysConfigService sysConfigService; - /** 数据库application配置参数 **/ private static MutablePair APPLICATION_CONFIG = new MutablePair<>("applicationConfig", null); @@ -97,7 +94,7 @@ public class SysConfigService extends ServiceImpl im SysConfig sysConfig = new SysConfig(); sysConfig.setConfigKey(k); sysConfig.setConfigVal(updateMap.get(k)); - boolean update = sysConfigService.saveOrUpdate(sysConfig); + boolean update = this.saveOrUpdate(sysConfig); if (update) { count ++; } diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java index 7324c0c..744498a 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.service.impl; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.java index 282692a..22c2f69 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.java @@ -15,7 +15,7 @@ */ package com.jeequan.jeepay.service.mapper; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jeequan.jeepay.core.entity.MchPayPassage; diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.xml b/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.xml index 61a1aea..1a70aa7 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.xml +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchPayPassageMapper.xml @@ -17,7 +17,7 @@ - select pid.if_code ifCode, pid.if_name ifName, pid.config_page_type configPageType, pid.bg_color bgColor, pid.icon icon, pic.if_params ifParams, pic.if_rate ifRate from t_pay_interface_define pid inner join t_pay_interface_config pic on pid.if_code = pic.if_code where JSON_CONTAINS(pid.way_codes, JSON_OBJECT('wayCode', #{wayCode})) diff --git a/jeepay-z-codegen/pom.xml b/jeepay-z-codegen/pom.xml index 373e6ad..ce757f9 100644 --- a/jeepay-z-codegen/pom.xml +++ b/jeepay-z-codegen/pom.xml @@ -23,20 +23,20 @@ mysql mysql-connector-java - 8.0.28 + 8.0.33 org.projectlombok lombok - 1.18.22 + 1.18.32 true org.springframework spring-context - 4.3.10.RELEASE + 5.3.31 diff --git a/pom.xml b/pom.xml index b189820..52363b4 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.8 + 2.7.18 @@ -42,18 +42,18 @@ UTF-8 - 1.3.0 - 1.2.83 - 3.4.2 - 5.8.26 - 5.4.7 - 0.9.1 + 1.6.0 + 2.0.50 + 3.5.6 + 5.8.27 + 5.8.12 + 0.12.5 4.6.0 - 2.2.0 - 1.8.8.1.Final + 2.3.0 + 1.8.8.8.Final - 8.0.28 - 2.3.0 + 8.0.33 + 2.3.1 @@ -103,6 +103,11 @@ fastjson ${fastjson.version} + + com.alibaba.fastjson2 + fastjson2-extension-spring5 + ${fastjson.version} + @@ -178,6 +183,13 @@ ${aliyun-openservices-ons-client.version} + + + mysql + mysql-connector-java + ${mysql.version} + + javax.xml.bind jaxb-api @@ -189,7 +201,7 @@ com.github.xiaoymin knife4j-openapi2-spring-boot-starter - 4.1.0 + 4.5.0 -- Gitee From bad47044adf377e164be2be65ddde711b68fc750 Mon Sep 17 00:00:00 2001 From: wifibaby4u Date: Thu, 30 May 2024 10:38:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9DJSAPI=E6=94=AF=E4=BB=98=EF=BC=8C=E4=BD=BF=E7=94=A8open?= =?UTF-8?q?id=E6=9B=BF=E4=BB=A3uid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeepay/pay/channel/alipay/AlipayChannelUserService.java | 2 +- .../com/jeequan/jeepay/pay/channel/alipay/payway/AliJsapi.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java index 46b084c..9a1dcc9 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayChannelUserService.java @@ -88,7 +88,7 @@ public class AlipayChannelUserService implements IChannelUserService { AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest(); request.setCode(authCode); request.setGrantType("authorization_code"); try { - return configContextQueryService.getAlipayClientWrapper(mchAppConfigContext).execute(request).getUserId(); + return configContextQueryService.getAlipayClientWrapper(mchAppConfigContext).execute(request).getOpenId(); } catch (ChannelException e) { e.printStackTrace(); return null; diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/payway/AliJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/payway/AliJsapi.java index d8ac263..535398a 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/payway/AliJsapi.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/payway/AliJsapi.java @@ -68,7 +68,8 @@ public class AliJsapi extends AlipayPaymentService { model.setBody(payOrder.getBody()); //订单描述信息 model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额 model.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间 - model.setBuyerId(bizRQ.getBuyerUserId()); +// model.setBuyerId(bizRQ.getBuyerUserId()); + model.setBuyerOpenId(bizRQ.getBuyerUserId()); req.setNotifyUrl(getNotifyUrl()); // 设置异步通知地址 req.setBizModel(model); -- Gitee From fcbbae63998690fd529bdd25e1fd7beee977f45f Mon Sep 17 00:00:00 2001 From: wifibaby4u Date: Thu, 30 May 2024 14:54:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=88=86?= =?UTF-8?q?=E8=B4=A6=E5=A2=9E=E5=8A=A0openId=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=94=AF=E6=8C=81=EF=BC=8C=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E5=85=BC=E5=AE=B9userId,loginName,openId=E4=B8=89=E7=A7=8D?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeequan/jeepay/core/utils/RegKit.java | 9 +++++++++ .../pay/channel/alipay/AlipayDivisionService.java | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/RegKit.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/RegKit.java index 61dc7e7..6732290 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/RegKit.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/RegKit.java @@ -24,13 +24,22 @@ package com.jeequan.jeepay.core.utils; */ public class RegKit { + public static final String REG_EMAIL = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$"; //判断是否是邮箱 public static final String REG_MOBILE = "^1\\d{10}$"; //判断是否是手机号 public static final String REG_ALIPAY_USER_ID = "^2088\\d{12}$"; //判断是支付宝用户Id 以2088开头的纯16位数字 + public static boolean isEmail(String str){ + return match(str, REG_EMAIL); + } + public static boolean isMobile(String str){ return match(str, REG_MOBILE); } + public static boolean isAlipayLoginName(String str){ + return isEmail(str) || isMobile(str); + } + public static boolean isAlipayUserId(String str){ return match(str, REG_ALIPAY_USER_ID); } diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java index 4ed351e..f6be6cc 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionService.java @@ -80,9 +80,12 @@ public class AlipayDivisionService implements IDivisionService { RoyaltyEntity royaltyEntity = new RoyaltyEntity(); - royaltyEntity.setType("loginName"); if(RegKit.isAlipayUserId(mchDivisionReceiver.getAccNo())){ royaltyEntity.setType("userId"); + } else if (RegKit.isAlipayLoginName(mchDivisionReceiver.getAccNo())) { + royaltyEntity.setType("loginName"); + } else { + royaltyEntity.setType("openId"); } royaltyEntity.setAccount(mchDivisionReceiver.getAccNo()); royaltyEntity.setName(mchDivisionReceiver.getAccName()); @@ -158,9 +161,12 @@ public class AlipayDivisionService implements IDivisionService { // 入款信息 reqReceiver.setTransIn(record.getAccNo()); //收入方账号 - reqReceiver.setTransInType("loginName"); if(RegKit.isAlipayUserId(record.getAccNo())){ reqReceiver.setTransInType("userId"); + } else if (RegKit.isAlipayLoginName(record.getAccNo())) { + reqReceiver.setTransInType("loginName"); + } else { + reqReceiver.setTransInType("openId"); } // 分账金额 reqReceiver.setAmount(AmountUtil.convertCent2Dollar(record.getCalDivisionAmount())); -- Gitee