diff --git a/jsowell-pile/pom.xml b/jsowell-pile/pom.xml
index 1b9c6df26..4a2b545cb 100644
--- a/jsowell-pile/pom.xml
+++ b/jsowell-pile/pom.xml
@@ -29,14 +29,17 @@
org.projectlombok
lombok
+
junit
junit
+
org.springframework
spring-test
+
io.swagger
swagger-annotations
@@ -78,16 +81,6 @@
jackson-dataformat-avro
-
- com.huifu.adapay.core
- adapay-core-sdk
-
-
-
- com.huifu.adapay
- adapay-java-sdk
-
-
com.alibaba.fastjson2
fastjson2
@@ -96,11 +89,23 @@
com.huifu.adapay.core
adapay-core-sdk
+
+
+ com.alibaba
+ fastjson
+
+
com.huifu.adapay
adapay-java-sdk
+
+
+ com.alibaba
+ fastjson
+
+
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/AdapayToolsDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/AdapayToolsDemo.java
index 9a2306cc5..751cc9062 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/BillDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/BillDemo.java
index 141890f97..1fa012f97 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/CorpMemberDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/CorpMemberDemo.java
index 5d28e068c..91547ff06 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/FastPayDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/FastPayDemo.java
index 048e690bd..0ac47fdf3 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/MemberDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/MemberDemo.java
index 677098e58..b9c63c978 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentDemo.java
index 3453b7d15..0165c8e73 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentRegionAndRequestTimeOutDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentRegionAndRequestTimeOutDemo.java
index 45c4e7702..05494ee2b 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/RefundDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/RefundDemo.java
index 36079389d..5e97f56ce 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/SettleAccountDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/SettleAccountDemo.java
index 0e240857b..7cf842c1f 100644
--- 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;
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
index c6989ee88..81957d19a 100644
--- 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;
diff --git 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
index dcb5954c1..90899dd3e 100644
--- 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;
/**
* 高德地图通用入参
diff --git 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
index 7ab97945e..a811537cb 100644
--- 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;
diff --git 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
index 91cac5254..108ba446c 100644
--- 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;
/**
diff --git 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
index 5f109eaca..c633b3163 100644
--- 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;
diff --git 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
index 5909c6dee..c5ad1e27e 100644
--- 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;
diff --git 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
index 5d3d392c3..80c7caed3 100644
--- 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;
/**
diff --git 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
index a28450165..3fe5e25bd 100644
--- 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;
diff --git 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
index 9cec9af1b..760ddf7ba 100644
--- 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;
diff --git 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
index 47a822cf7..504d93fd6 100644
--- 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;
diff --git 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
index 7118d0559..20e10b890 100644
--- 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;