调整计算服务

pom.xml

@@ -29,12 +29,18 @@
 		<dependency>
 			<groupId>com.fdkankan</groupId>
 			<artifactId>4dkankan-utils-rubber-sheeting</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fdkankan</groupId>
-			<artifactId>4dkankan-utils-fyun</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<artifactId>4dkankan-utils-fyun-oss</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fdkankan</groupId>
+			<artifactId>4dkankan-utils-fyun-s3</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
 
 <!--		<dependency>-->
@@ -46,13 +52,13 @@
 		<dependency>
 			<groupId>com.fdkankan</groupId>
 			<artifactId>4dkankan-utils-rabbitmq</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fdkankan</groupId>
 			<artifactId>4dkankan-utils-redis</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -10,7 +10,7 @@ import com.fdkankan.common.util.ComputerUtil;
 import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.SceneUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.modeling.bean.BuildSceneResultBean;
 import com.fdkankan.modeling.constants.SysConstants;
 import com.fdkankan.modeling.entity.BuildLog;
@@ -76,7 +76,7 @@ public class RabbitMqListener {
     private String prefixAli;
 
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private FYunFileServiceInterface fYunFileService;
 
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
@@ -289,7 +289,7 @@ public class RabbitMqListener {
             videoVersion = StrUtil.isEmpty(videoVersionStr) ? null : Integer.parseInt(videoVersionStr);
 
             //计算成功  激光转台相机 同步 请求
-            this.jgSynch(message);
+            this.syncLaserSystem(message);
         }
 
         buildSceneResult.setFileId(fileId);
@@ -409,20 +409,20 @@ public class RabbitMqListener {
             String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, num);
 
             //todo 待删除old_path
-            uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
+            fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
                 "data/data" + num + File.separator + "status.json");
 
-            uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
+            fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
                 dataPath + "status.json");
 
-            uploadToOssUtil.upload(dataSource + File.separator + "console.log", buildLogPath + "console.log");
+            fYunFileService.uploadFile(dataSource + File.separator + "console.log", buildLogPath + "console.log");
 
         }catch (Exception e){
             log.error("上传日志失败！", e);
         }
     }
 
-    private void jgSynch(BuildSceneCallMessage message){
+    private void syncLaserSystem(BuildSceneCallMessage message){
         log.info("激光转台相机 同步 请求 ");
         if(Integer.parseInt(message.getCameraType()) != 14)
             return;
@@ -475,8 +475,7 @@ public class RabbitMqListener {
 
             url = url.replace("{sceneCode}",message.getSceneNum());
             log.info("激光转台相机 同步 ：" + url);
-            JSONObject hotListJson =
-                JSONObject.parseObject(restTemplate.getForObject(url,String.class));
+            JSONObject hotListJson = JSONObject.parseObject(restTemplate.getForObject(url,String.class));
             log.info("激光转台相机 同步结束 ：" + hotListJson);
         }catch (Exception e){
             log.error("激光转台相机同步失败", e);

src/main/resources/bootstrap-test.yml

@@ -32,6 +32,10 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
 #management:
 #  endpoints:
 #    web: