Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: dcb9f24223e96135b2e9a18b461fb2731c6c6eef
+  newTag: 763af0b2be2ed042524dc1890a96ec14cf8f4621

pom.xml

@@ -216,12 +216,14 @@
                 <version>4.4</version>
             </dependency>
 
+            <!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>
                 <version>3.1.3</version>
             </dependency>
 
+
             <dependency>
                 <groupId>com.aliyun.oss</groupId>
                 <artifactId>aliyun-sdk-oss</artifactId>

src/main/java/com/mmc/oms/controller/BaseController.java

@@ -49,6 +49,11 @@ public abstract class BaseController {
         if (StringUtils.isBlank(json)) {
             throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
         }
+        // 版本问题，需要修改json字符串，去除最外侧""和转义\
+        if (json.startsWith("\"") && json.endsWith("\"")) {
+            json = json.substring(1, json.length() - 1);
+        }
+        json = json.replace("\\","");
         BaseAccountDTO baseAccountDTO = JSONObject.parseObject(json, BaseAccountDTO.class);
         return baseAccountDTO;
     }

src/main/java/com/mmc/oms/filter/AuthSignatureFilter.java

@@ -90,6 +90,11 @@ public class AuthSignatureFilter implements AuthFilter {
                     response(response, ResultBody.error(ResultEnum.THE_TOKEN_IS_INVALID));
                     return false;
                 }
+                // 版本问题，需要修改json字符串，去除最外侧""和转义\
+                if (s.startsWith("\"") && s.endsWith("\"")) {
+                    s = s.substring(1, s.length() - 1);
+                }
+                s = s.replace("\\","");
                 UserAccountDTO userAccountDTO = JSON.parseObject(s, UserAccountDTO.class);
                 try {
                     Tenant tenant = TenantContext.buildTenant(userAccountDTO.getAccountNo());