BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 14893c4cffd5ea46cfbe72ff63776a22b0e2839e

Authored by YunaiV
1 parent 4390e28e

pay: 优化回调的逻辑

Inline Side-by-side
Showing 20 changed files with 130 additions and 515 deletions
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClient.java
  View file @14893c4
1 1 package cn.iocoder.yudao.framework.pay.core.client;
2 2  
3   -
4   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
5   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyDTO;
  3 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
6 4 import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyRespDTO;
7 6 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
8   -import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedRespDTO;import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
  7 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedRespDTO;
  8 +import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
9 9 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedRespDTO;
10 10  
11 11 /**
... ... @@ -31,15 +31,6 @@ public interface PayClient {
31 31 PayOrderUnifiedRespDTO unifiedOrder(PayOrderUnifiedReqDTO reqDTO);
32 32  
33 33 /**
34   - * 解析支付单的通知结果
35   - *
36   - * @param data 通知结果
37   - * @return 解析结果
38   - * @throws Exception 解析失败，抛出异常
39   - */
40   - PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws Exception;
41   -
42   - /**
43 34 * 调用支付渠道，进行退款
44 35 * @param reqDTO 统一退款请求信息
45 36 * @return 各支付渠道的统一返回结果
... ... @@ -47,32 +38,15 @@ public interface PayClient {
47 38 PayRefundUnifiedRespDTO unifiedRefund(PayRefundUnifiedReqDTO reqDTO);
48 39  
49 40 /**
50   - * 解析支付退款通知数据
51   - * @param notifyData 支付退款通知请求数据
52   - * @return 支付退款通知的Notify DTO
53   - */
54   - PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData);
55   -
56   - // TODO @芋艿：后续改成非 default，避免不知道去实现
57   - /**
58   - * 验证是否渠道通知
59   - *
60   - * @param notifyData 通知数据
61   - * @return 默认是 true
62   - */
63   - default boolean verifyNotifyData(PayNotifyDataDTO notifyData) {
64   - return true;
65   - }
66   -
67   - // TODO @芋艿：后续改成非 default，避免不知道去实现
68   - /**
69   - * 判断是否为退款通知
  41 + * 解析回调数据
70 42 *
71   - * @param notifyData 通知数据
72   - * @return 默认是 false
  43 + * @param rawNotify 通知内容
  44 + * @return 回调对象
  45 + * 1. {@link PayRefundNotifyRespDTO} 退款通知
  46 + * 2. {@link PayOrderNotifyRespDTO} 支付通知
73 47 */
74   - default boolean isRefundNotify(PayNotifyDataDTO notifyData){
75   - return false;
  48 + default Object parseNotify(PayNotifyReqDTO rawNotify) {
  49 + throw new UnsupportedOperationException("未实现 parseNotify 方法！");
76 50 }
77 51  
78 52 }
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/notify/PayNotifyDataDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/notify/PayNotifyReqDTO.java
  View file @14893c4
