Merge remote-tracking branch 'origin/test' into test

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1318,14 +1318,18 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         // 拷贝资源至新的资源路径
         String[] newDataPath = dataSource.split("/");
-        newDataPath[4] = newDataPath[4]+"_c";
+        newDataPath[4] = newDataPath[4] + "_" + System.currentTimeMillis();
         String time = com.fdkankan.common.util.DateUtil.date2String(new Date(), com.fdkankan.common.util.DateUtil.YYYYMMDDHHMMSSSSS_DATA_FORMAT);
         newDataPath[5] = newDataPath[5].split("_")[0] + "_" + time;
         String newDataSource = Arrays.stream(newDataPath).collect(Collectors.joining("/"));
-        fYunFileService.copyFileInBucket(dataSource,newDataSource);
+
+        String newFYunPath = ConstantFilePath.OSS_PREFIX + newDataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
+                .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
+
+        fYunFileService.copyFileInBucket(fYunPath,newFYunPath);
 
         fdageData.put("uuidtime",time);
-        fYunFileService.uploadFile(fdageData.toJSONString().getBytes(),newDataSource+"/data.fdage");
+        fYunFileService.uploadFile(fdageData.toJSONString().getBytes(),newFYunPath+"/data.fdage");
 
         dataSource = newDataSource;