b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 取消代码格式化时的强制换行符转换

Browse Source
This commit is contained in:
b2baccline
2021-02-20 15:58:41 +08:00
parent f8ab1bb649
commit 0172d5cc00
15 changed files with 50 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java
View File

@@ -2,12 +2,13 @@ package com.hccake.extend.dingtalk;
import cn.hutool.core.convert.Convert;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.Map;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
import lombok.experimental.Accessors;
import java.util.Map;
/**
* 钉钉返回信息
*

9
ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java
View File

@@ -4,14 +4,15 @@ import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import com.hccake.extend.dingtalk.message.DingTalkMessage;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.experimental.Accessors;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
/**
* 订单消息发送
*

17
ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/AliPay.java
View File

@@ -1,7 +1,5 @@
package com.hccake.starte.pay.ali;
import static com.hccake.starte.pay.ali.constants.AliPayConstant.HUNDRED;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
@@ -9,20 +7,19 @@ import com.alipay.api.domain.AlipayTradePayModel;
import com.alipay.api.domain.AlipayTradeQueryModel;
import com.alipay.api.domain.AlipayTradeRefundModel;
import com.alipay.api.internal.util.AlipaySignature;
import com.alipay.api.request.AlipayTradeAppPayRequest;
import com.alipay.api.request.AlipayTradePayRequest;
import com.alipay.api.request.AlipayTradeQueryRequest;
import com.alipay.api.request.AlipayTradeRefundRequest;
import com.alipay.api.request.AlipayTradeWapPayRequest;
import com.alipay.api.request.*;
import com.alipay.api.response.AlipayTradeAppPayResponse;
import com.alipay.api.response.AlipayTradePayResponse;
import com.alipay.api.response.AlipayTradeRefundResponse;
import com.alipay.api.response.AlipayTradeWapPayResponse;
import com.hccake.starte.pay.ali.domain.AliPayQuery;
import lombok.Data;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Map;
import lombok.Data;
import static com.hccake.starte.pay.ali.constants.AliPayConstant.HUNDRED;
/**
* api文档: https://opendocs.alipay.com/apis.
@@ -362,7 +359,7 @@ public class AliPay {
*/
public boolean checkSignV1(Map<String, String> map) throws AlipayApiException {
// 验签需要先移除 fund_bill_list 参数值中的 &quot; 否则会导致正确的签名验签失败
map.put("fund_bill_list", map.get("fund_bill_list").replaceAll("&quot;","\""));
map.put("fund_bill_list", map.get("fund_bill_list").replaceAll("&quot;", "\""));
return AlipaySignature.rsaCheckV1(map, alipayPublicKey, charset, signType);
}
@@ -374,7 +371,7 @@ public class AliPay {
*/
public boolean checkSignV2(Map<String, String> map) throws AlipayApiException {
// 验签需要先移除 fund_bill_list 参数值中的 &quot; 否则会导致正确的签名验签失败
map.put("fund_bill_list", map.get("fund_bill_list").replaceAll("&quot;","\""));
map.put("fund_bill_list", map.get("fund_bill_list").replaceAll("&quot;", "\""));
return AlipaySignature.rsaCheckV2(map, alipayPublicKey, charset, signType);
}

7
ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/domain/AliPayQuery.java
View File

@@ -1,17 +1,18 @@
package com.hccake.starte.pay.ali.domain;
import static com.hccake.starte.pay.ali.constants.AliPayConstant.CODE_SUCCESS;
import cn.hutool.core.util.StrUtil;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.hccake.starte.pay.ali.enums.TradeStatus;
import java.math.BigDecimal;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import static com.hccake.starte.pay.ali.constants.AliPayConstant.CODE_SUCCESS;
/**
* 简化查询结果
*

20
ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/enums/TradeStatus.java
View File

@@ -33,16 +33,16 @@ public enum TradeStatus {
@JsonCreator
public static TradeStatus of(String status) {
switch (status) {
case "WAIT_BUYER_PAY":
return WAIT;
case "TRADE_CLOSED":
return CLOSED;
case "TRADE_SUCCESS":
return SUCCESS;
case "TRADE_FINISHED":
return FINISHED;
default:
return ERROR;
case "WAIT_BUYER_PAY":
return WAIT;
case "TRADE_CLOSED":
return CLOSED;
case "TRADE_SUCCESS":
return SUCCESS;
case "TRADE_FINISHED":
return FINISHED;
default:
return ERROR;
}
}

7
ballcat-extends/ballcat-extend-pay-virtual/src/main/java/com/hccake/starter/pay/viratual/AbstractVerifyThread.java
View File

@@ -1,11 +1,12 @@
package com.hccake.starter.pay.viratual;
import com.hccake.ballcat.common.core.thread.AbstractQueueThread;
import live.lingting.virtual.currency.Transaction;
import lombok.extern.slf4j.Slf4j;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Optional;
import javax.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import live.lingting.virtual.currency.Transaction;
/**
* 用于校验交易的线程