Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java =================================================================== diff -u -r15249 -r15372 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java (.../ShowImageAction.java) (revision 15249) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java (.../ShowImageAction.java) (revision 15372) @@ -34,6 +34,7 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.string.StringTools; +import com.forgon.tools.util.FileUtils; /** * 显示图片的action @@ -129,34 +130,19 @@ } private byte[] readImageData(ImageFile picture) { byte[] img; - img = new byte[4096 * 1024]; String saveImagePath = supplyRoomConfigManager .getSystemParamsObj().getSaveImagePath(); String thumbnailImagePath = picture.getThumbnailImagePath(); String uuidImageName = picture.getUUIDAndImageName(); - String Directory = saveImagePath + thumbnailImagePath + String path = saveImagePath + thumbnailImagePath + "\\" + uuidImageName; - FileInputStream fis = null; try { - fis = new FileInputStream(new File(Directory)); - fis.read(img); - } catch (FileNotFoundException e) { + img = FileUtils.readAllContentAsBytes(path); + } catch (Exception e) { img = FileSystemHelper.readBlankImageBytes(StrutsParamUtils .getServletContext().getRealPath("/")); - } catch (IOException e) { - img = FileSystemHelper.readBlankImageBytes(StrutsParamUtils - .getServletContext().getRealPath("/")); } - finally { - if (fis != null) { - try { - fis.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } return img; } /**