JavaWeb/biliob
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复QQ发送图片的问题

Browse Source 
修复录制文件夹无法读取的问题
This commit is contained in:
Yutousama 2022-04-11 12:41:07 +08:00
parent d59e806630
commit 5c7b864259
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/yutou/bilibili/BiliBili/Controllers/BiliVideoController.java
View File

@ -7,10 +7,7 @@ import com.yutou.bilibili.BiliBili.Services.IBiliBiliLiveService;
import com.yutou.bilibili.BiliBili.Tools.BiliTools; import com.yutou.bilibili.BiliBili.Tools.BiliTools;
import com.yutou.bilibili.Services.ISystemConfigService; import com.yutou.bilibili.Services.ISystemConfigService;
import com.yutou.bilibili.Services.IUserService; import com.yutou.bilibili.Services.IUserService;
import com.yutou.bilibili.Tools.AppTools; import com.yutou.bilibili.Tools.*;
import com.yutou.bilibili.Tools.Config;
import com.yutou.bilibili.Tools.FFmpegUtils;
import com.yutou.bilibili.Tools.ServiceTools;
import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliUpInfo; import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliUpInfo;
import com.yutou.bilibili.mybatis.model.UUser; import com.yutou.bilibili.mybatis.model.UUser;
import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.FileSystemResource;
@ -51,7 +48,7 @@ public class BiliVideoController {
return json; return json;
} }
if (ServiceTools.getInstance().auth(request, user.getUser(), "/bili/video/get/")) { 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) { if (!file.exists() || Objects.requireNonNull(file.listFiles()).length == 0) {
json.put("code", 0); json.put("code", 0);
json.put("msg", "文件夹为空"); json.put("msg", "文件夹为空");
@ -109,8 +106,9 @@ public class BiliVideoController {
public ResponseEntity<FileSystemResource> download(String fileName) { public ResponseEntity<FileSystemResource> download(String fileName) {
String time = fileName.split(" ")[0].substring(1); String time = fileName.split(" ")[0].substring(1);
File file = new File("ffmpeg_out" + File.separator + time + File.separator + fileName); File file = new File("ffmpeg_out" + File.separator + time + File.separator + fileName);
if (!file.exists()) if (!file.exists()) {
file = new File("live" + File.separator + time + File.separator + fileName); 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()); com.yutou.bilibili.Tools.Log.i(file.getAbsolutePath());
return AppTools.getFile(file); return AppTools.getFile(file);
} }

11
src/main/java/com/yutou/bilibili/QQBot/QQBotManager.java
View File

@ -23,6 +23,7 @@ import org.springframework.context.ApplicationContextAware;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -136,7 +137,15 @@ public class QQBotManager implements ApplicationContextAware {
private Image getImage(File file) { private Image getImage(File file) {
if (bot != null) { 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; return null;
} }