... ... @@ -13,11 +13,11 @@ import java.util.Map;
13 13 @Data
14 14 @ToString
15 15 @Builder
16   -public class PayNotifyDataDTO {
  16 +public class PayNotifyReqDTO {
17 17  
18 18  
19 19 /**
20   - * HTTP 回调接口的 request body
  20 + * HTTP 回调接口的 request body
21 21 */
22 22 private String body;
23 23  
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/notify/PayOrderNotifyRespDTO.java
  View file @14893c4
... ... @@ -36,14 +36,8 @@ public class PayOrderNotifyRespDTO {
36 36 private LocalDateTime successTime;
37 37  
38 38 /**
39   - * 通知的原始数据
40   - *
41   - * 主要用于持久化，方便后续修复数据，或者排错
42   - */
43   - private String data;
44   -
45   - /**
46 39 * TODO @jason 结合其他的渠道定义成枚举,
  40 + *
47 41 * alipay
48 42 * TRADE_CLOSED,未付款交易超时关闭，或支付完成后全额退款。
49 43 * TRADE_SUCCESS, 交易支付成功
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/notify/PayRefundNotifyDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/notify/PayRefundNotifyRespDTO.java
  View file @14893c4
... ... @@ -15,14 +15,13 @@ import java.time.LocalDateTime;
15 15 @Data
16 16 @ToString
17 17 @Builder
18   -public class PayRefundNotifyDTO {
  18 +public class PayRefundNotifyRespDTO {
19 19  
20 20 /**
21 21 * 支付渠道编号
22 22 */
23 23 private String channelOrderNo;
24 24  
25   -
26 25 /**
27 26 * 交易订单号，根据规则生成
28 27 * 调用支付渠道时，使用该字段作为对接的订单号。
... ... @@ -46,18 +45,14 @@ public class PayRefundNotifyDTO {
46 45 */
47 46 private String reqNo;
48 47  
49   -
50 48 /**
51 49 * 退款是否成功
52 50 */
53 51 private PayNotifyRefundStatusEnum status;
54 52  
55   -
56   -
57 53 /**
58 54 * 退款成功时间
59 55 */
60 56 private LocalDateTime refundSuccessTime;
61 57  
62   -
63 58 }
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/AbstractPayClient.java
  View file @14893c4
... ... @@ -12,6 +12,7 @@ import com.alipay.api.AlipayResponse;import lombok.extern.slf4j.Slf4j;
12 12 import javax.validation.Validation;
13 13 import java.time.LocalDateTime;
14 14  
  15 +import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMATTER;
15 16 import static cn.hutool.core.date.DatePattern.NORM_DATETIME_MS_FORMATTER;
16 17 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
17 18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
... ... @@ -129,7 +130,12 @@ public abstract class AbstractPayClient<Config extends PayClientConfig> implemen
129 130  
130 131 protected String formatTime(LocalDateTime time) {
131 132 // "yyyy-MM-dd HH:mm:ss"
132   - return LocalDateTimeUtil.format(time, NORM_DATETIME_MS_FORMATTER);
  133 + return LocalDateTimeUtil.format(time, NORM_DATETIME_FORMATTER);
  134 + }
  135 +
  136 + protected LocalDateTime parseTime(String str) {
  137 + // "yyyy-MM-dd HH:mm:ss"
  138 + return LocalDateTimeUtil.parse(str, NORM_DATETIME_FORMATTER);
133 139 }
134 140  
135 141 }
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java
  View file @14893c4
1 1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
2 2  
3 3 import cn.hutool.core.bean.BeanUtil;
4   -import cn.hutool.core.date.LocalDateTimeUtil;
5   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  4 +import cn.hutool.http.HttpUtil;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
6 6 import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
7   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyDTO;
  7 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyRespDTO;
8 8 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
9 9 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedRespDTO;
10 10 import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
... ... @@ -20,7 +20,6 @@ import lombok.SneakyThrows;
20 20 import lombok.extern.slf4j.Slf4j;
21 21  
22 22 import java.nio.charset.StandardCharsets;
23   -import java.util.HashMap;
24 23 import java.util.Map;
25 24  
26 25 import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
... ... @@ -48,56 +47,6 @@ public abstract class AbstractAlipayClient extends AbstractPayClient<AlipayPayCl
48 47 }
49 48  
50 49 /**
51   - * 从支付宝通知返回参数中解析 PayOrderNotifyRespDTO, 通知具体参数参考
52   - * //https://opendocs.alipay.com/open/203/105286
53   - * @param data 通知结果
54   - * @return 解析结果 PayOrderNotifyRespDTO
55   - * @throws Exception 解析失败，抛出异常
56   - */
57   - @Override
58   - public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws Exception {
59   - Map<String, String> params = strToMap(data.getBody());
60   -
61   - return PayOrderNotifyRespDTO.builder().orderExtensionNo(params.get("out_trade_no"))
62   - .channelOrderNo(params.get("trade_no")).channelUserId(params.get("seller_id"))
63   - .tradeStatus(params.get("trade_status"))
64   - .successTime(LocalDateTimeUtil.parse(params.get("notify_time"), "yyyy-MM-dd HH:mm:ss"))
65   - .data(data.getBody()).build();
66   - }
67   -
68   - @Override
69   - public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) {
70   - Map<String, String> params = strToMap(notifyData.getBody());
71   - PayRefundNotifyDTO notifyDTO = PayRefundNotifyDTO.builder().channelOrderNo(params.get("trade_no"))
72   - .tradeNo(params.get("out_trade_no"))
73   - .reqNo(params.get("out_biz_no"))
74   - .status(PayNotifyRefundStatusEnum.SUCCESS)
75   - .refundSuccessTime(LocalDateTimeUtil.parse(params.get("gmt_refund"), "yyyy-MM-dd HH:mm:ss"))
76   - .build();
77   - return notifyDTO;
78   - }
79   -
80   - @Override
81   - public boolean isRefundNotify(PayNotifyDataDTO notifyData) {
82   - if (notifyData.getParams().containsKey("refund_fee")) {
83   - return true;
84   - } else {
85   - return false;
86   - }
87   - }
88   -
89   - @Override
90   - public boolean verifyNotifyData(PayNotifyDataDTO notifyData) {
91   - boolean verifyResult = false;
92   - try {
93   - verifyResult = AlipaySignature.rsaCheckV1(notifyData.getParams(), config.getAlipayPublicKey(), StandardCharsets.UTF_8.name(), "RSA2");
94   - } catch (AlipayApiException e) {
95   - log.error("[AlipayClient verifyNotifyData][(notify param is :{}) 验证失败]", toJsonString(notifyData.getParams()), e);
96   - }
97   - return verifyResult;
98   - }
99   -
100   - /**
101 50 * 支付宝统一的退款接口 alipay.trade.refund
102 51 * @param reqDTO 退款请求 request DTO
103 52 * @return 退款请求 Response
... ... @@ -109,7 +58,7 @@ public abstract class AbstractAlipayClient extends AbstractPayClient&lt;AlipayPayCl
109 58 model.setOutTradeNo(reqDTO.getPayTradeNo());
110 59  
111 60 model.setOutRequestNo(reqDTO.getMerchantRefundId());
112   - model.setRefundAmount(formatAmount(reqDTO.getAmount() / 2).toString());
  61 + model.setRefundAmount(formatAmount(reqDTO.getAmount()).toString());
113 62 model.setRefundReason(reqDTO.getReason());
114 63  
115 64 AlipayTradeRefundRequest refundRequest = new AlipayTradeRefundRequest();
... ... @@ -138,25 +87,29 @@ public abstract class AbstractAlipayClient extends AbstractPayClient&lt;AlipayPayCl
138 87 }
139 88 }
140 89  
141   - /**
142   - * 支付宝统一回调参数 str 转 map
143   - *
144   - * @param s 支付宝支付通知回调参数
145   - * @return map 支付宝集合
146   - */
147   - public static Map<String, String> strToMap(String s) {
148   - // TODO @zxy：这个可以使用 hutool 的 HttpUtil decodeParams 方法么？
149   - Map<String, String> stringStringMap = new HashMap<>();
150   - // 调整时间格式
151   - String s3 = s.replaceAll("%3A", ":");
152   - // 获取 map
153   - String s4 = s3.replace("+", " ");
154   - String[] split = s4.split("&");
155   - for (String s1 : split) {
156   - String[] split1 = s1.split("=");
157   - stringStringMap.put(split1[0], split1[1]);
  90 + @Override
  91 + @SneakyThrows
  92 + public Object parseNotify(PayNotifyReqDTO rawNotify) {
  93 + // 1. 校验回调数据
  94 + String body = rawNotify.getBody();
  95 + Map<String, String> params = rawNotify.getParams();
  96 + Map<String, String> bodyObj = HttpUtil.decodeParamMap(body, StandardCharsets.UTF_8);
  97 + AlipaySignature.rsaCheckV1(bodyObj, config.getAlipayPublicKey(),
  98 + StandardCharsets.UTF_8.name(), "RSA2");
  99 +
  100 + // 2.1 退款的情况
  101 + if (bodyObj.containsKey("refund_fee")) {
  102 + return PayRefundNotifyRespDTO.builder().channelOrderNo(bodyObj.get("trade_no"))
  103 + .tradeNo(bodyObj.get("out_trade_no")).reqNo(bodyObj.get("out_biz_no"))
  104 + .status(PayNotifyRefundStatusEnum.SUCCESS)
  105 + .refundSuccessTime(parseTime(params.get("gmt_refund")))
  106 + .build();
158 107 }
159   - return stringStringMap;
  108 + // 2.2 支付的情况
  109 + return PayOrderNotifyRespDTO.builder().orderExtensionNo(bodyObj.get("out_trade_no"))
  110 + .channelOrderNo(bodyObj.get("trade_no")).channelUserId(bodyObj.get("seller_id"))
  111 + .tradeStatus(bodyObj.get("trade_status")).successTime(parseTime(params.get("notify_time")))
  112 + .build();
160 113 }
161 114  
162 115 }
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXLitePayClient.java
  View file @14893c4
... ... @@ -7,9 +7,9 @@ import cn.hutool.core.lang.Assert;
7 7 import cn.hutool.core.map.MapUtil;
8 8 import cn.hutool.core.util.StrUtil;
9 9 import cn.iocoder.yudao.framework.common.util.io.FileUtils;
10   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  10 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
11 11 import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
12   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyDTO;
  12 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyRespDTO;
13 13 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
14 14 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedRespDTO;
15 15 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
... ... @@ -145,8 +145,8 @@ public class WXLitePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
145 145 * @return 支付回调对象
146 146 * @throws WxPayException 微信异常类
147 147 */
148   - @Override
149   - public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException {
  148 +// @Override
  149 + public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyReqDTO data) throws WxPayException {
150 150 log.info("[parseOrderNotify][微信支付回调data数据:{}]", data.getBody());
151 151 // 微信支付 v2 回调结果处理
152 152 switch (config.getApiVersion()) {
... ... @@ -159,7 +159,7 @@ public class WXLitePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
159 159 }
160 160 }
161 161  
162   - private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyDataDTO data) throws WxPayException {
  162 + private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyReqDTO data) throws WxPayException {
163 163 WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = client.parseOrderNotifyV3Result(data.getBody(), null);
164 164 WxPayOrderNotifyV3Result.DecryptNotifyResult result = wxPayOrderNotifyV3Result.getResult();
165 165 // 转换结果
... ... @@ -172,11 +172,10 @@ public class WXLitePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
172 172 .channelOrderNo(result.getTransactionId())
173 173 .channelUserId(result.getPayer().getOpenid())
174 174 .successTime(LocalDateTimeUtil.parse(result.getSuccessTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
175   - .data(data.getBody())
176 175 .build();
177 176 }
178 177  
179   - private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyDataDTO data) throws WxPayException {
  178 + private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyReqDTO data) throws WxPayException {
180 179 WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody());
181 180 Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS");
182 181 // 转换结果
... ... @@ -186,19 +185,11 @@ public class WXLitePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
186 185 .channelOrderNo(notifyResult.getTransactionId())
187 186 .channelUserId(notifyResult.getOpenid())
188 187 .successTime(LocalDateTimeUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss"))
189   - .data(data.getBody())
190 188 .build();
191 189  
192 190 }
193 191  
194 192 @Override
195   - public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) {
196   - //TODO 需要实现
197   - throw new UnsupportedOperationException("需要实现");
198   - }
199   -
200   -
201   - @Override
202 193 protected PayRefundUnifiedRespDTO doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) {
203 194 //TODO 需要实现
204 195 throw new UnsupportedOperationException();
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java
  View file @14893c4
... ... @@ -6,9 +6,9 @@ import cn.hutool.core.date.LocalDateTimeUtil;
6 6 import cn.hutool.core.lang.Assert;
7 7 import cn.hutool.core.util.StrUtil;
8 8 import cn.iocoder.yudao.framework.common.util.io.FileUtils;
9   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  9 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
10 10 import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
11   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyDTO;
  11 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyRespDTO;
12 12 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
13 13 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedRespDTO;
14 14 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
... ... @@ -130,8 +130,8 @@ public class WXNativePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
130 130 * @return 支付回调对象
131 131 * @throws WxPayException 微信异常类
132 132 */
133   - @Override
134   - public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException {
  133 +// @Override
  134 + public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyReqDTO data) throws WxPayException {
135 135 log.info("微信支付回调data数据:{}", data.getBody());
136 136 // 微信支付 v2 回调结果处理
137 137 switch (config.getApiVersion()) {
... ... @@ -144,7 +144,7 @@ public class WXNativePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
144 144 }
145 145 }
146 146  
147   - private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyDataDTO data) throws WxPayException {
  147 + private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyReqDTO data) throws WxPayException {
148 148 WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = client.parseOrderNotifyV3Result(data.getBody(), null);
149 149 WxPayOrderNotifyV3Result.DecryptNotifyResult result = wxPayOrderNotifyV3Result.getResult();
150 150 // 转换结果
... ... @@ -155,11 +155,10 @@ public class WXNativePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
155 155 .orderExtensionNo(result.getOutTradeNo())
156 156 .channelOrderNo(result.getTradeState())
157 157 .successTime(LocalDateTimeUtil.parse(result.getSuccessTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
158   - .data(data.getBody())
159 158 .build();
160 159 }
161 160  
162   - private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyDataDTO data) throws WxPayException {
  161 + private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyReqDTO data) throws WxPayException {
163 162 WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody());
164 163 Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS");
165 164 // 转换结果
... ... @@ -169,19 +168,11 @@ public class WXNativePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
169 168 .channelOrderNo(notifyResult.getTransactionId())
170 169 .channelUserId(notifyResult.getOpenid())
171 170 .successTime(LocalDateTimeUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss"))
172   - .data(data.getBody())
173 171 .build();
174 172  
175 173 }
176 174  
177 175 @Override
178   - public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) {
179   - // TODO 需要实现
180   - throw new UnsupportedOperationException("需要实现");
181   - }
182   -
183   -
184   - @Override
185 176 protected PayRefundUnifiedRespDTO doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) {
186 177 // TODO 需要实现
187 178 throw new UnsupportedOperationException();
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPubPayClient.java
  View file @14893c4
... ... @@ -7,9 +7,8 @@ import cn.hutool.core.lang.Assert;
7 7 import cn.hutool.core.map.MapUtil;
8 8 import cn.hutool.core.util.StrUtil;
9 9 import cn.iocoder.yudao.framework.common.util.io.FileUtils;
10   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  10 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
11 11 import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
12   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyDTO;
13 12 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
14 13 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedRespDTO;
15 14 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
... ... @@ -142,8 +141,8 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
142 141 * @return 支付回调对象
143 142 * @throws WxPayException 微信异常类
144 143 */
145   - @Override
146   - public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException {
  144 +// @Override
  145 + public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyReqDTO data) throws WxPayException {
147 146 log.info("[parseOrderNotify][微信支付回调data数据: {}]", data.getBody());
148 147 // 微信支付 v2 回调结果处理
149 148 switch (config.getApiVersion()) {
... ... @@ -156,7 +155,7 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
156 155 }
157 156 }
158 157  
159   - private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyDataDTO data) throws WxPayException {
  158 + private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyReqDTO data) throws WxPayException {
160 159 WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = client.parseOrderNotifyV3Result(data.getBody(), null);
161 160 WxPayOrderNotifyV3Result.DecryptNotifyResult result = wxPayOrderNotifyV3Result.getResult();
162 161 // 转换结果
... ... @@ -167,11 +166,10 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
167 166 .orderExtensionNo(result.getOutTradeNo())
168 167 .channelOrderNo(result.getTradeState())
169 168 .successTime(LocalDateTimeUtil.parse(result.getSuccessTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
170   - .data(data.getBody())
171 169 .build();
172 170 }
173 171  
174   - private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyDataDTO data) throws WxPayException {
  172 + private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyReqDTO data) throws WxPayException {
175 173 WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody());
176 174 Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS");
177 175 // 转换结果
... ... @@ -181,18 +179,11 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
181 179 .channelOrderNo(notifyResult.getTransactionId())
182 180 .channelUserId(notifyResult.getOpenid())
183 181 .successTime(LocalDateTimeUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss"))
184   - .data(data.getBody())
185 182 .build();
186 183  
187 184 }
188 185  
189 186 @Override
190   - public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) {
191   - // TODO 需要实现
192   - throw new UnsupportedOperationException("需要实现");
193   - }
194   -
195   - @Override
196 187 protected PayRefundUnifiedRespDTO doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable {
197 188 // TODO 需要实现
198 189 throw new UnsupportedOperationException();
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayNotifyRefundStatusEnum.java
  View file @14893c4
... ... @@ -6,6 +6,7 @@ package cn.iocoder.yudao.framework.pay.core.enums;
6 6 * @author jason
7 7 */
8 8 public enum PayNotifyRefundStatusEnum {
  9 +
9 10 /**
10 11 * 支付宝 中 全额退款 trade_status=TRADE_CLOSED， 部分退款 trade_status=TRADE_SUCCESS
11 12 * 退款成功
... ... @@ -17,4 +18,5 @@ public enum PayNotifyRefundStatusEnum {
17 18 * 退款异常
18 19 */
19 20 ABNORMAL;
  21 +
20 22 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/notify/PayNotifyController.java
  View file @14893c4
... ... @@ -3,7 +3,11 @@ package cn.iocoder.yudao.module.pay.controller.admin.notify;
3 3 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
4 4 import cn.iocoder.yudao.framework.pay.core.client.PayClient;
5 5 import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
6   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  6 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
  7 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
  8 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyRespDTO;
  9 +import cn.iocoder.yudao.module.pay.dal.dataobject.merchant.PayChannelDO;
  10 +import cn.iocoder.yudao.module.pay.service.merchant.PayChannelService;
7 11 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
8 12 import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
9 13 import io.swagger.v3.oas.annotations.Operation;
... ... @@ -17,6 +21,7 @@ import javax.annotation.security.PermitAll;
17 21 import java.util.Map;
18 22  
19 23 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  24 +import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
20 25 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.PAY_CHANNEL_CLIENT_NOT_FOUND;
21 26  
22 27 @Tag(name = "管理后台 - 支付通知")
... ... @@ -65,26 +70,31 @@ public class PayNotifyController {
65 70 @OperateLog(enable = false) // 回调地址，无需记录操作日志
66 71 public String notifyCallback(@PathVariable("channelId") Long channelId,
67 72 @RequestParam(required = false) Map<String, String> params,
68   - @RequestBody(required = false) String body) throws Exception {
69   - // 校验支付渠道是否存在
  73 + @RequestBody(required = false) String body) {
  74 + log.info("[notifyCallback][channelId({}) 回调数据({}/{})]", channelId, params, body);
  75 + // 1. 校验支付渠道是否存在
70 76 PayClient payClient = payClientFactory.getPayClient(channelId);
71 77 if (payClient == null) {
72 78 log.error("[notifyCallback][渠道编号({}) 找不到对应的支付客户端]", channelId);
73 79 throw exception(PAY_CHANNEL_CLIENT_NOT_FOUND);
74 80 }
75   - // 校验通知数据是否合法
76   - PayNotifyDataDTO notifyData = PayNotifyDataDTO.builder().params(params).body(body).build();
77   - payClient.verifyNotifyData(notifyData);
78 81  
79   - // 情况一：如果是退款，则发起退款通知
80   - if (payClient.isRefundNotify(notifyData)) {
81   - refundService.notifyPayRefund(channelId, PayNotifyDataDTO.builder().params(params).body(body).build());
  82 + // 2. 解析通知数据
  83 + PayNotifyReqDTO rawNotify = PayNotifyReqDTO.builder().params(params).body(body).build();
  84 + Object notify = payClient.parseNotify(rawNotify);
  85 +
  86 + // 3. 处理通知
  87 + // 3.1：退款通知
  88 + if (notify instanceof PayRefundNotifyRespDTO) {
  89 + refundService.notifyPayRefund(channelId, (PayRefundNotifyRespDTO) notify, rawNotify);
82 90 return "success";
83 91 }
84   -
85   - // 情况二：如果非退款，则发起支付通知
86   - orderService.notifyPayOrder(channelId, PayNotifyDataDTO.builder().params(params).body(body).build());
87   - return "success";
  92 + // 3.2：支付通知
  93 + if (notify instanceof PayOrderNotifyRespDTO) {
  94 + orderService.notifyPayOrder(channelId, (PayOrderNotifyRespDTO) notify, rawNotify);
  95 + return "success";
  96 + }
  97 + throw new UnsupportedOperationException("未知通知：" + toJsonString(notify));
88 98 }
89 99  
90 100 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java
  View file @14893c4
... ... @@ -2,7 +2,8 @@ package cn.iocoder.yudao.module.pay.service.order;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
5   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
  6 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
6 7 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
7 8 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderExportReqVO;
8 9 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderPageReqVO;
... ... @@ -93,8 +94,9 @@ public interface PayOrderService {
93 94 * 通知支付单成功
94 95 *
95 96 * @param channelId 渠道编号
96   - * @param notifyData 通知数据
  97 + * @param notify 通知
  98 + * @param rawNotify 通知数据
97 99 */
98   - void notifyPayOrder(Long channelId, PayNotifyDataDTO notifyData) throws Exception;
  100 + void notifyPayOrder(Long channelId, PayOrderNotifyRespDTO notify, PayNotifyReqDTO rawNotify);
99 101  
100 102 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
  View file @14893c4
... ... @@ -3,13 +3,12 @@ package cn.iocoder.yudao.module.pay.service.order;
3 3 import cn.hutool.core.date.DateUtil;
4 4 import cn.hutool.core.util.ObjectUtil;
5 5 import cn.hutool.core.util.RandomUtil;
6   -import cn.iocoder.yudao.framework.common.pojo.CommonResult;
7 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 7 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
9 8 import cn.iocoder.yudao.framework.pay.config.PayProperties;
10 9 import cn.iocoder.yudao.framework.pay.core.client.PayClient;
11 10 import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
12   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  11 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
13 12 import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayOrderNotifyRespDTO;
14 13 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
15 14 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedRespDTO;
... ... @@ -45,6 +44,7 @@ import java.util.Collection;
45 44 import java.util.List;
46 45  
47 46 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  47 +import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.*;
48 48  
49 49 /**
50 50 * 支付订单 Service 实现类
... ... @@ -105,7 +105,7 @@ public class PayOrderServiceImpl implements PayOrderService {
105 105 reqDTO.getAppId(), reqDTO.getMerchantOrderId());
106 106 if (order != null) {
107 107 log.warn("[createPayOrder][appId({}) merchantOrderId({}) 已经存在对应的支付单({})]", order.getAppId(),
108   - order.getMerchantOrderId(), JsonUtils.toJsonString(order)); // 理论来说，不会出现这个情况
  108 + order.getMerchantOrderId(), toJsonString(order)); // 理论来说，不会出现这个情况
109 109 return order.getId();
110 110 }
111 111  
... ... @@ -222,49 +222,30 @@ public class PayOrderServiceImpl implements PayOrderService {
222 222  
223 223 @Override
224 224 @Transactional(rollbackFor = Exception.class)
225   - public void notifyPayOrder(Long channelId, PayNotifyDataDTO notifyData) {
226   - // TODO 芋艿，记录回调日志
227   - log.info("[notifyPayOrder][channelId({}) 回调数据({})]", channelId, notifyData.getBody());
228   -
  225 + public void notifyPayOrder(Long channelId, PayOrderNotifyRespDTO notify, PayNotifyReqDTO rawNotify) {
229 226 // 校验支付渠道是否有效
230 227 PayChannelDO channel = channelService.validPayChannel(channelId);
231 228 TenantUtils.execute(channel.getTenantId(), () -> {
232   - try {
233   - notifyPayOrder(channel, notifyData);
234   - } catch (Exception e) {
235   - throw new RuntimeException(e);
236   - }
  229 + // 1. 更新 PayOrderExtensionDO 支付成功
  230 + PayOrderExtensionDO orderExtension = updatePayOrderExtensionSuccess(notify.getOrderExtensionNo(),
  231 + rawNotify);
  232 + // 2. 更新 PayOrderDO 支付成功
  233 + PayOrderDO order = updatePayOrderSuccess(channel, orderExtension, notify);
  234 +
  235 + // 3. 插入支付通知记录
  236 + notifyService.createPayNotifyTask(PayNotifyTaskCreateReqDTO.builder()
  237 + .type(PayNotifyTypeEnum.ORDER.getType()).dataId(order.getId()).build());
237 238 });
238 239 }
239 240  
240   - private void notifyPayOrder(PayChannelDO channel, PayNotifyDataDTO notifyData) throws Exception {
241   - // 校验支付客户端是否正确初始化
242   - PayClient client = payClientFactory.getPayClient(channel.getId());
243   - if (client == null) {
244   - log.error("[notifyPayOrder][渠道编号({}) 找不到对应的支付客户端]", channel.getId());
245   - throw exception(ErrorCodeConstants.PAY_CHANNEL_CLIENT_NOT_FOUND);
246   - }
247   -
248   - // 0. 解析支付结果
249   - PayOrderNotifyRespDTO notifyRespDTO = client.parseOrderNotify(notifyData);
250   - // 1. 更新 PayOrderExtensionDO 支付成功
251   - PayOrderExtensionDO orderExtension = updatePayOrderExtensionSuccess(notifyRespDTO.getOrderExtensionNo(), notifyData.getBody());
252   - // 2. 更新 PayOrderDO 支付成功
253   - PayOrderDO order = updatePayOrderSuccess(channel, orderExtension, notifyRespDTO);
254   -
255   - // 3. 插入支付通知记录
256   - notifyService.createPayNotifyTask(PayNotifyTaskCreateReqDTO.builder()
257   - .type(PayNotifyTypeEnum.ORDER.getType()).dataId(order.getId()).build());
258   - }
259   -
260 241 /**
261 242 * 更新 PayOrderExtensionDO 支付成功
262 243 *
263 244 * @param no 支付订单号（支付模块）
264   - * @param body 回调内容
  245 + * @param rawNotify 通知数据
265 246 * @return PayOrderExtensionDO 对象
266 247 */
267   - private PayOrderExtensionDO updatePayOrderExtensionSuccess(String no, String body) {
  248 + private PayOrderExtensionDO updatePayOrderExtensionSuccess(String no, PayNotifyReqDTO rawNotify) {
268 249 // 1.1 查询 PayOrderExtensionDO
269 250 PayOrderExtensionDO orderExtension = orderExtensionMapper.selectByNo(no);
270 251 if (orderExtension == null) {
... ... @@ -276,7 +257,8 @@ public class PayOrderServiceImpl implements PayOrderService {
276 257 // 1.2 更新 PayOrderExtensionDO
277 258 int updateCounts = orderExtensionMapper.updateByIdAndStatus(orderExtension.getId(),
278 259 PayOrderStatusEnum.WAITING.getStatus(), PayOrderExtensionDO.builder().id(orderExtension.getId())
279   - .status(PayOrderStatusEnum.SUCCESS.getStatus()).channelNotifyData(body).build());
  260 + .status(PayOrderStatusEnum.SUCCESS.getStatus())
  261 + .channelNotifyData(toJsonString(rawNotify)).build());
280 262 if (updateCounts == 0) { // 校验状态，必须是待支付
281 263 throw exception(ErrorCodeConstants.PAY_ORDER_EXTENSION_STATUS_IS_NOT_WAITING);
282 264 }
... ... @@ -289,11 +271,11 @@ public class PayOrderServiceImpl implements PayOrderService {
289 271 *
290 272 * @param channel 支付渠道
291 273 * @param orderExtension 支付拓展单
292   - * @param notifyRespDTO 通知回调
  274 + * @param notify 通知回调
293 275 * @return PayOrderDO 对象
294 276 */
295 277 private PayOrderDO updatePayOrderSuccess(PayChannelDO channel, PayOrderExtensionDO orderExtension,
296   - PayOrderNotifyRespDTO notifyRespDTO) {
  278 + PayOrderNotifyRespDTO notify) {
297 279 // 2.1 判断 PayOrderDO 是否处于待支付
298 280 PayOrderDO order = orderMapper.selectById(orderExtension.getOrderId());
299 281 if (order == null) {
... ... @@ -306,8 +288,8 @@ public class PayOrderServiceImpl implements PayOrderService {
306 288 int updateCounts = orderMapper.updateByIdAndStatus(order.getId(), PayOrderStatusEnum.WAITING.getStatus(),
307 289 PayOrderDO.builder().status(PayOrderStatusEnum.SUCCESS.getStatus())
308 290 .channelId(channel.getId()).channelCode(channel.getCode())
309   - .successTime(notifyRespDTO.getSuccessTime()).successExtensionId(orderExtension.getId())
310   - .channelOrderNo(notifyRespDTO.getChannelOrderNo()).channelUserId(notifyRespDTO.getChannelUserId())
  291 + .successTime(notify.getSuccessTime()).successExtensionId(orderExtension.getId())
  292 + .channelOrderNo(notify.getChannelOrderNo()).channelUserId(notify.getChannelUserId())
311 293 .notifyTime(LocalDateTime.now()).build());
312 294 if (updateCounts == 0) { // 校验状态，必须是待支付
313 295 throw exception(ErrorCodeConstants.PAY_ORDER_STATUS_IS_NOT_WAITING);
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundService.java
  View file @14893c4
1 1 package cn.iocoder.yudao.module.pay.service.refund;
2 2  
3   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
  3 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
  4 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyRespDTO;
4 5 import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
5 6 import cn.iocoder.yudao.module.pay.controller.admin.refund.vo.PayRefundExportReqVO;
6 7 import cn.iocoder.yudao.module.pay.controller.admin.refund.vo.PayRefundPageReqVO;
... ... @@ -52,9 +53,9 @@ public interface PayRefundService {
52 53 * 渠道的退款通知
53 54 *
54 55 * @param channelId 渠道编号
55   - * @param notifyData 通知数据
56   - * @throws Exception 退款通知异常
  56 + * @param notify 通知
  57 + * @param rawNotify 通知数据
57 58 */
58   - void notifyPayRefund(Long channelId, PayNotifyDataDTO notifyData) throws Exception;
  59 + void notifyPayRefund(Long channelId, PayRefundNotifyRespDTO notify, PayNotifyReqDTO rawNotify);
59 60  
60 61 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
  View file @14893c4
... ... @@ -7,8 +7,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 7 import cn.iocoder.yudao.framework.pay.config.PayProperties;
8 8 import cn.iocoder.yudao.framework.pay.core.client.PayClient;
9 9 import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
10   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyDataDTO;
11   -import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyDTO;
  10 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayNotifyReqDTO;
  11 +import cn.iocoder.yudao.framework.pay.core.client.dto.notify.PayRefundNotifyRespDTO;
12 12 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
13 13 import cn.iocoder.yudao.framework.pay.core.enums.PayNotifyRefundStatusEnum;
14 14 import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
... ... @@ -187,29 +187,22 @@ public class PayRefundServiceImpl implements PayRefundService {
187 187  
188 188 @Override
189 189 @Transactional(rollbackFor = Exception.class)
190   - public void notifyPayRefund(Long channelId, PayNotifyDataDTO notifyData) {
191   - log.info("[notifyPayRefund][channelId({}) 回调数据({})]", channelId, notifyData.getBody());
  190 + public void notifyPayRefund(Long channelId, PayRefundNotifyRespDTO notify, PayNotifyReqDTO rawNotify) {
192 191 // 校验支付渠道是否有效
  192 + // TODO 芋艿：需要重构下这块的逻辑
193 193 PayChannelDO channel = channelService.validPayChannel(channelId);
194   - // 校验支付客户端是否正确初始化
195   - PayClient client = payClientFactory.getPayClient(channel.getId());
196   - if (client == null) {
197   - log.error("[notifyPayOrder][渠道编号({}) 找不到对应的支付客户端]", channel.getId());
198   - throw ServiceExceptionUtil.exception(ErrorCodeConstants.PAY_CHANNEL_CLIENT_NOT_FOUND);
199   - }
200   - // 解析渠道退款通知数据， 统一处理
201   - PayRefundNotifyDTO refundNotify = client.parseRefundNotify(notifyData);
202   - if (Objects.equals(PayNotifyRefundStatusEnum.SUCCESS,refundNotify.getStatus())){
203   - payRefundSuccess(refundNotify);
  194 + if (Objects.equals(PayNotifyRefundStatusEnum.SUCCESS, notify.getStatus())){
  195 + payRefundSuccess(notify);
204 196 } else {
205 197 //TODO 支付异常， 支付宝似乎没有支付异常的通知。
206 198 // TODO @jason：那这里可以考虑打个 error logger @芋艿 微信是否存在支付异常通知
207 199 }
208 200 }
209 201  
210   - private void payRefundSuccess(PayRefundNotifyDTO refundNotify) {
  202 + private void payRefundSuccess(PayRefundNotifyRespDTO refundNotify) {
211 203 // 校验退款单存在
212   - PayRefundDO refundDO = refundMapper.selectByTradeNoAndMerchantRefundNo(refundNotify.getTradeNo(), refundNotify.getReqNo());
  204 + PayRefundDO refundDO = refundMapper.selectByTradeNoAndMerchantRefundNo(refundNotify.getTradeNo(),
  205 + refundNotify.getReqNo());
213 206 if (refundDO == null) {
214 207 log.error("[payRefundSuccess][不存在 seqNo 为{} 的支付退款单]", refundNotify.getReqNo());
215 208 throw ServiceExceptionUtil.exception(ErrorCodeConstants.PAY_REFUND_NOT_FOUND);
... ...
yudao-server/src/main/resources/static/pay_alipay_qr.html deleted
View file @4390e28
1   -<!DOCTYPE html>
2   -<html>
3   -<head>
4   - <meta charset="UTF-8">
5   - <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
6   - <title>支付测试页</title>
7   - <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.js"></script>
8   - <script src="qrcode.min.js" type="text/javascript"></script>
9   -
10   -</head>
11   -<body>
12   -<div>点击如下按钮，发起支付宝扫码支付的测试</div>
13   -<div>
14   - <button id="alipay_wap">支付宝扫码支付</button>
15   -</div>
16   -<div id="qrcode"></div>
17   -</body>
18   -<style>
19   - #qrcode{
20   - padding-left: 20px;
21   - padding-top: 20px;
22   - }
23   -</style>
24   -<script>
25   - let shopOrderId = undefined;
26   - let payOrderId = undefined;
27   - let server = 'http://127.0.0.1:48080';
28   - $(function() {
29   - // 自动发起商城订单编号
30   - $.ajax({
31   - url: server + "/app-api/shop/order/create",
32   - method: 'POST',
33   - success: function( result ) {
34   - if (result.code !== 0) {
35   - alert('创建商城订单失败，原因：' + result.msg)
36   - return;
37   - }
38   - shopOrderId = result.data.id;
39   - payOrderId = result.data.payOrderId;
40   - console.log("商城订单：" + shopOrderId)
41   - console.log("支付订单：" + payOrderId)
42   - }
43   - })
44   - });
45   - // 支付宝扫码支付
46   - $( "#alipay_wap").on( "click", function() {
47   - // 提交支付
48   - $.ajax({
49   - url: server + "/app-api/pay/order/submit",
50   - method: 'POST',
51   - dataType: "json",
52   - contentType: "application/json",
53   - data: JSON.stringify({
54   - "id": payOrderId,
55   - "channelCode": 'alipay_qr'
56   - }),
57   - success: function( result ) {
58   - if (result.code !== 0) {
59   - alert('提交支付订单失败，原因：' + result.msg)
60   - return;
61   - }
62   - //提交支付后返回的参数
63   - let data = result.data.invokeResponse;
64   - new QRCode($("#qrcode")[0],{
65   - text: data.qrCode, //内容
66   - width:98, //宽度
67   - height:98, //高度
68   - correctLevel: 3,//二维码纠错级别
69   - background: "#ffffff",//背景颜色
70   - foreground: "#000000"//二维码颜色
71   - });
72   -
73   - console.log("data.qrCode===",data.qrCode)
74   -
75   - }
76   - })
77   - });
78   -</script>
79   -</html>
yudao-server/src/main/resources/static/pay_alipay_wap.html deleted
View file @4390e28
1   -<!DOCTYPE html>
2   -<html>
3   -<head>
4   - <meta charset="UTF-8">
5   - <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
6   - <title>支付测试页</title>
7   - <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.js"></script>
8   -</head>
9   -<body>
10   -<div>点击如下按钮，发起支付的测试</div>
11   -<div>
12   - <button id="alipay_wap">支付宝手机网站支付</button>
13   -</div>
14   -<div id="dynamic_form"></div>
15   -</body>
16   -<script>
17   -
18   - let shopOrderId = undefined;
19   - let payOrderId = undefined;
20   - let server = 'http://127.0.0.1:48080';
21   - //let server = 'http://niubi.natapp1.cc';
22   -
23   - $(function() {
24   - // 自动发起商城订单编号
25   - $.ajax({
26   - url: server + "/app-api/shop/order/create",
27   - method: 'POST',
28   - success: function( result ) {
29   - if (result.code !== 0) {
30   - alert('创建商城订单失败，原因：' + result.msg)
31   - return;
32   - }
33   - shopOrderId = result.data.id;
34   - payOrderId = result.data.payOrderId;
35   - console.log("商城订单：" + shopOrderId)
36   - console.log("支付订单：" + payOrderId)
37   - }
38   - })
39   - });
40   -
41   - $( "#alipay_wap").on( "click", function() {
42   - // 提交支付
43   - $.ajax({
44   - url: server + "/app-api/pay/order/submit",
45   - method: 'POST',
46   - dataType: "json",
47   - contentType: "application/json",
48   - data: JSON.stringify({
49   - "id": payOrderId,
50   - "channelCode": 'alipay_wap'
51   - }),
52   - success: function( result ) {
53   - if (result.code !== 0) {
54   - alert('提交支付订单失败，原因：' + result.msg)
55   - return;
56   - }
57   - alert('点击确定，开始支付');
58   - //支付宝 手机WAP 返回表单，自动跳到支付宝支付页面
59   - let data = result.data.invokeResponse;
60   - $("#dynamic_form").html(data.body);
61   - }
62   - })
63   - });
64   -</script>
65   -</html>
yudao-server/src/main/resources/static/qrcode.min.js deleted
View file @4390e28
1   -var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c<a.length&&0==a[c];)c++;this.num=new Array(a.length-c+b);for(var d=0;d<a.length-c;d++)this.num[d]=a[d+c]}function j(a,b){this.totalCount=a,this.dataCount=b}function k(){this.buffer=[],this.length=0}function m(){return"undefined"!=typeof CanvasRenderingContext2D}function n(){var a=!1,b=navigator.userAgent;return/android/i.test(b)&&(a=!0,aMat=b.toString().match(/android ([0-9]\.[0-9])/i),aMat&&aMat[1]&&(a=parseFloat(aMat[1]))),a}function r(a,b){for(var c=1,e=s(a),f=0,g=l.length;g>=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=new Array(this.moduleCount);for(var e=0;e<this.moduleCount;e++)this.modules[d][e]=null}this.setupPositionProbePattern(0,0),this.setupPositionProbePattern(this.moduleCount-7,0),this.setupPositionProbePattern(0,this.moduleCount-7),this.setupPositionAdjustPattern(),this.setupTimingPattern(),this.setupTypeInfo(a,c),this.typeNumber>=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f<this.modules.length;f++)for(var g=f*e,h=0;h<this.modules[f].length;h++){var i=h*e,j=this.modules[f][h];j&&(d.beginFill(0,100),d.moveTo(i,g),d.lineTo(i+e,g),d.lineTo(i+e,g+e),d.lineTo(i,g+e),d.endFill())}return d},setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(var b=8;b<this.moduleCount-8;b++)null==this.modules[6][b]&&(this.modules[6][b]=0==b%2)},setupPositionAdjustPattern:function(){for(var a=f.getPatternPosition(this.typeNumber),b=0;b<a.length;b++)for(var c=0;c<a.length;c++){var d=a[b],e=a[c];if(null==this.modules[d][e])for(var g=-2;2>=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g<a.length&&(j=1==(1&a[g]>>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h<d.length;h++){var i=d[h];g.put(i.mode,4),g.put(i.getLength(),f.getLengthInBits(i.mode,a)),i.write(g)}for(var l=0,h=0;h<e.length;h++)l+=e[h].dataCount;if(g.getLengthInBits()>8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j<b.length;j++){var k=b[j].dataCount,l=b[j].totalCount-k;d=Math.max(d,k),e=Math.max(e,l),g[j]=new Array(k);for(var m=0;m<g[j].length;m++)g[j][m]=255&a.buffer[m+c];c+=k;var n=f.getErrorCorrectPolynomial(l),o=new i(g[j],n.getLength()-1),p=o.mod(n);h[j]=new Array(n.getLength()-1);for(var m=0;m<h[j].length;m++){var q=m+p.getLength()-h[j].length;h[j][m]=q>=0?p.get(q):0}}for(var r=0,m=0;m<b.length;m++)r+=b[m].totalCount;for(var s=new Array(r),t=0,m=0;d>m;m++)for(var j=0;j<b.length;j++)m<g[j].length&&(s[t++]=g[j][m]);for(var m=0;e>m;m++)for(var j=0;j<b.length;j++)m<h[j].length&&(s[t++]=h[j][m]);return s};for(var c={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},d={L:1,M:0,Q:3,H:2},e={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},f={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var b=a<<10;f.getBCHDigit(b)-f.getBCHDigit(f.G15)>=0;)b^=f.G15<<f.getBCHDigit(b)-f.getBCHDigit(f.G15);return(a<<10|b)^f.G15_MASK},getBCHTypeNumber:function(a){for(var b=a<<12;f.getBCHDigit(b)-f.getBCHDigit(f.G18)>=0;)b^=f.G18<<f.getBCHDigit(b)-f.getBCHDigit(f.G18);return a<<12|b},getBCHDigit:function(a){for(var b=0;0!=a;)b++,a>>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<<h;for(var h=8;256>h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;c<this.getLength();c++)for(var d=0;d<a.getLength();d++)b[c+d]^=g.gexp(g.glog(this.get(c))+g.glog(a.get(d)));return new i(b,0)},mod:function(a){if(this.getLength()-a.getLength()<0)return this;for(var b=g.glog(this.get(0))-g.glog(a.get(0)),c=new Array(this.getLength()),d=0;d<this.getLength();d++)c[d]=this.get(d);for(var d=0;d<a.getLength();d++)c[d]^=g.gexp(g.glog(a.get(d))+b);return new i(c,0).mod(a)}},j.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],j.getRSBlocks=function(a,b){var c=j.getRsBlockTable(a,b);if(void 0==c)throw new Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+b);for(var d=c.length/3,e=[],f=0;d>f;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=['<table style="border:0;border-collapse:collapse;">'],h=0;d>h;h++){g.push("<tr>");for(var i=0;d>i;i++)g.push('<td style="border:0;border-collapse:collapse;padding:0;margin:0;width:'+e+"px;height:"+f+"px;background-color:"+(a.isDark(h,i)?b.colorDark:b.colorLight)+';"></td>');g.push("</tr>")}g.push("</table>"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}();
2 0 \ No newline at end of file
yudao-server/src/main/resources/static/social-login.html deleted
View file @4390e28
1   -<!DOCTYPE html>
2   -<html>
3   -<head>
4   - <meta charset="UTF-8">
5   - <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
6   - <title>社交登陆测试页</title>
7   - <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.js"></script>
8   -</head>
9   -<body>
10   -<div>点击如下按钮，发起登陆的测试</div>
11   -<div>
12   - <button id="wx_pub">微信公众号</button>
13   -</div>
14   -</body>
15   -<script>
16   - // let server = 'http://127.0.0.1:28080';
17   - let server = 'http://192.168.1.2:48080';
18   -
19   -
20   - // 微信公众号
21   - $( "#wx_pub").on( "click", function() {
22   - // 获得授权链接
23   - $.ajax({
24   - url: server + "/app-api/social-auth-redirect?type=31&redirectUri=" +
25   - encodeURIComponent(server + '/static/social-login2.html'), //重定向地址
26   - method: 'GET',
27   - success: function( result ) {
28   - if (result.code !== 0) {
29   - alert('获得授权链接失败，原因：' + result.msg)
30   - return;
31   - }
32   - // 跳转重定向
33   - document.location.href = result.data;
34   - }
35   - })
36   - });
37   -</script>
38   -</html>
yudao-server/src/main/resources/static/social-login2.html deleted
View file @4390e28
1   -<!DOCTYPE html>
2   -<html>
3   -<head>
4   - <meta charset="UTF-8">
5   - <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
6   - <title>社交登陆测试页</title>
7   - <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.js"></script>
8   -</head>
9   -<body>
10   -<div>点击如下按钮，授权登录</div>
11   -<div>
12   - 手机号<input id="mobile" value="15601691300"><br>
13   - 手机验证码<input id="smsCode">
14   - <button id="send_sms_code">发送手机验证码</button>
15   - <br>
16   - <button id="wx_pub">微信公众号授权登录</button>
17   -</div>
18   -</body>
19   -<script>
20   - // let server = 'http://127.0.0.1:48080';
21   - let server = 'http://192.168.1.2:48080';
22   -
23   - let type = 31; //登录类型 微信公众号
24   -
25   - // 微信公众号
26   - $("#wx_pub").on("click", function () {
27   - let code = getUrlParam("code"); // 访问授权连接后，会回调本页面地址，参数在本页面url后面
28   - let state = getUrlParam("state");
29   - console.log("获取code: " + code + ", state: " + state)
30   -
31   - let data = {
32   - 'mobile': $('#mobile').val(),
33   - 'smsCode': $('#smsCode').val(),
34   - 'code': code,
35   - 'state': state,
36   - 'type': type
37   - }
38   -
39   - // 调用授权登录接口
40   - $.ajax({
41   - url: server + "/app-api/social-login2",
42   - method: 'POST',
43   - data: JSON.stringify(data),
44   - contentType: "application/json;charset=utf-8",
45   - dataType: "json",
46   - success: function( result ) {
47   - if (result.code !== 0) {
48   - alert('调用授权登录接口失败，原因：' + result.msg)
49   - return;
50   - }
51   - alert("授权登录成功, token: "+result.data.token)
52   - }
53   - })
54   - });
55   -
56   - // 发送手机验证码
57   - $("#send_sms_code").on("click", function () {
58   - let data = {
59   - 'mobile': $('#mobile').val(),
60   - 'scene': 1 // 手机号登陆 类型
61   - }
62   - $.ajax({
63   - url: server + "/app-api/send-sms-code",
64   - method: 'POST',
65   - data: JSON.stringify(data),
66   - contentType: "application/json;charset=utf-8",
67   - dataType: "json",
68   - success: function (result) {
69   - if (result.code !== 0) {
70   - alert('发送手机验证码失败，原因：' + result.msg)
71   - return;
72   - }
73   - alert("发送成功, 请查看日志");
74   - }
75   - })
76   - })
77   -
78   -
79   - //获取url中的参数
80   - function getUrlParam(name) {
81   - var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
82   - var r = window.location.search.substr(1).match(reg); //匹配目标参数
83   - if (r != null) return unescape(r[2]);
84   - return null; //返回参数值
85   - }
86   -</script>
87   -</html>