update MultiResponse & update version 1.2.0

Author: xlorne

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.codingapi.springboot</groupId>
 	<artifactId>springboot-parent</artifactId>
-	<version>1.1.8</version>
+	<version>1.2.0</version>
 
 	<url>https://github.com/codingapi/springboot-framewrok</url>
 	<name>springboot-parent</name>

springboot-example/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.codingapi.springboot</groupId>
 		<artifactId>springboot-parent</artifactId>
-		<version>1.1.8</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>springboot-example</artifactId>
 

springboot-starter-data-permission/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.1.8</version>
+        <version>1.2.0</version>
     </parent>
 
 

springboot-starter-leaf/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.1.8</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-security-jwt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.1.8</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>springboot-starter-security-jwt</artifactId>

springboot-starter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
 		<groupId>com.codingapi.springboot</groupId>
 		<artifactId>springboot-parent</artifactId>
-		<version>1.1.8</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/response/MultiResponse.java

@@ -14,15 +14,23 @@
 @Getter
 public class MultiResponse<T> extends Response {
 
-    private long total;
 
-    private Collection<T> data;
+    private Content<T> data;
+
+    @Setter
+    @Getter
+    public static class Content<T>{
+        private long total;
+        private Collection<T> list;
+    }
 
     public static <T> MultiResponse<T> of(Collection<T> data, long total) {
         MultiResponse<T> multiResponse = new MultiResponse<>();
         multiResponse.setSuccess(true);
-        multiResponse.setData(data);
-        multiResponse.setTotal(total);
+        Content<T> content = new Content<>();
+        content.setTotal(total);
+        content.setList(data);
+        multiResponse.setData(content);
         return multiResponse;
     }
 
@@ -36,20 +44,23 @@ public static <T> MultiResponse<T> empty() {
         MultiResponse<T> multiResponse = new MultiResponse<>();
         multiResponse.setSuccess(true);
         multiResponse.setData(null);
-        multiResponse.setTotal(0);
+        Content<T> content = new Content<>();
+        content.setTotal(0);
+        content.setList(null);
         return multiResponse;
     }
 
 
     public static <T> MultiResponse<T> of(Collection<T> data) {
         MultiResponse<T> multiResponse = new MultiResponse<>();
         multiResponse.setSuccess(true);
-        multiResponse.setData(data);
         long total = 0;
         if(data!=null){
             total = data.size();
         }
-        multiResponse.setTotal(total);
+        Content<T> content = new Content<>();
+        content.setTotal(total);
+        content.setList(data);
         return multiResponse;
     }