12

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

@@ -16,6 +16,7 @@ import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
 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.util.RedisUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
@@ -114,8 +115,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Value("${queue.modeling.obj.modeling-pre}")
     private String queueObjModelingPre;
-    @Value("${fyun.bucket}")
-    private String bucket;
 
     @Autowired
     private RabbitMqProducer mqProducer;
@@ -602,12 +601,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         jsonObject.put("uuidtime",time);
         FileUtils.writeFile(newDataSource + "/data.fdage", jsonObject.toJSONString());
-        ShellUtil.yunUpload(newDataSource, bucket.concat("/" + ConstantFilePath.OSS_PREFIX + newDataSource.replace(buildModelPath, "")));
+        ShellUtil.yunUpload(newDataSource, NacosProperty.bucket.concat("/" + ConstantFilePath.OSS_PREFIX + newDataSource.replace(buildModelPath, "")));
 
         // 复制计算结果
         ShellUtil.yunDownload(ConstantFilePath.OSS_PREFIX + oldDataSource.concat("_results/").replace(buildModelPath, ""), newDataSource.concat("_results"));
         if(new File(newDataSource.concat("_results")).exists()){
-            ShellUtil.yunUpload(newDataSource.concat("_results"),bucket.concat("/" + ConstantFilePath.OSS_PREFIX + newDataSource.concat("_results").replace(buildModelPath, "")));
+            ShellUtil.yunUpload(newDataSource.concat("_results"),NacosProperty.bucket.concat("/" + ConstantFilePath.OSS_PREFIX + newDataSource.concat("_results").replace(buildModelPath, "")));
             FileUtils.delAllFile(newDataSource.concat("_results"));
         }
         FileUtils.delAllFile(newDataSource);
@@ -655,10 +654,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      * @param newNum
      */
     private void uploadNewSceneToOss(String newNum) {
-        ShellUtil.yunUpload("/mnt/4Dkankan/scene/images/images" + newNum, bucket.concat("/images/images") + newNum);
-        ShellUtil.yunUpload("/mnt/4Dkankan/scene/data/data" + newNum, bucket.concat("/data/data") + newNum);
-        ShellUtil.yunUpload("/mnt/4Dkankan/scene/voice/voice" + newNum, bucket.concat("/voice/voice") + newNum);
-        ShellUtil.yunUpload("/mnt/4Dkankan/scene/video/video" + newNum, bucket.concat("/video/video") + newNum);
+        ShellUtil.yunUpload("/mnt/4Dkankan/scene/images/images" + newNum, NacosProperty.bucket.concat("/images/images") + newNum);
+        ShellUtil.yunUpload("/mnt/4Dkankan/scene/data/data" + newNum, NacosProperty.bucket.concat("/data/data") + newNum);
+        ShellUtil.yunUpload("/mnt/4Dkankan/scene/voice/voice" + newNum, NacosProperty.bucket.concat("/voice/voice") + newNum);
+        ShellUtil.yunUpload("/mnt/4Dkankan/scene/video/video" + newNum, NacosProperty.bucket.concat("/video/video") + newNum);
     }
 
     @Override