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

1
.editorconfig
View File

@@ -7,4 +7,3 @@ charset = utf-8
indent_style = tab
indent_size = 4
continuation_indent_size = 8
end_of_line = lf

5
.gitattributes vendored
View File

@@ -1,4 +1,7 @@
*.js linguist-language=java
*.html linguist-language=java
eol = lf
* text auto
# 强制换行符为 LF
# * text eol=lf

3
ballcat-dependencies/pom.xml
View File

@@ -440,9 +440,6 @@
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<version>${spring-javaformat-checkstyle.version}</version>
<configuration>
<lineSeparator>LF</lineSeparator>
</configuration>
<executions>
<execution>
<phase>validate</phase>

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;
/**
* 用于校验交易的线程

11
ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/ali/Controller.java
View File

@@ -4,15 +4,12 @@ import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import com.hccake.starte.pay.ali.AliPay;
import com.hccake.starte.pay.ali.domain.AliPayCallback;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* @author lingting 2021/1/25 15:18

7
ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/virtual/thread/OmniThread.java
View File

@@ -2,12 +2,13 @@ package com.hccake.sample.pay.virtual.thread;
import com.hccake.ballcat.common.core.util.JacksonUtils;
import com.hccake.sample.pay.virtual.entity.Order;
import java.util.Optional;
import live.lingting.virtual.currency.Transaction;
import live.lingting.virtual.currency.service.impl.BtcOmniServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import live.lingting.virtual.currency.Transaction;
import live.lingting.virtual.currency.service.impl.BtcOmniServiceImpl;
import java.util.Optional;
/**
* @author lingting 2021/1/5 15:22

5
ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java
View File

@@ -1,10 +1,9 @@
package com.hccake.starter.pay.virtual;
import lombok.Data;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.ConfigurationProperties;
import live.lingting.virtual.currency.endpoints.BitcoinEndpoints;
import live.lingting.virtual.currency.endpoints.OmniEndpoints;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* @author lingting 2021/1/22 17:45

5
ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EthereumProperties.java
View File

@@ -1,9 +1,8 @@
package com.hccake.starter.pay.virtual;
import lombok.Data;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.ConfigurationProperties;
import live.lingting.virtual.currency.endpoints.InfuraEndpoints;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* @author lingting 2021/1/22 17:47

5
ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java
View File

@@ -1,9 +1,8 @@
package com.hccake.starter.pay.virtual;
import lombok.Data;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.ConfigurationProperties;
import live.lingting.virtual.currency.endpoints.TronscanEndpoints;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* @author lingting 2021/1/22 17:47

3
pom.xml
View File

@@ -178,9 +178,6 @@
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<version>${spring-javaformat-checkstyle.version}</version>
<configuration>
<lineSeparator>LF</lineSeparator>
</configuration>
<executions>
<execution>
<phase>validate</phase>