国际版兼容

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -281,11 +281,11 @@ public class LaserService {
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
 
-    @Value("${4dkk.laserService.cloud-point-fyun-path}")
+    @Value("${4dkk.laserService.cloud-point-fyun-path:testdata/%s/data/bundle_%s/building/}")
     private String cloudPointFyunPath;
-    @Value("${4dkk.laserService.bucket}")
+    @Value("${4dkk.laserService.bucket:laser-data}")
     private String bucket;
-    @Value("${queue.application.laser.cloud-point-build}")
+    @Value("${queue.application.laser.cloud-point-build:laser-cloud-point-build}")
     private String cloudPointBuild;
 
 

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -17,6 +17,7 @@ import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.common.constants.UploadFilePath;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
@@ -311,7 +312,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
                     laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
                             sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
-                } else {
+                } else if(!"aws".equals(NacosProperty.uploadType)){
                     laserService.cloudPointBuild(num,newNum);
                 }
                 sceneCopyLogService.saveByNum(num,newNum,scenePlus.getUserId());