Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/controller/EanUpcController.java

@@ -118,9 +118,9 @@ public class EanUpcController {
      */
     @Login
     @RequestMapping("/api/getDetailById")
-    public EanUpcEntityDetailVo getDetailById(@RequestBody EanUpcEntity eanUpcEntity) {
+    public R getDetailById(@RequestBody EanUpcEntity eanUpcEntity) {
 
-        return eanUpcService.getDetailById(eanUpcEntity);
+        return R.ok().put("data",eanUpcService.getDetailById(eanUpcEntity));
     }
 
 

src/main/java/io/office/modules/manage/utils/UploadUtils.java

@@ -47,9 +47,10 @@ public class UploadUtils {
         if (!fileDir.exists()) {
             fileDir.mkdirs();
         }
+        String uuid = IdWorkerUtils.getSEQByKey(IdKeysConstant.ID_SEQ_KEY);
         String dateDirPath = DateUtils.formatDateToString(new Date(), DateUtils.FORMAT4);
-        String returnFilename = fileRequestPrefix + dateDirPath +"/" + filename;
-        filename = fileSavePath + dateDirPath +"/" + filename;
+        String returnFilename = fileRequestPrefix + dateDirPath +"/" +uuid+"-"+ filename;
+        filename = fileSavePath + dateDirPath +"/" +uuid+"-"+filename;
         File dest = new File(filename);
         try {
             file.transferTo(dest);