diff --git a/src/main/java/com/yutou/bilibili/BiliBili/Controllers/BiliVideoController.java b/src/main/java/com/yutou/bilibili/BiliBili/Controllers/BiliVideoController.java index 10ecddb..9219f75 100644 --- a/src/main/java/com/yutou/bilibili/BiliBili/Controllers/BiliVideoController.java +++ b/src/main/java/com/yutou/bilibili/BiliBili/Controllers/BiliVideoController.java @@ -7,10 +7,7 @@ import com.yutou.bilibili.BiliBili.Services.IBiliBiliLiveService; import com.yutou.bilibili.BiliBili.Tools.BiliTools; import com.yutou.bilibili.Services.ISystemConfigService; import com.yutou.bilibili.Services.IUserService; -import com.yutou.bilibili.Tools.AppTools; -import com.yutou.bilibili.Tools.Config; -import com.yutou.bilibili.Tools.FFmpegUtils; -import com.yutou.bilibili.Tools.ServiceTools; +import com.yutou.bilibili.Tools.*; import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliUpInfo; import com.yutou.bilibili.mybatis.model.UUser; import org.springframework.core.io.FileSystemResource; @@ -51,7 +48,7 @@ public class BiliVideoController { return json; } if (ServiceTools.getInstance().auth(request, user.getUser(), "/bili/video/get/")) { - File file = new File("live"); + File file = new File(ConfigTools.load(ConfigTools.CONFIG,"liveSavePath",String.class)+File.separator+"live"); if (!file.exists() || Objects.requireNonNull(file.listFiles()).length == 0) { json.put("code", 0); json.put("msg", "文件夹为空"); @@ -109,8 +106,9 @@ public class BiliVideoController { public ResponseEntity download(String fileName) { String time = fileName.split(" ")[0].substring(1); File file = new File("ffmpeg_out" + File.separator + time + File.separator + fileName); - if (!file.exists()) - file = new File("live" + File.separator + time + File.separator + fileName); + if (!file.exists()) { + file = new File(ConfigTools.load(ConfigTools.CONFIG,"liveSavePath",String.class)+File.separator+"live" + File.separator + time + File.separator + fileName); + } com.yutou.bilibili.Tools.Log.i(file.getAbsolutePath()); return AppTools.getFile(file); } diff --git a/src/main/java/com/yutou/bilibili/QQBot/QQBotManager.java b/src/main/java/com/yutou/bilibili/QQBot/QQBotManager.java index fb73a68..3a22dd1 100644 --- a/src/main/java/com/yutou/bilibili/QQBot/QQBotManager.java +++ b/src/main/java/com/yutou/bilibili/QQBot/QQBotManager.java @@ -23,6 +23,7 @@ import org.springframework.context.ApplicationContextAware; import javax.annotation.Resource; import java.io.File; +import java.io.IOException; import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -136,7 +137,15 @@ public class QQBotManager implements ApplicationContextAware { private Image getImage(File file) { if (bot != null) { - return Objects.requireNonNull(bot.getGroup(qqGroup)).uploadImage(ExternalResource.create(file)); + ExternalResource resource=ExternalResource.create(file); + Image image; + image= Objects.requireNonNull(bot.getGroup(qqGroup)).uploadImage(resource); + try { + resource.close(); + } catch (IOException e) { + e.printStackTrace(); + } + return image; } return null; }