v4域名

src/main/java/com/fdkankan/manage/httpClient/address/FdkkAddressSource.java

@@ -9,10 +9,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class FdkkAddressSource implements AddressSource {
 
-    @Value("${4dkk.fdService.basePath}")
+    @Value("${4dkk.v4fdService.basePath}")
     private String basePath;
 
-    @Value("${4dkk.fdService.port}")
+    @Value("${4dkk.v4fdService.port}")
     private String port;
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -429,14 +429,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             uploadPath =localPath.replace(ConstantFilePath.SCENE_V4_PATH, "");
         }
         FileUtils.writeJsonFile(localPath, map);
-        if(type.equals("v4")){
-            mangeUploadToOssUtil.upload(localPath,uploadPath);
-        }
+        mangeUploadToOssUtil.upload(localPath,uploadPath);
     }
 
     @Override
     public void uploadNewSceneToOss(String newNum) {
-        Map<String, String> map = new HashMap();
+        Map<String, String> map = new HashMap<>();
         List<String> urlList = new ArrayList<>();
         FileUtils.readfilePath(ConstantFilePath.SCENE_PATH + "images/images" + newNum, urlList);
         FileUtils.readfilePath(ConstantFilePath.SCENE_PATH + "data/data" + newNum, urlList);
@@ -454,7 +452,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         String[] datasource = preDataSource.split("/");
         datasource[4] = snowflakeIdGenerator.nextId()+"";
         datasource[5] = datasource[3]+"_"+ time;
-        return  Arrays.stream(datasource).collect(Collectors.joining("/"));
+        return String.join("/", datasource);
     }
 
     @Override