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 7fbdb6ad91fec9eef574c769fbe2af337b4bcd5f..592fba1cf5b524ce81b8fd764f2dfdf17479cb38 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 f756dc7b98d170f17e58ffa95e31a71b85936a7a..f09b7b9dafd9b87734a9a25da07f1a1f059a475e 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 af4515a51d4b29ec453f4353e50e55a57062b00c..0b5114338ae1e8244cb1f67afdc8278f37af5ecf 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 785078df4d32117d308604b6f91591cb0270a4ad..97ac43e3d200b6a6becae30f62df7a482916b56a 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 023a54f2fc49274a5d90d2d46eb5c1eb1fae1913..668bf105b1dd65da1fff25361078d96210e21624 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 6ea991e3f0c55ae31ee699745d512d5620a1ba32..1a5794d98010d6ee1938e0ce620984c4d50c8729 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 e02759b977e37a7f501066a5f8b7cbca4cb017d8..22d834b9f7dca5ca4f53de996340a81e5a83904b 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 e409290cb2e9cc7304c7169cdb5c1efb3232da23..807a2ab61964939df9fefb3289b772d24befe1bf 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 fc4c4fbf1d9117556da6be6d3f4db7edf89a30c8..db77bb9c1e675def742d16e9093bf14e54fc01fa 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 1cff16e1b69b1c27f08692d9a23f7320986e3547..95730a98d68cfb7f4571398d989a326d8f32a8eb 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 d5e48241242f78bdb606d964406bdb908afd6eaf..a113f202c1ca920c50d941b4450083a48fa6db5e 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 16e6a11e946a20d67e26e04ff06e71e72409ef74..23302cff6637a550fe66b61c6ca3d67118906227 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 33c04d9211a191582ea00aec6624923d2c6d03ea..273a0819c0e7c413b0e25aa1e5c8e074e2d6c877 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 bd8aa170490ec4287488185c221c24b7da4ec357..a1af3ab02d360e4d49adb65665a64e880d0171c1 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 bd29e74ffaa2627b206252d2f9d10010a36bd1e5..76e4855db91a4e6b933c0e77a0bf52d74aefb8ca 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 a867c7f93627a7e6e98c3bd76c35b56991530d42..67210c5b32a556879a733837bdc23f3971111088 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 809e0a83fa33ac7fd885306e794eef4aeefbe405..6815aa9fee1044b055956158da4eab84e04bc413 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 4392f042f2a9bca9b687321172d09b3fdfe858db..d8c9b068e96c93c68864b9c7af20eb116323045b 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 085fd94c23819cd016ad9832a855709f8b1e0f7b..c7059e4bf23061bca10f883011d84947a9f21e8f 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 73d9346bab70bc31942a74fbffd5ea2abb1d755a..747df77bb13dfe1ca4d1525b7f094eb3359e4dc9 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 2e1a7c890bb9d589af0f39059bd4c256fb1366fa..b2943c734ff362260c80b343f6d7115f30bb7b08 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 470efa820d7ed8a27e39d1d6fa46bad979d91935..b149a3b7e24358d07651a108add9b64724eb8e73 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 9d1cf1cfa315c88788c4945f6fad8374dab3af18..c32c3a7684de44b984cbbaf63ffa3f571245c54c 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 18071f06ff4ae754dbd352ba36ac7722e6bfeb8e..b19873525ae482591fec6ac8ab269175244876bd 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 82217c0b381c61f390e67588040dfb244ed25417..94ac87d08fba74ee850a5c51b2fcf49a56e6b79a 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 f4509d92d1a89ea65fec7782fe6b6ec86571d097..600c83fad415838c7df5c1b5f745afe12baf44ab 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 c6a7d3e77b0353a73424c99c4c1f9fbb68637a84..895596510b11b69ae0cdd439511d2b061f7f7158 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 9570e2b34f094fb70cc711caac17a34aa76c8292..637205a2f82366a787dfe23f783f102b281175b1 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 856d379f4dca4a8ca000db80321aade3ea6b4df2..5d2bfdb86396bcfbdc9ef716fc34f538b274d68d 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 5e2e139dbb1439b78e214e824b80401a283b918b..5a498a454360d276cb6ba8b2ce5668f7b0e10667 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/RegKit.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/RegKit.java index 61dc7e7284e9e22996f27521d7da2bdb38df0edf..6732290a4279c0b8059d6bf9350e14e9600ccd44 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-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 06cec79d5c2a15ee7f5513d483e73f2c12f39719..399a6704b2f301dcf000e350093de3b9dee2a548 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 271663465ed400ad97c9558f525f8b31a69d1755..4cdd320f06176da57a794e4a96a555ebd7303994 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 afa6b626e89c57155eebd5dc88085463c901c8a3..2df5d36fdf54941e345508c45a223b12e5232c97 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 62f8f1c7051283b858c9aac23fcd205638908091..740917f344c3b4b707f6e839e57e9e1d88fbd3c4 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 7cbb70318c22fad7568391c3f96643bf32ef7479..90fb653aaea2622dcfed5981200c9f3feb9ffb8a 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 94323b2db2375b0b25ed3474169c787a77ff6d5d..89eedb609cafc67c0cec8fd126788cdfffb018a5 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 2e0d6070401c6656f075a2ed90417a6419a8c313..b73d8ef2b8fc4dbcc8e36a8f202507864334c8e4 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 d6204fa7effddee7eab0ee0d922e889ddcb1e8ce..7abb37054d04ddce3d74c4adc9479d679a95b45a 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 0073b9e66c0d2832a7e8d0587488e12a6ca82607..33dcb001f99119764648b4ae658becd047c7ebfe 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 1c0ed2e163439bb29ccdc500fa8de0252107d1d6..00bacb2cbbe33a810304375bfa53908f45dedc93 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 2719afb44819eb9bc848c366b2b9885604b4393f..11cdcddfe45f117215a39378e0366a19b461068e 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 50deca9805e435f05b6c6af4dcdad008ceb28ad7..d5d6c78a1bf45b6de4a3be76d5cd969ffd41053a 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 a029285705aef573c9101ecf7e6f4a998481dd1a..b999d5550baee20f25879b65b6598ca324097f08 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 df2d34785007116da830aed73946af3b27b4c554..f4654d9787941fb4dc4ac40b2c6c852b911bbc0e 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 a377372b376e8ef9a097665e0d5a85e45c0ee860..a55c1cf9fd2c2ed2ca6cae88013af2a1b8042d4f 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 f1b205dfdf1f0bad3048a3523386c274e2b065e8..698a0b5c008f689fd6e3b0de5f5efdd2fbcb4cdf 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 fd9fccb46259e51372a8e70e722abdcf0b18cfb2..f9b8bab217cd69b85868e048ac3702c47e7132a0 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 cc9609a6a384b0f7c4b63fbc435d42e962352039..70e5a1089fbca9fe3d41c90e41df74bb746ece07 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 2825fe2c1324373a4816b27cd413d85af590248c..210af3b993f07aad37b79cfef64dbc6b96880179 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 4083b4e5835526bef5fe537fd09ea14983952071..7947469951b362c2896c6c45d444ca7bbb2f33f9 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 4a0e97ec8f512aa5b1cf060f1571830c016abffb..bc2dc6d0fb4cb6006f2b522d330cd3fd1e25bbbc 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 8cc1d69887d84354ddd97a64a8a2d6835c706be2..a35378f57a6bcca564f9af11b5b1e51cb9c98c38 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 8630a060b130e61cf5aa746450b8512608788150..3f4601a1b98d89182c2b852cc9f0eac2be3d1085 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 c69149ee8ece3d3b9c26754b7d878e2a0dd60efc..d26ce0020deab867950c5c261c4523acd5878bdb 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 a028d65ad812e6df7d0cc6aef87420aae38e45eb..1ec8583089602eae9eccf18c15775273493f6f11 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 56e1592c15e444bfd2cf2348d967caf7961f40e0..53076601bbb0a68b48abab1d32029b509ad7b360 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 eb2b8222bbb0e0bbb1aa962f6e2c59ba24137caf..3d600656fdea185fcab4bd601c0f71326692d29e 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 e7959cfc77d781918e07afa0e3e3ba6029b1301e..a250ee4a1ba6837721298eab0b5ac44c21d80299 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 4c78dd6663f144459bc98c1845fed999e96eef07..e3ab3f376d23c4dd3b3d9b4a6897114ab731537f 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 64d4ce23eb74da3fb8394cc71cf019635e78d884..c9e6fffd50e54937c4b70ba7fdbdc937cf49884f 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 3e594c9078eb297d1005a7a07a24391273c39d20..4d1f9f79223435d4f5cb56e3dd6c3892a7c491bb 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 fb6e6c97ec9932d29e22e3c8a902d1413b4cbff4..7c655ab3852676fa85ead249d8562288acf0d0d7 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 c1038312916333f94bba3a6db65b0c7487ac5750..7b551eeb5f05564cae278644c3b986bba29ecdb1 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 3fb0e11dffeb19b681f3828104dbc02b3ba4b4bb..af8fd2d949740b2d2c102ec571bb50cfbe39dc32 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 4c6fe73688c0b754fc3e3059f864a34000ab573f..20f8c8d11563ba1d421c54603043d8e67f01aa3a 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 9c6e48ec3ed70e8454684200adb606b29b9546f0..c71bba988a073979466352533df11017c55aeb49 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 006172284b2ae9da5314262f8e0f3b586c0c72be..d08426b8246b87c8bb848b24cd8e7c5ed4af6ddc 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 86aae3645a98bda54f323e0d5adfc2191c8d39bc..16bbe70a1626bc4165d442848702b2b4c01fd352 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 2153897cfc175b8897c1ebb0299feb945824774a..5096aedc723225b92c77926a584b24c01684d9d5 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 6a298de3efdc22b1921eb131f6e8ed59270e1cb3..c585c53dbdad758cfe290cb3ab04efa42b18b274 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 778f0043e6062f4a0051d6e5b24559721ad5a79b..06c35c4125b532d9b641b3098c9942a6df47d85a 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 576dd59fae89acfb7a5a1f9ef8ac389240ed4cbe..e12437aaf996f05279f017d5dd1b874ba601a64b 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 e125b0c7b2f1ff68a692bd0d71cad933080b0afb..ea3353e2d8c300d850805c43d510f3c7e13238ea 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 6f6d38ce5233247edff3a93b0d5f5d6c095ea090..f24fbc8291cc7e944bc021e3822e46161242a94b 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 cb4e6ac03c0203210ba9f8cb01c2442362181112..000fe9275d24ca819dcd64d509aff2dd1206fa16 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 7c0f4cc60ed5bb27add0c8787f93f6a93250e398..28a1e5fc7727b0bd4b9c8ed8c6738a73d845bd97 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 317b4bf9a32c606cb173cee604b7b588ba919115..284653aa5674d0a326048b0dd505cf1d3656ffc2 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 ea9822194db2fe1a486cce652333491140b98e0c..3f05697a4df0f53052002f05606d33e98b2d23e1 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 2f93530b5936f9980eff90d59975346421ff6078..9b30c619d03993d4fac1dc2edd4e18cc8cb8e925 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 58d49a1ec3a71b7b14460e41604e774fe5f90742..725ffd713013f8dd738016d1eca70ce262502246 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 8d0d40fec1db16ef85d49a1a09e9b6dcfec85980..ce43d14a5463739f97fca0045a87333fe605f3c0 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 d869ebd7a7967994141cc93c48649cdb064fbc01..489ec02ddee32ebade074960cb064503658bcff6 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 2e2c44f27ca6ec8fa3ad81aeab7ce02f652c2f28..3d5e294ce34b1f415bcf4b945e7934cf7ff9bef7 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 79310d5cc578fce6c2d9bf5d6c1ab7722bc38415..f66e69c3457083f2760d5f999a3bc8a7fa12d390 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 b0932126bd050f62ad0c26f377896aebab7ea502..e72518a9c76d24514b96dfab64a2cb033879a551 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 79f353bdf465f6b5e09447418670daf5e0be87e5..f8d457bacad81bcb4c94bb7926d0b63660539849 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 18d02aad42756a47a96589f1cb54436c7fea5960..2fbbad991a0bbe0fce7f76152a47860ea9c61cb8 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 2ba9e04b4e76fe535f5e47d5d211deae761ec267..f728fa569a0e6181cfe008b1f994b8f6fc71d778 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 993a9ff89a27d2c342b7135d72ee3ec6e41a1d7f..2b42f771b942e490538e95b247db5c2208c24614 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 ee0cc076c07cd1d37d1bbbaafe0739698869aa7f..412056266207a0310d3b165fc25e0ff594f51e9c 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 1c6dab8d03f589c24f16ecd73bd88059279df39e..bc67126fd61eddd45b912771c117341bf69c9417 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 2208c2b3ae70a4e16220a5cb86397675ac12c212..9a1dcc9f8ca94cc49b7aa90edc18ea3d1b297352 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; @@ -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/AlipayDivisionRecordChannelNotifyService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayDivisionRecordChannelNotifyService.java index 78b8ab061dd42c398a39386cf6ea2f5202c39c97..bc1d4d1292d95b2c3021aa2b306b3c30bc1481e0 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 ee3958b9cbacf016b2cbd1016bf379b8afc7254f..f6be6ccbce1f86205f0c432148fd2bad1cdba587 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; @@ -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())); 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 a7989f37e9953f5ec947c66f554df8be5521d0e3..7b952cc3f87026a274d1490b7b3257784162031a 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 54abec579f6b9e880b1300af485e1f2acc632568..cb693608d24e8465f429dbf086401b8fc5255c10 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/alipay/payway/AliJsapi.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/payway/AliJsapi.java index d8ac2633db110f6ff6aa128a463db748f5acdbc0..535398a6d66d25ab10b876f5de0efbd00a8a0c10 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); 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 9de48ed3300b8c4ced65078c51156237b2f2f8a9..1cda0d2af0ca43495d5cc23305d3ee4038ffe77a 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 71758687c7bb1fb64936ba3564b962d70320bc66..206461a00da9cc1fa8f11625265a7274ec9c0b47 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 67fd5d4c76ea84cafd0639e8d6c8f4b1cf363935..83af283ef9bf948330f4cfe40b96884e6318c82c 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 b095fafa648f9b18aa3ce32753219c51f43305c6..a7c11fd02fadd065d0050d985fa697e9c57d0075 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 96e9ec4a6e44d7495a289275493dc187ff77e3c7..17a66a703ac00feb8f62d910d38f704d6518b84a 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 cfc2ba086b892755b39c5441589a960cebf5e3c2..26b6b6f7543e7d4760c07c2e035e89445c6a5e92 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 9169d37fc9f3bae8fbf830a39b29b608ee499251..4e2a791fb831728c7b2fb23ab44055b828afdb70 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 04b00a3694a93ecc3e092b61fccb9ac2ef319f3d..0c8f4532002bf89acc9e5b9713dfcc5aa93ff364 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 bffdb1ce4164a30a65d27b29ef098fd37b6f18f8..ee6cae590181671c4afc8f6d377c68412b311dd7 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 7aea127cb2a3ab6d5ab10b8fb36b46337619cf6d..0faa536239006914641b17344dabb3785d2daa24 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 cecd25eb42ec229ef886e348d020dde1fe8d2e49..8ce8a7a0a0985e6414b6c24a70f61f5ad51708ca 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 dd2ec27dc22ed29916dd47681d27f223b6899e14..5c0de586c39f20486da41a4ad1c3140e534381e1 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 2cc781824887d209b34d4f2264a13993e35a8428..cf3cd0112f6b7ec28d10faa9f05095d8235288ec 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 9d600ad679cfad20133d2c82eb9bf64d2e362a50..c45ebad962c57b51aac7c2d7522b3f4f77db7862 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 3329418cd403842b2bcf79992520c3a99c0806a4..9d8dfa44fe6705faccada36526d5fe3ae2b74c6d 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 1381e7c2ad64fbe812fe3d0aa6bb25fe8e06a577..7eaff53f4698bce83cd0aeb8cfbddf5cce592502 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 d14c45079f3e296024e38bf5e98caab958201efe..bbcdfe67367cd79fe13e280597cdefa7028d097c 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 067f40183451d6b0207ff6e0a070661ae3e8d2e9..68a6105c864d10a31e8329e0e8d9b933144ec708 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 68fe70807d6d7541aa411d865f98ca555b99b6fe..b752baba9582de10f9729ad6f809316ae89e88a2 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 1c6b015f60a0133573379082481a94aad3f07522..f02b303067009803c805d400aaf09177bae8cac0 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 62ee94b9fe231e960f4e134a9da83253554a9477..081c061766b272daab234bd00fe395964f747520 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 b30990a5b4af6b8660f360946ffe8195cf431c25..837a9821aa1a059040942b46461d58e9f499e175 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 018584fc80dafb47e10691aeeaccd3efe70e031b..57828d8e18cf7efa823f554552457687c7dbade8 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 671b8651af84a6fa99c88104ca0cef639cbde909..cedbbd3952d6967106c180410b8448cd6d54b10e 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 0b5e7b635fedae7b8608850dabfd2991064afa8f..c9ed3b84ece3bb3cc1f46dfa14503006f819b1e9 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 ec3773f47903fdfabe8eead0d284652e87edda2f..a75a229bbb0093417729c4a3722e029c3606d70d 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 154e5ff40652715b3c8450f609ed05b8e51d8e7c..0f1245630e2c6b4303d48228d941b6ce2fd93e5b 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 8da0a1dc42ffeb3ddc88b1fdd0a3ca5c482d3a8f..59d57d576a2dfd428156564233de76afc5e88d7d 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 5764852ff0a5b2945fc8f5056c9ea903da9eeffa..23ce3b2a540d005366ba7a04e98a2d5d92d912b0 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 8c2d3c08c1cd12eee8d7ca6f053068041a1f0bc6..ae8cd218b62fea41f031033b9a2d83d2ca3e4c8f 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 15e916cf6e39a712383b0f73a1b0cf5e09c02423..19937017af1f374f7fff1809740065d323328026 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 9ebd5af9f28af215fd4bed0d3e5ae6e0f1c618a3..8c3cc69d644d829650582ddad03ba19d2a552541 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 362fc8381132bdea02a4e5d053bbbb6fa803ef88..9d9cf40548505298fcda56d6fb1d16c3d56515b0 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 b9160325d5ef264c2dde695c03d771a6c3bb2534..3f3fc54e48be33b3acfa4b15d37c3b13267612bf 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 ef7061656f034efa97e5b371d08ce120e7bb7d60..3e39d54237fbf13e5ce87905c4c50762c2acd3b0 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 1850f8851f54bc855ac6ac65f39419e5aedb059a..8d2535063eeb0afb93f88387ccd1468165768420 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 1ddc40cc5fa4672d00f094b9024c8c9dd1a8bd9e..c948d8e7c3b8cf01df8910306d5dd3554d113b9b 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 08cefd32b012cfd609bf0adffae2be3b044de715..f8ddb0b0d2bcd568210ef221be52c0413fa7e922 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 940b3da20aaa13d3b35b226d4cfdf778da0e19eb..5ce2f73ae7c96c39c482c9768ec4da0e7632b233 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 97d75379806c5e1a0443de9ad84645805e48a096..29e3f1ac81e01e86db4cfa4383735e48d1111bee 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 d47c5d00c36139428ed6bc48185dd64d1f921bef..56c5c99f9003980f90cac75340a3a357c3098e1d 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 1c590752e6cb4ddc68d97a346fe38b1c8496978a..22805899e31e49816faf883dcf97b86dd23e6604 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 c462bf5fd53082ad76602a5f42dcca1e84956b15..53765d580214d8df491971c5e81e12b4e53ada6a 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 f31cf372740d68179d26251efa09bbe174b5c599..5805a316bdce7608c2e228dbbabef6a6ef40e15e 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 5348f86694ba8502a1240ead63983e242aba388a..6b4f7f2d010ba15f91325fbbfa53a3d3bc3570f5 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 8bb45b738e22de07a00c910507c48f87eca9ecb0..8a09997982372f63a1c5b530297a9d0d8f667b89 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 a3556445189b21d247181e04714e627d57551fc9..0a8dfbef46ba3ac96022f818f4c5d832abf6866b 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 346149fa158d17f7c7172e046f72cefe4839e9b2..1b2f173f82c56f9611af5c9d8dd81cd43c291453 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 f8f4ea8522f6809e23399fe7bf61dbf083694ebd..2c913601e631f157a36068b7887eb8ec56c930ec 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 9c46b919ec095ed70aeb8e8499414dcec2d94e21..02ee918126fa073b4149ce93da63478b9b82975a 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 a3f43c40631427c86a6b46de9e25a33b52db4b41..b7f72fbcc5ca55e800d0a3f8dc338e642a2799a3 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; @@ -170,7 +170,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) @@ -185,7 +185,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 f55c72806c132c889610a6ff3bb592519352c970..f8af125a8911da360a582ea4ec52b2ffc4db6c63 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 827eb5ff4a83370a91c5d41d0a7038c8506ace54..d304ca623612f1babb0241508afca4958b8316cf 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 4044297274f345cf88f4169f3fc87cd4dca54f5f..c720e52f82a14a48e47d65bf6f1d39bec36e1c50 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 c15aea0b3ad3535f7f147b14502858cb73bdabf6..0810aece2cc5b5ba5f6ba560ed1035c99695824a 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 5d7992fc92dd761155df4983f7160cf88cee8c15..cbf6e22eda0f157bf6877798eee8462fea526dfb 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 5022264af1b15b07486b4228bce1f1daebb10358..a7a362f8dd2575a91dff575df1d57c3a87c37425 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 98e857bacd546c95cab549b8c1d09f8cfdbacd04..00f1c566fc087ccbd2cd1fa11a3d0f86f1742edf 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 4b83d051bc39b3c05452836ea3da99010278f913..4b25ac512b8020a3705a9dd1dcabe6383ed32023 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 0000000000000000000000000000000000000000..01b0b28cbd643be795c4a0be9e89f02c1852a22f --- /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 78d3121a1359bc2b96eb947c19416fcc1c60a44f..998e95974938a401d18feb99dba72e68da91113f 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 f0afe914f36b3e7b554c40153df96b1a776398ae..6c79ecef256250dd552f4941ce02537cf4f4b022 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 ae274c0856dc3bdc2ff83507734bc17a0db46dd3..ddacb37bfca70c4cd801a7efa523ade21921c02c 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 fdb0a452123344ecb62685f9602c551dd9c703e2..6103f1011b786c131018cd3f8ff42bac2db6cfd8 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 6569fb7a91d708f4b0c604ac99a35c84d4a35804..12c152fbba5d7c0e15c43a34abe4b3e6696c0518 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 f87a3acb9b54be8d0c46d355cf4d5e1caa18ab1d..7a0d03f3fb26a1e47cfeeace59a2d6c2377ad1e7 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 a255b98b1d29777ff983a3480966131a236c9f84..fa5960cf558f250a310c23fa0b8a30bfd4e4938c 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 7324c0ce2936500fcd3017458c2213c1933358c2..744498aa6ca2f737e4f11d178b4c99cadf9d20ea 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 282692ae74c83c0aa2433ebf81a28c024557cb9b..22c2f69b44cfc4fac58d75a948f5ee55c1a25f08 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 61a1aea9ea194b28236440e238460ba9c00ab240..1a70aa71e2e3b8d826174032bf95c5bfaf9a34e1 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 373e6ad1af89620165cfb243e93f907abebefe91..ce757f9b06984dde92312136b82821ca548f6289 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 54ab046482d5705be63286b911de9e7aadfb61ca..1f78f1deb6112d6e6cc18e7e0955b0c40c793dd8 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