diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 9f70d6387..c17dd45f8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -176,9 +176,8 @@ public class UploadController extends BaseController { FileOutputStream fos = null; String imgFormat = ImgUtil.getImgFormat(fileFormat); if(StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; - String tempFileName1 = UUID.randomUUID().toString(); - String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName1 + fileFormat; + String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + "-1" + fileFormat; + String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; BufferedInputStream fs = null; File localFile = new File(localImgFileName); fos = new FileOutputStream(localFile); @@ -191,9 +190,8 @@ public class UploadController extends BaseController { fos.close(); fs.close(); logger.info("local file: " + localImgFileName); - File newFile = ImgUtil.thinImage(localImgFileName, localNewImgFileName, imgFormat); - logger.info("local new file: " + localImgFileName); + logger.info("local new file: " + localNewImgFileName); // 删除本地缓存 localFile.delete(); ObjectMetadata metadata = new ObjectMetadata(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index 95af9c8a6..b55c5fd41 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -180,9 +180,8 @@ public class UploadController extends BaseController { String imgFormat = ImgUtil.getImgFormat(fileFormat); if(StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; - String tempFileName1 = UUID.randomUUID().toString(); - String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName1 + fileFormat; + String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + "-1" + fileFormat; + String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; BufferedInputStream fs = null; File localFile = new File(localImgFileName); fos = new FileOutputStream(localFile); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 3fab80041..264043846 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -175,8 +175,7 @@ public class UploadController extends BaseController { FileOutputStream fos = null; String imgFormat = ImgUtil.getImgFormat(fileFormat); if(StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; - tempFileName = UUID.randomUUID().toString(); + String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + "-1" + fileFormat; String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; BufferedInputStream fs = null; File localFile = new File(localImgFileName);