From cfe8e9eb93657a1300d1c9acd2e844525785321c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 17:05:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java
index 083e671..378d2eb 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RvideoController.java
@@ -16,23 +16,18 @@
  */
 package org.springblade.jfpt.rvideo.controller;
 
-import io.minio.MinioClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import jodd.util.StringPool;
 import lombok.AllArgsConstructor;
-
 import javax.validation.Valid;
-
 import net.logstash.logback.encoder.org.apache.commons.lang3.StringEscapeUtils;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.jfpt.alarm.service.IAlarmService;
 import org.springblade.jfpt.xlfeedback.service.IXlfeedbackService;
 import org.springframework.web.bind.annotation.*;
@@ -317,7 +312,7 @@
 			count++;
 		}
 		String newJson = StringEscapeUtils.unescapeHtml4(url);
-		RecordVideoThread recordVideoThread = new RecordVideoThread(newJson,"D:\\void\\"+UUID + ".mp4");
+		RecordVideoThread recordVideoThread = new RecordVideoThread(newJson,"D:\\software\\minio\\data\\jfpt\\void\\"+UUID +".mp4");
 		thread = new Thread(recordVideoThread);
 		thread.start();
 	}

--
Gitblit v1.9.3