替换fastjson2

pom.xml

@@ -92,10 +92,15 @@
             <scope>test</scope>
         </dependency>
         <!--fastjosn-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.83</version>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba</groupId>-->
+<!--            <artifactId>fastjson</artifactId>-->
+<!--            <version>2.0.6</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.12</version>
         </dependency>
         <!--druid-->
         <dependency>

src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java

@@ -1,9 +1,6 @@
 package cn.chjyj.szwh.configure;
 
 import cn.chjyj.szwh.Interceptor.ChInterceptor;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.annotation.Bean;
@@ -39,17 +36,4 @@ public class ChWebMvcConfigurer  implements WebMvcConfigurer {
                 .allowedMethods("POST","GET");
     }
 
-    /**
-     * fast json 字符串转义
-     * @return
-     */
-    @Bean
-    public HttpMessageConverter fastConvert(){
-        FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
-        FastJsonConfig config = new FastJsonConfig();
-        config.setSerializerFeatures(SerializerFeature.WriteSlashAsSpecial);
-        converter.setFastJsonConfig(config);
-        converter.setSupportedMediaTypes(Arrays.asList(MediaType.APPLICATION_JSON));
-        return converter;
-    }
 }

src/main/java/cn/chjyj/szwh/controller/BaseController.java

@@ -3,7 +3,7 @@ package cn.chjyj.szwh.controller;
 import cn.chjyj.szwh.bean.Admin;
 import cn.chjyj.szwh.service.AdminService;
 import cn.chjyj.szwh.service.impl.AdminServiceImpl;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import org.apache.commons.lang3.StringUtils;

src/main/java/cn/chjyj/szwh/controller/QuartzController.java

@@ -2,7 +2,7 @@ package cn.chjyj.szwh.controller;
 
 import cn.chjyj.szwh.dto.JobAndTriggerDto;
 import cn.chjyj.szwh.service.QuartzService;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java

@@ -7,8 +7,8 @@ import cn.chjyj.szwh.service.AccountCloseService;
 import cn.chjyj.szwh.service.AdminService;
 import cn.chjyj.szwh.service.UserService;
 import cn.chjyj.szwh.service.impl.AdminServiceImpl;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/chjyj/szwh/controller/admin/AdminClassifyController.java

@@ -3,7 +3,7 @@ package cn.chjyj.szwh.controller.admin;
 import cn.chjyj.szwh.bean.Classify;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.ClassifyService;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java

@@ -5,9 +5,9 @@ import cn.chjyj.szwh.bean.Classify;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.mapper.AdminMapper;
 import cn.chjyj.szwh.service.ClassifyService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import org.apache.commons.lang3.StringUtils;

src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java

@@ -5,9 +5,9 @@ import cn.chjyj.szwh.service.GoodsDetailService;
 import cn.chjyj.szwh.service.GoodsService;
 import cn.chjyj.szwh.service.GoodsSourceService;
 import cn.chjyj.szwh.service.UserService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.auth0.jwt.JWT;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/chjyj/szwh/controller/admin/AdminIndexController.java

@@ -2,7 +2,7 @@ package cn.chjyj.szwh.controller.admin;
 
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.IndexService;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/chjyj/szwh/controller/admin/AdminInvoiceMgtController.java

@@ -2,8 +2,8 @@ package cn.chjyj.szwh.controller.admin;
 
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.InvoiceService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/cn/chjyj/szwh/controller/admin/AdminLogController.java

@@ -3,7 +3,7 @@ package cn.chjyj.szwh.controller.admin;
 import cn.chjyj.szwh.bean.OperationLog;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.OperationLogService;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/cn/chjyj/szwh/controller/admin/AdminLoginController.java

@@ -1,7 +1,7 @@
 package cn.chjyj.szwh.controller.admin;
 
 import cn.chjyj.szwh.controller.BaseController;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java

@@ -4,9 +4,9 @@ import cn.chjyj.szwh.bean.OrderGoodsDetail;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.OrderGoodsDetailService;
 import cn.chjyj.szwh.service.OrderService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java

@@ -6,7 +6,7 @@ import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.AdminService;
 import cn.chjyj.szwh.service.LoginService;
 import cn.chjyj.szwh.service.UserService;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java

@@ -1,7 +1,7 @@
 package cn.chjyj.szwh.controller.api;
 
 import cn.chjyj.szwh.controller.BaseController;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/cn/chjyj/szwh/controller/api/OrderController.java

@@ -3,7 +3,7 @@ package cn.chjyj.szwh.controller.api;
 import cn.chjyj.szwh.bean.Order;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.OrderService;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

src/main/java/cn/chjyj/szwh/controller/api/PayController.java

@@ -1,7 +1,7 @@
 package cn.chjyj.szwh.controller.api;
 
 import cn.chjyj.szwh.controller.BaseController;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/cn/chjyj/szwh/controller/api/TestController.java

@@ -2,7 +2,7 @@ package cn.chjyj.szwh.controller.api;
 
 import cn.chjyj.szwh.annotation.PassToken;
 import cn.chjyj.szwh.controller.BaseController;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.boot.SpringBootVersion;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/cn/chjyj/szwh/controller/task/TaskGoodsController.java

@@ -2,7 +2,7 @@ package cn.chjyj.szwh.controller.task;
 
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.GoodsService;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/chjyj/szwh/service/AccountCloseService.java

@@ -1,6 +1,6 @@
 package cn.chjyj.szwh.service;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 
 import java.util.List;
 import java.util.Map;

src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java

