Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: d3e8db27794253e7616e1a00bfe4538c33938451
+  newTag: aa568a728668f4541a08daf68a185cfd91878bc9

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: pms-deployment
 spec:
-  replicas: 2
+  replicas: 1
   template:
     spec:
-      nodeName: node-1
\ No newline at end of file
+      nodeName: master
\ No newline at end of file

pom.xml

@@ -68,9 +68,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-            <version>2.0.24</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.32</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.10.2</version>
         </dependency>
         <!--<dependency>
             <groupId>cn.hutool</groupId>
@@ -96,16 +101,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.10.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.70</version>
-        </dependency>
         <!--swagger-->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>

src/main/java/com/mmc/pms/common/ResultBody.java

 package com.mmc.pms.common;
 
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;