Merge remote-tracking branch 'origin/feature/hotfix_shangbao' into feature/hotfix_shangbao

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 96c4c8914de5ce3b1bdc337e5c0d936fd09e9006
+Subproject commit 762d085bcbdca1cc88e670956a3cd147537abec2

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java

@@ -17,6 +17,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.CompressImgUtils;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AliyunGroup;
@@ -45,6 +46,7 @@ import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -286,7 +288,8 @@ public class OssController {
             return new Result<UploadDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
         }
         String name = ItemStateCodeEnum.getValueByCode(code);
-
+        String timeStr = DateUtils.format(new Date(), DateUtils.TIME_PATTERN_NO_SPLIT);
+        name = name + timeStr;
         // 图片压缩
         byte[] afterJyBytes = CompressImgUtils.commpressPicCycle(file.getBytes(), 1024, 0.5);
 
@@ -313,7 +316,8 @@ public class OssController {
             return new Result<UploadImgAllDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
         }
         String name = ItemStateCodeEnum.getValueByCode(code);
-
+        String timeStr = DateUtils.format(new Date(), DateUtils.TIME_PATTERN_NO_SPLIT);
+        name = name + timeStr;
         // 图片压缩
         byte[] afterJyBytes = CompressImgUtils.commpressPicCycle(file.getBytes(), 1024, 0.5);