@@ -6,9 +6,9 @@ import cn.chjyj.szwh.exception.ChException;
 import cn.chjyj.szwh.mapper.*;
 import cn.chjyj.szwh.service.AccountCloseService;
 import cn.chjyj.szwh.vo.SettleVo;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/main/java/cn/chjyj/szwh/service/impl/GoodsDetailServiceImpl.java

@@ -7,7 +7,7 @@ import cn.chjyj.szwh.service.GoodsDetailService;
 import cn.chjyj.szwh.utils.ProperUtils;
 import cn.chjyj.szwh.utils.RequestUtils;
 import cn.chjyj.szwh.utils.SignUtils;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java

@@ -14,8 +14,8 @@ import cn.chjyj.szwh.service.GoodsService;
 import cn.chjyj.szwh.utils.*;
 import cn.chjyj.szwh.vo.GoodsDetailVo;
 import cn.chjyj.szwh.vo.GoodsListVo;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -65,7 +65,7 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
     /**
-     * 更新产品，并统计更新数量
+     * api方式获取更新产品，并统计更新数量
      *
      * @return
      */
@@ -83,7 +83,6 @@ public class GoodsServiceImpl implements GoodsService {
         // 请求头
         Map<String, Object> hmap = new HashMap();
         hmap.put("entrust_token", sign);
-//        hmap.put("Content-Type", "application/json");
         // get 方式获取
         JSONObject jsonObject = RequestUtils.GetData(apiurl, hmap);
         // json的data节点

src/main/java/cn/chjyj/szwh/service/impl/GoodsSourceServiceImpl.java

@@ -8,9 +8,9 @@ import cn.chjyj.szwh.mapper.OrderGoodsDetailMapper;
 import cn.chjyj.szwh.mapper.OrderGoodsSourceMapper;
 import cn.chjyj.szwh.service.GoodsSourceService;
 import cn.chjyj.szwh.utils.SzFileUtils;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -166,7 +166,7 @@ public class GoodsSourceServiceImpl implements GoodsSourceService {
     public int insertGoodsSource(String res, String islicode) {
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 抽取出现对应数据
-        JSONArray jarr = JSONObject.parseArray(res);
+        JSONArray jarr = JSONArray.parseArray(res);
         for(int i=0;i<jarr.size();i++){
             JSONObject innerJson = (JSONObject) jarr.get(i);
             // 转为对象

src/main/java/cn/chjyj/szwh/service/impl/IndexServiceImpl.java

@@ -8,7 +8,7 @@ import cn.chjyj.szwh.service.IndexService;
 import cn.chjyj.szwh.utils.DateUtils;
 import cn.chjyj.szwh.utils.SzwhApiUtils;
 import cn.chjyj.szwh.vo.GoodsDetailVo;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/chjyj/szwh/service/impl/LoginServiceImpl.java

@@ -4,8 +4,8 @@ import cn.chjyj.szwh.service.LoginService;
 import cn.chjyj.szwh.utils.ProperUtils;
 import cn.chjyj.szwh.utils.RequestUtils;
 import cn.chjyj.szwh.utils.SignUtils;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.stereotype.Service;

src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@@ -7,8 +7,8 @@ import cn.chjyj.szwh.mapper.*;
 import cn.chjyj.szwh.service.OrderService;
 import cn.chjyj.szwh.utils.SzFileUtils;
 import cn.chjyj.szwh.vo.OrderDetailVo;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -297,7 +297,7 @@ public class OrderServiceImpl implements OrderService {
                         info.put("metadataFileFormat",odsJson.getString("metadataFileFormat"));
                         // 资源下载地址 ,json 格式
                         String sourceDown= orderGoodsDetailMapper.getOrderGoodsDetailSourceDownload(batchcode,dv.getGoods_islicode());
-                        JSONArray sdownJsonArray = JSONObject.parseArray(sourceDown);
+                        JSONArray sdownJsonArray = JSONArray.parseArray(sourceDown);
                         for(int i=0;i<sdownJsonArray.size();i++){
                             if(sdownJsonArray.getJSONObject(i).getString("islicode").equals(ods.getLinkcode())){
                                 // 是否已经下载。更新下载状态

src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java

@@ -6,7 +6,7 @@ import cn.chjyj.szwh.service.UserService;
 import cn.chjyj.szwh.utils.ProperUtils;
 import cn.chjyj.szwh.utils.RequestUtils;
 import cn.chjyj.szwh.utils.SignUtils;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/main/java/cn/chjyj/szwh/utils/ApiGoodsUtils.java

@@ -2,7 +2,7 @@ package cn.chjyj.szwh.utils;
 
 import cn.chjyj.szwh.bean.GoodsDetail;
 import cn.chjyj.szwh.bean.GoodsSource;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;

src/main/java/cn/chjyj/szwh/utils/RequestUtils.java

@@ -1,6 +1,6 @@
 package cn.chjyj.szwh.utils;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java

@@ -1,8 +1,8 @@
 package cn.chjyj.szwh.utils;
 
 import cn.chjyj.szwh.service.impl.UserServiceImpl;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/test/java/cn/chjyj/szwh/ApiTest.java

@@ -3,8 +3,8 @@ package cn.chjyj.szwh;
 import cn.chjyj.szwh.utils.RequestUtils;
 import cn.chjyj.szwh.utils.SignUtils;
 import cn.chjyj.szwh.utils.SzwhApiUtils;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.junit.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 

src/test/java/cn/chjyj/szwh/JwtRsaTokenTests.java

@@ -3,8 +3,8 @@ package cn.chjyj.szwh;
 
 import cn.chjyj.szwh.utils.RedisKeys;
 import cn.chjyj.szwh.utils.SignUtils;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;