排除fastjson包,保留fastjaon2

This commit is contained in:
2023-06-28 08:54:55 +08:00
parent 373376eedf
commit a5fb27ad97
21 changed files with 36 additions and 32 deletions

View File

@@ -29,14 +29,17 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
@@ -78,16 +81,6 @@
<artifactId>jackson-dataformat-avro</artifactId> <artifactId>jackson-dataformat-avro</artifactId>
</dependency> </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> <dependency>
<groupId>com.alibaba.fastjson2</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId> <artifactId>fastjson2</artifactId>
@@ -96,11 +89,23 @@
<dependency> <dependency>
<groupId>com.huifu.adapay.core</groupId> <groupId>com.huifu.adapay.core</groupId>
<artifactId>adapay-core-sdk</artifactId> <artifactId>adapay-core-sdk</artifactId>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.huifu.adapay</groupId> <groupId>com.huifu.adapay</groupId>
<artifactId>adapay-java-sdk</artifactId> <artifactId>adapay-java-sdk</artifactId>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; 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.AdapayTools;
import com.huifu.adapay.model.Bill; import com.huifu.adapay.model.Bill;
import com.huifu.adapay.model.Wallet; import com.huifu.adapay.model.Wallet;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; 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.AdapayTools;
import com.huifu.adapay.model.Bill; import com.huifu.adapay.model.Bill;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.huifu.adapay.model.CorpMember; import com.huifu.adapay.model.CorpMember;
import java.io.File; import java.io.File;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.huifu.adapay.model.FastPay; import com.huifu.adapay.model.FastPay;
import java.util.HashMap; import java.util.HashMap;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.huifu.adapay.model.Member; import com.huifu.adapay.model.Member;
import java.util.HashMap; import java.util.HashMap;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; 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.core.exception.BaseAdaPayException;
import com.huifu.adapay.model.Checkout; import com.huifu.adapay.model.Checkout;
import com.huifu.adapay.model.Payment; import com.huifu.adapay.model.Payment;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; 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.core.exception.BaseAdaPayException;
import com.huifu.adapay.model.Payment; import com.huifu.adapay.model.Payment;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.huifu.adapay.model.Refund; import com.huifu.adapay.model.Refund;
import java.util.HashMap; import java.util.HashMap;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.demo; 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.Drawcash;
import com.huifu.adapay.model.SettleAccount; import com.huifu.adapay.model.SettleAccount;

View File

@@ -1,6 +1,6 @@
package com.jsowell.adapay.service; 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.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.core.exception.BaseAdaPayException;

View File

@@ -1,8 +1,7 @@
package com.jsowell.thirdparty.amap.common; package com.jsowell.thirdparty.amap.common;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import lombok.Value;
/** /**
* 高德地图通用入参 * 高德地图通用入参

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.domain; package com.jsowell.thirdparty.amap.domain;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.domain; package com.jsowell.thirdparty.amap.domain;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
/** /**

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.domain; package com.jsowell.thirdparty.amap.domain;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.domain; package com.jsowell.thirdparty.amap.domain;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.domain; package com.jsowell.thirdparty.amap.domain;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
/** /**

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.domain; package com.jsowell.thirdparty.amap.domain;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.domain; package com.jsowell.thirdparty.amap.domain;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;

View File

@@ -1,7 +1,7 @@
package com.jsowell.thirdparty.amap.service.impl; package com.jsowell.thirdparty.amap.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

View File

@@ -1,6 +1,6 @@
package com.jsowell.thirdparty.amap.util; 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.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;