不能删除

4dkankan-application/src/main/resources/application-dev.properties

@@ -89,6 +89,8 @@ logging.path=/4Dkankan/logs/
 logging.config=classpath:logback-spring.xml
 logging.level.com.fdkankan=debug
 
+kankan.ffmpeg.env=127.0.0.1
+
 
 
 

4dkankan-application/src/main/resources/application-uat.properties

@@ -89,5 +89,5 @@ knife4j.basic.username=apiadmin
 knife4j.basic.password=fdkankancui
 
 
-
+kankan.ffmpeg.env=10.71.5.217
 

4dkankan-base/src/main/java/com/fdkankan/base/config/KankanGlobalConfig.java

@@ -20,4 +20,8 @@ public class KankanGlobalConfig {
     @Value("${isOpenAuth}")
     private Boolean isOpenAuth;
 
+
+    @Value("${kankan.ffmpeg.env}")
+    private String ffmpegEnv;
+
 }

4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fdkankan.base.config.KankanGlobalConfig;
 import com.fdkankan.base.constant.LoginConstant;
 import com.fdkankan.base.constant.SceneConstant;
 import com.fdkankan.base.mapper.base.IBaseMapper;
@@ -96,6 +97,9 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
     @Value("${prefix.ali}")
     private String prefixAli;
 
+    @Autowired
+    private KankanGlobalConfig kankanGlobalConfig;
+
     @Override
     public IBaseMapper<SceneProEntity, String> getBaseMapper() {
         return sceneProMapper;
@@ -3087,7 +3091,7 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         CreateObjUtil.ossUtilCp(ossFile, targetPath);
 
         // 生成水印视频
-        CreateObjUtil.generateShareVideo(targetFile);
+        CreateObjUtil.generateShareVideo(targetFile, kankanGlobalConfig.getFfmpegEnv());
 
         // 上传到oss
         uploadToOssUtil.uploadMulFilesV2(SceneOssFileEnum.VIDEO, downloadVideoParam.getSceneNum(), newFileName);
@@ -3866,7 +3870,9 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
             scenejson = JSONObject.parseObject(strsceneInfos);
         }
 
+        log.info("转换前-scene.json文件转换json-{}", scenejson);
         JSONArray newSceneJson = putVideoDataToAllSceneJson(operaVideoDTO, scenejson);
+        log.info("转换后-scene.json文件转换json-{}", scenejson);
         FileUtils.writeFile(dataBuffer + "scene.json", newSceneJson.toString());
 
         Map<String, String> uploadMap = new HashMap<>();

4dkankan-scene/src/main/java/com/fdkankan/scene/util/CreateObjUtil.java

@@ -44,15 +44,15 @@ public class CreateObjUtil{
 	 * 生成水印视频
 	 * @throws Exception
 	 */
-	public static void generateShareVideo(String videoPath) throws Exception{
+	public static void generateShareVideo(String videoPath, String ffmpegEnv) throws Exception{
 		log.info("生成水印视频开始");
 		String fileName = videoPath.substring(videoPath.lastIndexOf("/") + 1, videoPath.lastIndexOf("."));
 		String suffix = videoPath.substring(videoPath.lastIndexOf("."));
 		String fileFolderPath = videoPath.substring(0, videoPath.lastIndexOf("/") + 1);
-		String command = "4dage-ffmpeg-rotVwatermark -s " + videoPath
+		String command = "ssh root@" + ffmpegEnv +  "'4dage-ffmpeg-rotVwatermark -s " + videoPath
 				+ " -w " + Constant.WATER_MARK_PATH
 				+ " -n " + fileName + Constant.SCENE_VIDEO_SHARE_SUFFIX + suffix
-				+ " -o " + fileFolderPath;
+				+ " -o " + fileFolderPath + "'";
 		log.info("调用脚本命令-{}", command);
 		callshell(command);
 		log.info("生成水印视频结束");