Merge branch 'master' of http://192.168.1.220:10080/esb/esb

src/main/java/com/yihu/hos/system/controller/AppController.java

@@ -347,26 +347,11 @@ public class AppController extends BaseController {
    @ResponseBody
    public Object read(HttpServletResponse response, @PathVariable("fileName")  String fileName) {
        // response.setContentType("image/*");
        FileInputStream fis = null;
        OutputStream os = null;
        try {
            os = response.getOutputStream();
            appManager.readFile(os, fileName);
            int count = 0;
            byte[] buffer = new byte[1024 * 8];
            while ((count = fis.read(buffer)) != -1) {
                os.write(buffer, 0, count);
                os.flush();
            }
            OutputStream os = response.getOutputStream();
            return appManager.readFile(os, fileName);
        } catch (Exception e) {
            e.printStackTrace();
        }
        try {
            fis.close();
            os.close();
        } catch (IOException e) {
            return Result.error("上传失败！");
            return Result.error("读取失败！");
        }
        return Result.error("上传成功！");
    }
}

src/main/java/com/yihu/hos/system/controller/FlowController.java

@@ -210,28 +210,12 @@ public class FlowController extends BaseController {
    @RequestMapping(value = "/read/{fileName}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    public Object read(HttpServletResponse response, @PathVariable("fileName")  String fileName) {
        // response.setContentType("image/*");
        FileInputStream fis = null;
        OutputStream os = null;
        try {
            os = response.getOutputStream();
            flowManage.readFile(os, fileName);
            int count = 0;
            byte[] buffer = new byte[1024 * 8];
            while ((count = fis.read(buffer)) != -1) {
                os.write(buffer, 0, count);
                os.flush();
            }
            OutputStream os = response.getOutputStream();
            return flowManage.readFile(os, fileName);
        } catch (Exception e) {
            e.printStackTrace();
        }
        try {
            fis.close();
            os.close();
        } catch (IOException e) {
            return Result.error("上传失败！");
            return Result.error("读取失败！");
        }
        return Result.error("上传成功！");
    }
    @RequestMapping(value = "/flowTempList", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)

src/main/java/com/yihu/hos/system/service/AppManager.java

@@ -151,10 +151,10 @@ public class AppManager implements IAppManager {
        try {
            fileName = DES.decrypt(fileName, DES.COMMON_PASSWORD);
            GridFSUtil.readFile(mongoConfig.mongoClient().getDatabase(dbName), os, fileName);
            return Result.success("获取成功");
            return Result.success("读取成功");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return Result.error("获取失败");
        return Result.error("读取失败");
    }
}

src/main/java/com/yihu/hos/system/service/FlowManager.java

@@ -256,11 +256,11 @@ public class FlowManager implements IFlowManage {
        try {
            fileName = DES.decrypt(fileName, DES.COMMON_PASSWORD);
            GridFSUtil.readFile(mongoConfig.mongoClient().getDatabase(dbName), os, fileName);
            return Result.success("获取成功");
            return Result.success("读取成功");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return Result.error("获取失败");
        return Result.error("读取失败");
    }
    /**