1. 代码优化

framework-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.unionmed</groupId>
     <artifactId>unionmed-framework</artifactId>
-    <version>0.0.15</version>
+    <version>0.0.16</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java

@@ -3,6 +3,8 @@ package com.unionmed.framework.spring.mvc;
 import com.alibaba.fastjson.JSONObject;
 import com.unionmed.framework.util.ObjectUtils;
 
+import java.util.Map;
+
 /**
  * @author ianChen
  * @date 2023/6/6 10:48
@@ -39,6 +41,10 @@ public final class BaseReturnUtils {
     }
 
     public static boolean isBaseReturnFormat(JSONObject jsn) {
-        return jsn.containsKey("code") && jsn.containsKey("message") && jsn.containsKey("data");
+        return isBaseReturnFormat((Map) jsn);
+    }
+
+    public static boolean isBaseReturnFormat(Map map) {
+        return map.containsKey("code") && map.containsKey("message") && map.containsKey("data");
     }
 }

framework-core/src/main/java/com/unionmed/framework/spring/mvc/response/interceptor/EncryptionResponseBodyInterceptor.java

@@ -46,12 +46,15 @@ public class EncryptionResponseBodyInterceptor implements ResponseBodyIntercepto
     }
 
     private Object handleReturnValue(String sk, String iv, Object returnValue) {
+        if (returnValue == null) {
+            return returnValue;
+        }
         if (returnValue instanceof BaseReturn) {
             BaseReturn br = (BaseReturn) returnValue;
             if (br.getData() != null) {
                 br.setData(handleReturnValue(sk, iv, br.getData()));
-                return returnValue;
             }
+            return returnValue;
         } else if (returnValue instanceof String) {
             String str = (String) returnValue;
             if (JSONUtil.isJsonObj(str)) {
@@ -60,11 +63,16 @@ public class EncryptionResponseBodyInterceptor implements ResponseBodyIntercepto
         } else if (returnValue instanceof JSONObject) {
             JSONObject jObject = (JSONObject) returnValue;
             if (BaseReturnUtils.isBaseReturnFormat(jObject)) {
+                if (jObject.get("data") != null) {
                     jObject.put("data", handleReturnValue(sk, iv, jObject.get("data")));
+                }
                 return jObject;
             }
-        } else if (returnValue instanceof Map) {
-            return handleReturnValue(sk, iv, new JSONObject((Map<String, Object>) returnValue));
+        } else if (returnValue instanceof Map && !((Map) returnValue).isEmpty()) {
+            Map map = (Map) returnValue;
+            if (BaseReturnUtils.isBaseReturnFormat(map)) {
+                return map.get("data") == null ? returnValue : handleReturnValue(sk, iv, new JSONObject((Map<String, Object>) returnValue));
+            }
         }
 
         return BodyCryptUtils.encrypt(sk, iv, returnValue);

framework-orm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>unionmed-framework</artifactId>
         <groupId>com.unionmed</groupId>
-        <version>0.0.15</version>
+        <version>0.0.16</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

framework-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.unionmed</groupId>
         <artifactId>unionmed-framework</artifactId>
-        <version>0.0.15</version>
+        <version>0.0.16</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.unionmed</groupId>
   <artifactId>unionmed-framework</artifactId>
-  <version>0.0.15</version>
+  <version>0.0.16</version>
   <packaging>pom</packaging>
   <name>unionmed-framework</name>