🎨 格式化部分代码

2025-06-28 13:16:19 +08:00 · 2021-08-16 17:59:52 +08:00 · 2021-08-16 17:59:52 +08:00 · 6cfe90b31e
commit 6cfe90b31e
parent dfeb2f944f
24 changed files with 65 additions and 57 deletions
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpMapConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpMapConfigImpl.java
@ -6,9 +6,9 @@ import me.chanjar.weixin.common.bean.WxAccessToken;
 import java.util.concurrent.ConcurrentHashMap;

 /**
- * @Author: Brayden Wong
- * @Date: 2021/1/16
- * @Description: 提供accesstoken保存在concurrenthashmap中的实现，支持高并发。仅限于单机部署。
+ * @author Brayden Wong
+ * @date 2021/1/16
+ * 提供accesstoken保存在concurrenthashmap中的实现，支持高并发。仅限于单机部署。
 */
@Data
 public class WxMpMapConfigImpl extends WxMpDefaultConfigImpl {
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaOpenSubpackage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaOpenSubpackage.java
@ -4,8 +4,8 @@ import lombok.Builder;
 import lombok.Data;

 /**
- * @author: momorans
- * @create: 2019-03-12
+ * @author momorans
+ * @create 2019-03-12
 **/
@Data
@Builder
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java
@ -9,7 +9,6 @@ import java.util.List;

 /**
 * 二级商户进件 查询申请状态结果响应
- *
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java
@ -344,7 +344,7 @@ public class CombineTransactionsRequest implements Serializable {

  @Data
  @NoArgsConstructor
-  public static class SettleInfo implements Serializable{
+  public static class SettleInfo implements Serializable {
    /**
     * <pre>
     * 字段名：是否指定分账
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FinishOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FinishOrderRequest.java
@ -10,8 +10,9 @@ import java.io.Serializable;
 * <pre>
 *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_5.shtml
 * </pre>
- * @author: f00lish
- * @date: 2020/09/12
+ *
+ * @author f00lish
+ * @date 2020/09/12
 */
@Data
@Builder
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBalanceResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBalanceResult.java
@ -5,8 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 /**
- * @author: f00lish
- * @date: 2020/09/12
+ * @author f00lish
+ * @date 2020/09/12
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillRequest.java
@ -8,8 +8,8 @@ import java.io.Serializable;
 /**
 * 资金账单请求
 *
- * @author: f00lish
- * @date: 2020/09/28
+ * @author f00lish
+ * @date 2020/09/28
 */
@Data
@Builder
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillResult.java
@ -8,8 +8,8 @@ import java.io.Serializable;
 /**
 * 资金账单结果
 *
- * @author: f00lish
- * @date: 2020/09/28
+ * @author f00lish
+ * @date 2020/09/28
 */
@Data
@Builder
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java
@ -8,8 +8,9 @@ import java.io.Serializable;

 /**
 * 关闭普通订单请求
- * @author: f00lish
- * @date: 2020/12/09
+ *
+ * @author f00lish
+ * @date 2020/12/09
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingRequest.java
@ -13,8 +13,9 @@ import java.util.List;
 * <pre>
 *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_1.shtml
 * </pre>
- * @author: f00lish
- * @date: 2020/09/12
+ *
+ * @author f00lish
+ * @date 2020/09/12
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingResult.java
@ -9,8 +9,9 @@ import java.util.List;

 /**
 * 请求分账 结果响应
- * @author: f00lish
- * @date: 2020/09/12
+ *
+ * @author f00lish
+ * @date 2020/09/12
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java
@ -1,10 +1,5 @@
 package com.github.binarywang.wxpay.bean.ecommerce;

-/**
- * @author: f00lish
- * @date: 2020/09/17
- */
-
 import com.google.gson.annotations.SerializedName;
 import lombok.*;

@ -15,8 +10,9 @@ import java.io.Serializable;
 * * <pre>
 *  *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/refunds/chapter3_1.shtml
 *  * </pre>
- * @author: f00lish
- * @date: 2020/09/14
+ *
+ * @author f00lish
+ * @date 2020/09/14
 */
@Data
@Builder
@ -156,7 +152,6 @@ public class RefundsRequest implements Serializable {
  @NoArgsConstructor(access = AccessLevel.PRIVATE)
  @AllArgsConstructor(access = AccessLevel.PRIVATE)
  public static class Amount implements Serializable {
-
    private static final long serialVersionUID = 7383027142329410399L;

    /**
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsResult.java
@ -1,8 +1,8 @@
 package com.github.binarywang.wxpay.bean.ecommerce;

 /**
- * @author: f00lish
- * @date: 2020/09/17
+ * @author f00lish
+ * @date 2020/09/17
 */

 import com.google.gson.annotations.SerializedName;
@ -17,8 +17,9 @@ import java.util.Date;
 * * <pre>
 *  *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/refunds/chapter3_1.shtml
 *  * </pre>
- * @author: f00lish
- * @date: 2020/09/14
+ *
+ * @author f00lish
+ * @date 2020/09/14
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersQueryRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersQueryRequest.java
@ -10,14 +10,17 @@ import java.io.Serializable;
 * * <pre>
 *  *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_3.shtml
 *  * </pre>
- * @author: wangrui
- * @date: 2021/02/20
+ *
+ * @author wangrui
+ * @date 2021/02/20
 */
@Data
@Builder
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class ReturnOrdersQueryRequest implements Serializable {
+  private static final long serialVersionUID = 4250796057341297359L;
+
  /**
   * <pre>
   * 字段名：二级商户号
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersRequest.java
@ -10,8 +10,9 @@ import java.io.Serializable;
 * * <pre>
 *  *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_3.shtml
 *  * </pre>
- * @author: f00lish
- * @date: 2020/09/14
+ *
+ * @author f00lish
+ * @date 2020/09/14
 */
@Data
@Builder
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersResult.java
@ -8,8 +8,8 @@ import java.util.Date;


 /**
- * @author: f00lish
- * @date: 2020/09/14
+ * @author f00lish
+ * @date 2020/09/14
 */
@Data
@Builder
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawStatusResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawStatusResult.java
@ -11,8 +11,9 @@ import java.io.Serializable;
 * <pre>
 *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/fund/chapter3_6.shtml
 * </pre>
- * @author: f00lish
- * @date: 2020/10/27
+ *
+ * @author f00lish
+ * @date 2020/10/27
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawStatusResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawStatusResult.java
@ -11,8 +11,9 @@ import java.io.Serializable;
 * <pre>
 *   文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/fund/chapter3_3.shtml
 * </pre>
- * @author: f00lish
- * @date: 2020/10/27
+ *
+ * @author f00lish
+ * @date 2020/10/27
 */
@Data
@NoArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TradeBillResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TradeBillResult.java
@ -8,8 +8,8 @@ import java.io.Serializable;
 /**
 * 交易账单结果
 *
- * @author: f00lish
- * @date: 2020/09/28
+ * @author f00lish
+ * @date 2020/09/28
 */
@Data
@Builder
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java
@ -69,7 +69,7 @@ public class TransactionsResult implements Serializable {
    private String signType;
    private String paySign;

-    private String getSignStr(){
+    private String getSignStr() {
      return String.format("%s\n%s\n%s\n%s\n", appId, timeStamp, nonceStr, packageValue);
    }
  }
@ -86,10 +86,10 @@ public class TransactionsResult implements Serializable {

  }

-  public <T> T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey){
+  public <T> T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey) {
    String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
    String nonceStr = SignUtils.genRandomStr();
-    switch (tradeType){
+    switch (tradeType) {
      case JSAPI:
        JsapiResult jsapiResult = new JsapiResult();
        jsapiResult.setAppId(appId).setTimeStamp(timestamp)
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/FundBillTypeEnum.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/FundBillTypeEnum.java
@ -5,8 +5,9 @@ import lombok.Getter;

 /**
 * 账单类型
- * @author: f00lish
- * @date: 2020/09/28
+ *
+ * @author f00lish
+ * @date 2020/09/28
 */
@Getter
@AllArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/SpAccountTypeEnum.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/SpAccountTypeEnum.java
@ -5,8 +5,9 @@ import lombok.Getter;

 /**
 * 服务商账户类型
- * @author: f00lish
- * @date: 2020/09/12
+ *
+ * @author f00lish
+ * @date 2020/09/12
 */
@Getter
@AllArgsConstructor
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entwxpay/EntWxEmpPayRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entwxpay/EntWxEmpPayRequest.java
@ -20,6 +20,7 @@ import java.util.Map;
@AllArgsConstructor
@XStreamAlias("xml")
 public class EntWxEmpPayRequest extends BaseWxPayRequest {
+  private static final long serialVersionUID = -3677217123742740648L;

  /**
   * <pre>