浏览代码

修复无法打包问题

Seven 6 月之前
父节点
当前提交
012f5b7009

+ 3 - 3
common/core/pom.xml

@@ -23,10 +23,10 @@
         <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <hutool.version>5.8.26</hutool.version>
+        <hutool.version>5.8.27</hutool.version>
         <bouncycastle.version>1.77</bouncycastle.version>
-        <fastjson2.version>2.0.46</fastjson2.version>
-        <mybatis-flex.version>1.8.2</mybatis-flex.version>
+        <fastjson2.version>2.0.50</fastjson2.version>
+        <mybatis-flex.version>1.8.9</mybatis-flex.version>
     </properties>
 
     <dependencies>

+ 1 - 0
pay/src/main/java/pay/platform/payment/alipay/entity/request/AlipayMobileSiteRequest.java

@@ -57,6 +57,7 @@ public class AlipayMobileSiteRequest {
          * 手机网站支付应该是固定 'QUICK_WAP_WAY'
          * @see <a href="https://docs.open.alipay.com/api_1/alipay.trade.wap.pay">https://docs.open.alipay.com/api_1/alipay.trade.wap.pay</a>
          */
+        @Builder.Default
         @SerializedName("product_code")
         private String productCode = "QUICK_WAP_WAY";
 

+ 3 - 1
pay/src/main/java/pay/platform/payment/alipay/entity/request/AlipayQrcodeRequest.java

@@ -4,8 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import pay.platform.payment.alipay.trade.model.GoodsDetail;
 import pay.platform.common.utils.JsonUtil;
+import pay.platform.payment.alipay.trade.model.GoodsDetail;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -55,11 +55,13 @@ public class AlipayQrcodeRequest implements Serializable {
     /**
      * (可选) 订单不可打折金额
      */
+    @Builder.Default
     private String undiscountableAmount = "0";
 
     /**
      * (可选)卖家支付宝账号ID
      */
+    @Builder.Default
     private String sellerId = "";
 
     /**

+ 1 - 0
pay/src/main/java/pay/platform/payment/alipay/entity/request/AlipayWebSiteRequest.java

@@ -57,6 +57,7 @@ public class AlipayWebSiteRequest {
          * 电脑网站支付应该是常量值'FAST_INSTANT_TRADE_PAY'
          * @see <a href="https://docs.open.alipay.com/api_1/alipay.trade.page.pay">https://docs.open.alipay.com/api_1/alipay.trade.page.pay</a>
          */
+        @Builder.Default
         @SerializedName(value = "product_code")
         private String productCode = "FAST_INSTANT_TRADE_PAY";
 

+ 2 - 4
web/admin-api/src/main/java/pay/platform/api/system/model/query/PayChannelQuery.java

@@ -2,10 +2,7 @@ package pay.platform.api.system.model.query;
 
 import com.mybatisflex.annotation.Table;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import pay.platform.core.common.domain.BasePageQuery;
 
 /**
@@ -14,6 +11,7 @@ import pay.platform.core.common.domain.BasePageQuery;
  * @author mybatis-flex-helper automatic generation
  * @since 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Builder
 @NoArgsConstructor

+ 2 - 4
web/admin-api/src/main/java/pay/platform/api/system/model/query/PayMerchantQuery.java

@@ -2,10 +2,7 @@ package pay.platform.api.system.model.query;
 
 import com.mybatisflex.annotation.Table;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import pay.platform.core.common.domain.BasePageQuery;
 
 /**
@@ -14,6 +11,7 @@ import pay.platform.core.common.domain.BasePageQuery;
  * @author mybatis-flex-helper automatic generation
  * @since 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Builder
 @NoArgsConstructor

+ 2 - 4
web/admin-api/src/main/java/pay/platform/api/system/model/query/PayOrderQuery.java

@@ -2,10 +2,7 @@ package pay.platform.api.system.model.query;
 
 import com.mybatisflex.annotation.Table;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import pay.platform.core.common.domain.BasePageQuery;
 
 import java.math.BigDecimal;
@@ -17,6 +14,7 @@ import java.time.LocalDateTime;
  * @author mybatis-flex-helper automatic generation
  * @since 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Builder
 @NoArgsConstructor

+ 2 - 4
web/admin-api/src/main/java/pay/platform/api/system/model/query/PayPlatformSettingQuery.java

@@ -1,10 +1,7 @@
 package pay.platform.api.system.model.query;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import pay.platform.core.common.domain.BasePageQuery;
 
 import java.time.LocalDateTime;
@@ -15,6 +12,7 @@ import java.time.LocalDateTime;
  * @author mybatis-flex-helper automatic generation
  * @since 1.0
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Builder
 @NoArgsConstructor