merge

boot-service/src/main/java/com/xwbing/util/JsonResult.java

@@ -66,7 +66,7 @@ public class JsonResult {
      */
     public static JSONObject toJSONObj(String error) {
         JsonResult jsonObjResult = new JsonResult();
-        jsonObjResult.setSuccess(false);
+//        jsonObjResult.setSuccess(false);
         jsonObjResult.setMessage(error);
         return JSON.parseObject(JSONObject.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue));
     }

boot-service/src/main/java/com/xwbing/util/RestMessage.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 public class RestMessage implements Serializable {
     private static final long serialVersionUID = -4167591341943919542L;
     @ApiModelProperty(value = "是否成功")
-    private boolean success = false;
+    private boolean success;
     @ApiModelProperty(value = "成功、错误返回提示信息")
     private String message;
     @ApiModelProperty(value = "返回的数据")

boot-service/src/main/java/com/xwbing/util/ZipUtil.java

@@ -80,7 +80,7 @@ public class ZipUtil {
             try {
                 FileInputStream fis = new FileInputStream(file);
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                byte[] data = new byte[1024 * 10];
+                byte[] data = new byte[fis.available()];
                 int len;
                 while ((len = fis.read(data)) != -1) {
                     bos.write(data, 0, len);