Quellcode durchsuchen

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx vor 7 Jahren
Ursprung
Commit
acb1d88f4f

+ 0 - 5
src/main/java/com/goafanti/admin/controller/AdminVideoApiController.java

@@ -135,13 +135,10 @@ public class AdminVideoApiController extends CertifyApiController {
 		
 		video.setTranscoding(1);
 		// 保存到数据库
-		System.out.println("//*/*/*/*");
 		result.setData(adminVideoService.insertVideo(video));
-		System.out.println("================//*/*/*/*");
 
 		// 压缩视频并将视频
 		videoChange(filename, output, video.getUrl());
-		System.out.println("2222222================//*/*/*/*");
 		
 		return result;
 	}
@@ -194,7 +191,6 @@ public class AdminVideoApiController extends CertifyApiController {
 		FFmpegProbeResult in = ffprobe.probe(input);
 
 		FFmpegBuilder builder = new FFmpegBuilder();
-		System.out.println("333333333333asdagjdgajgdj");
 		builder.setInput(in) // 输入文件
 				.overrideOutputFiles(true) // 覆盖重复文件
 				.addOutput(output) // 输出文件
@@ -210,7 +206,6 @@ public class AdminVideoApiController extends CertifyApiController {
 				.setStrict(FFmpegBuilder.Strict.EXPERIMENTAL) // 严格形式
 				.done();
 
-		System.out.println("444444444444444444asdagjdgajgdj");
 		FFmpegExecutor executor = new FFmpegExecutor(ffmpeg, ffprobe);
 		ExecutorService service = Executors.newCachedThreadPool();
 		// 3.直接new一个FutureTask

+ 2 - 2
src/main/resources/props/config_test.properties

@@ -81,8 +81,8 @@ jiguang.appKey=dbcea43366e038073452a04e
 jiguang.masterSecret=59792298288e4f635c737def
 jiguang.pushUrl=https://api.jpush.cn/v3/push
 
-ffmpeg.path=/monchickey/ffmpeg/bin/ffmpeg
-ffprobe.path=/monchickey/ffmpeg/bin/ffprobe
+ffmpeg.path=/usr/bin/ffmpeg
+ffprobe.path=/usr/bin/ffprobe