合并代码

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java

@@ -1,11 +1,9 @@
-package cn.estsh.i3plus.pojo.bsp.comon;
+package cn.estsh.i3plus.pojo.bsp.common;
 
 import java.io.Serializable;
 
 /**
- * common return
- * @author xuxueli 2015-12-4 16:32:31
- * @param <T>
+ * @author Castle
  */
 public class ReturnT<T> implements Serializable {
     public static final long serialVersionUID = 42L;
@@ -14,7 +12,7 @@ public class ReturnT<T> implements Serializable {
     public static final int FAIL_CODE = 500;
 
     public static final ReturnT<String> SUCCESS = new ReturnT<String>(null);
-    public static final ReturnT<String> FAIL = new  ReturnT<String>(FAIL_CODE, null);
+    public static final ReturnT<String> FAIL = new ReturnT<String>(FAIL_CODE, null);
 
     private int code;
     private String msg;
@@ -25,6 +23,7 @@ public class ReturnT<T> implements Serializable {
         this.code = code;
         this.msg = msg;
     }
+
     public ReturnT(T content) {
         this.code = SUCCESS_CODE;
         this.content = content;
@@ -55,4 +54,3 @@ public class ReturnT<T> implements Serializable {
     }
 
 }
-

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/GsonTool.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.bsp.server.util;
+package cn.estsh.i3plus.pojo.bsp.common.util;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/HttpUtils.java

@@ -1,6 +1,6 @@
-package cn.estsh.i3plus.pojo.bsp.server.util;
+package cn.estsh.i3plus.pojo.bsp.common.util;
 
-import cn.estsh.i3plus.pojo.bsp.server.common.ReturnT;
+import cn.estsh.i3plus.pojo.bsp.common.ReturnT;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/common/ReturnT.java

@@ -1,56 +0,0 @@
-package cn.estsh.i3plus.pojo.bsp.server.common;
-
-import java.io.Serializable;
-
-/**
- * @author Castle
- */
-public class ReturnT<T> implements Serializable {
-    public static final long serialVersionUID = 42L;
-
-    public static final int SUCCESS_CODE = 200;
-    public static final int FAIL_CODE = 500;
-
-    public static final ReturnT<String> SUCCESS = new ReturnT<>(null);
-    public static final ReturnT<String> FAIL = new ReturnT<>(FAIL_CODE, null);
-
-    private int code;
-    private String msg;
-    private T content;
-
-    public ReturnT(){}
-    public ReturnT(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public ReturnT(T content) {
-        this.code = SUCCESS_CODE;
-        this.content = content;
-    }
-
-    public int getCode() {
-        return code;
-    }
-    public void setCode(int code) {
-        this.code = code;
-    }
-    public String getMsg() {
-        return msg;
-    }
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-    public T getContent() {
-        return content;
-    }
-    public void setContent(T content) {
-        this.content = content;
-    }
-
-    @Override
-    public String toString() {
-        return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]";
-    }
-
-}