diff --git a/.editorconfig b/.editorconfig index 3e1127a6..41208ee1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,4 +7,3 @@ charset = utf-8 indent_style = tab indent_size = 4 continuation_indent_size = 8 -end_of_line = lf diff --git a/.gitattributes b/.gitattributes index c0ca76e8..37f4fefd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,7 @@ *.js linguist-language=java *.html linguist-language=java -eol = lf \ No newline at end of file +* text auto + +# 强制换行符为 LF +# * text eol=lf \ No newline at end of file diff --git a/ballcat-dependencies/pom.xml b/ballcat-dependencies/pom.xml index daca7f50..dcf416ed 100644 --- a/ballcat-dependencies/pom.xml +++ b/ballcat-dependencies/pom.xml @@ -440,9 +440,6 @@ io.spring.javaformat spring-javaformat-maven-plugin ${spring-javaformat-checkstyle.version} - - LF - validate diff --git a/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java b/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java index de7bd4b9..3e943b27 100644 --- a/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java +++ b/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java @@ -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; + /** * 钉钉返回信息 * diff --git a/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java b/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java index 56d9d0bb..a25d37d8 100644 --- a/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java +++ b/ballcat-extends/ballcat-extend-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java @@ -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; + /** * 订单消息发送 * diff --git a/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/AliPay.java b/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/AliPay.java index 1cc2872f..8fef557f 100644 --- a/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/AliPay.java +++ b/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/AliPay.java @@ -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 map) throws AlipayApiException { // 验签需要先移除 fund_bill_list 参数值中的 " 否则会导致正确的签名验签失败 - map.put("fund_bill_list", map.get("fund_bill_list").replaceAll(""","\"")); + map.put("fund_bill_list", map.get("fund_bill_list").replaceAll(""", "\"")); return AlipaySignature.rsaCheckV1(map, alipayPublicKey, charset, signType); } @@ -374,7 +371,7 @@ public class AliPay { */ public boolean checkSignV2(Map map) throws AlipayApiException { // 验签需要先移除 fund_bill_list 参数值中的 " 否则会导致正确的签名验签失败 - map.put("fund_bill_list", map.get("fund_bill_list").replaceAll(""","\"")); + map.put("fund_bill_list", map.get("fund_bill_list").replaceAll(""", "\"")); return AlipaySignature.rsaCheckV2(map, alipayPublicKey, charset, signType); } diff --git a/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/domain/AliPayQuery.java b/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/domain/AliPayQuery.java index 1a875c55..e9742831 100644 --- a/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/domain/AliPayQuery.java +++ b/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/domain/AliPayQuery.java @@ -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; + /** * 简化查询结果 * diff --git a/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/enums/TradeStatus.java b/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/enums/TradeStatus.java index 4ac7e7bf..1ba5baf0 100644 --- a/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/enums/TradeStatus.java +++ b/ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/enums/TradeStatus.java @@ -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; } } diff --git a/ballcat-extends/ballcat-extend-pay-virtual/src/main/java/com/hccake/starter/pay/viratual/AbstractVerifyThread.java b/ballcat-extends/ballcat-extend-pay-virtual/src/main/java/com/hccake/starter/pay/viratual/AbstractVerifyThread.java index b809bfd1..a482d568 100644 --- a/ballcat-extends/ballcat-extend-pay-virtual/src/main/java/com/hccake/starter/pay/viratual/AbstractVerifyThread.java +++ b/ballcat-extends/ballcat-extend-pay-virtual/src/main/java/com/hccake/starter/pay/viratual/AbstractVerifyThread.java @@ -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; /** * 用于校验交易的线程 diff --git a/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/ali/Controller.java b/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/ali/Controller.java index 4e3b6d96..63f46448 100644 --- a/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/ali/Controller.java +++ b/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/ali/Controller.java @@ -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 diff --git a/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/virtual/thread/OmniThread.java b/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/virtual/thread/OmniThread.java index a8f7322f..e3234f2c 100644 --- a/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/virtual/thread/OmniThread.java +++ b/ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/virtual/thread/OmniThread.java @@ -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 diff --git a/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java b/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java index 906a676a..c8340162 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java +++ b/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java @@ -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 diff --git a/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EthereumProperties.java b/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EthereumProperties.java index 2405927f..9225e755 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EthereumProperties.java +++ b/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EthereumProperties.java @@ -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 diff --git a/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java b/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java index d1406eb9..6efd3f0a 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java +++ b/ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java @@ -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 diff --git a/pom.xml b/pom.xml index f32a4708..48b51791 100644 --- a/pom.xml +++ b/pom.xml @@ -178,9 +178,6 @@ io.spring.javaformat spring-javaformat-maven-plugin ${spring-javaformat-checkstyle.version} - - LF - validate