排除fastjson包，保留fastjaon2

2026-04-19 18:45:03 +08:00 · 2023-06-28 08:54:55 +08:00
parent 373376eedf
commit a5fb27ad97
21 changed files with 36 additions and 32 deletions
--- a/jsowell-pile/pom.xml
+++ b/jsowell-pile/pom.xml
@@ -29,14 +29,17 @@
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
        </dependency>
+
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
        </dependency>
+
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
        </dependency>
+
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-annotations</artifactId>
@@ -78,16 +81,6 @@
            <artifactId>jackson-dataformat-avro</artifactId>
        </dependency>

-        <dependency>
-            <groupId>com.huifu.adapay.core</groupId>
-            <artifactId>adapay-core-sdk</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.huifu.adapay</groupId>
-            <artifactId>adapay-java-sdk</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
@@ -96,11 +89,23 @@
        <dependency>
            <groupId>com.huifu.adapay.core</groupId>
            <artifactId>adapay-core-sdk</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>fastjson</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>

        <dependency>
            <groupId>com.huifu.adapay</groupId>
            <artifactId>adapay-java-sdk</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>fastjson</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
    </dependencies>

--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/AdapayToolsDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/AdapayToolsDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.model.AdapayTools;
 import com.huifu.adapay.model.Bill;
 import com.huifu.adapay.model.Wallet;
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/BillDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/BillDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.model.AdapayTools;
 import com.huifu.adapay.model.Bill;

--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/CorpMemberDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/CorpMemberDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.model.CorpMember;

 import java.io.File;
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/FastPayDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/FastPayDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.model.FastPay;

 import java.util.HashMap;
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/MemberDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/MemberDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.model.Member;

 import java.util.HashMap;
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.huifu.adapay.model.Checkout;
 import com.huifu.adapay.model.Payment;
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentRegionAndRequestTimeOutDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentRegionAndRequestTimeOutDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.huifu.adapay.model.Payment;

--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/RefundDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/RefundDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.model.Refund;

 import java.util.HashMap;
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/SettleAccountDemo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/SettleAccountDemo.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.demo;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.huifu.adapay.model.Drawcash;
 import com.huifu.adapay.model.SettleAccount;

--- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
@@ -1,6 +1,6 @@
 package com.jsowell.adapay.service;

-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/common/AMapCommonParams.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/common/AMapCommonParams.java
@@ -1,8 +1,7 @@
 package com.jsowell.thirdparty.amap.common;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
-import lombok.Value;

 /**
 * 高德地图通用入参
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorInfo.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.domain;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

 import java.math.BigDecimal;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorStatusInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorStatusInfo.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.domain;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

 /**
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.domain;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

 import java.math.BigDecimal;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.domain;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

 import java.math.BigDecimal;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPictures.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPictures.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.domain;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

 /**
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPriceChargingInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPriceChargingInfo.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.domain;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

 import java.math.BigDecimal;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.domain;

-import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

 import java.math.BigDecimal;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
@@ -1,7 +1,7 @@
 package com.jsowell.thirdparty.amap.service.impl;

-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java
@@ -1,6 +1,6 @@
 package com.jsowell.thirdparty.amap.util;

-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;