1. 单层数据模板调整

framework-core/pom.xml

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

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

@@ -38,7 +38,7 @@ public final class BaseReturnUtils {
         }
     }
 
-    private static boolean isBaseReturnFormat(JSONObject jsn) {
+    public static boolean isBaseReturnFormat(JSONObject jsn) {
         return jsn.containsKey("code") && jsn.containsKey("message") && jsn.containsKey("data");
     }
 }

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

@@ -21,20 +21,23 @@ public class SingleNestDataTemplate implements DataTemplate {
     @Override
     public Object handle(Object returnValue) {
         if (returnValue instanceof BaseReturn) {
-            if (((BaseReturn) returnValue).getData() instanceof BaseReturn) {
+            Object data = ((BaseReturn) returnValue).getData();
+            if (data instanceof BaseReturn) {
                 returnValue = ((BaseReturn) returnValue).getData();
+            } else if (data instanceof JSONObject && BaseReturnUtils.isBaseReturnFormat((JSONObject) data)) {
+                return data;
+            } else {
+                return returnValue;
             }
         } else if (returnValue instanceof JSONObject) {
-            returnValue = BaseReturnUtils.parse((JSONObject) returnValue).getData();
+            return BaseReturnUtils.parse((JSONObject) returnValue).getData();
         } else if (returnValue instanceof String) {
             String sData = (String) returnValue;
             if (sData.startsWith("{") && sData.endsWith("}")) {
-                returnValue = BaseReturnUtils.parse(JSONObject.parseObject(sData)).getData();
+                return BaseReturnUtils.parse(JSONObject.parseObject(sData)).getData();
             }
-        } else {
-            returnValue = BaseReturn.suc(returnValue);
         }
 
-        return returnValue;
+        return BaseReturn.suc(returnValue);
     }
 }

framework-orm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>unionmed-framework</artifactId>
         <groupId>com.unionmed</groupId>
-        <version>0.0.8</version>
+        <version>0.0.9</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.8</version>
+        <version>0.0.9</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.8</version>
+    <version>0.0.9</version>
     <packaging>pom</packaging>
     <name>unionmed-framework</name>