diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00134f7..8b2a018 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,7 +64,7 @@
------
## [V 1.0.10] - 2023.7.31
- 🐞Bug:**#00005** 删除config文件无法修复
-- ⛏修复:**#00005** 将ModuleSrcConfigInitMachine移除插件范围，不作为File模块的插件启动，将ModuleSrcConfigInitMachine提前到WorldInit前启动。详情请看 https://github.com/969025903/ChopperBot/issues/5
+- ⛏修复:**#00005** 将ModuleSrcConfigInitMachine移除插件范围，不作为File模块的插件启动，将ModuleSrcConfigInitMachine提前到WorldInit前启动。详情请看 https://github.com/Geniusay/ChopperBot/issues/5
------
## [V 1.0.9] - 2023.7.30
**💥GREAT CHANGE：**
diff --git a/README.md b/README.md
index 2bdee7e..189f3c1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-
+
@@ -13,19 +13,19 @@
-
+
-
+
-
- 
+
+ 
@@ -34,7 +34,7 @@
- English | 简体中文
+ English | 简体中文
@@ -56,22 +56,22 @@
- **Visualization**: Provide a visual management interface to make your user experience more convenient。
# ⚙ Architecture
-
+
# 🎥 Preview
## Plugin Center
-
+
## Task Center
-
-
+
+
## Creeper Library
-
+
## Hot Guard
-
+
## Heat Recommend
-
+
## Hot Live
-
+
**More pages in development....**
# 🕹 ChopperBot Module
@@ -92,18 +92,18 @@
# 🔗 Links
-👉 [Document](https://969025903.github.io/ChopperBot-Doc/)
+👉 [Document](https://Geniusay.github.io/ChopperBot-Doc/)
-👉 [Developer's Guide](https://969025903.github.io/ChopperBot-Doc/pages/779a67/#chopperbot%E7%B3%BB%E7%BB%9F%E6%9E%B6%E6%9E%84)
+👉 [Developer's Guide](https://Geniusay.github.io/ChopperBot-Doc/pages/779a67/#chopperbot%E7%B3%BB%E7%BB%9F%E6%9E%B6%E6%9E%84)
-👉 [CHANGE LOG](https://github.com/969025903/ChopperBot/blob/master/CHANGELOG.md)
+👉 [CHANGE LOG](https://github.com/Geniusay/ChopperBot/blob/master/CHANGELOG.md)
# 💬Contact Us
-- Email: 969025903@qq.com | geniusssbg@gmail.com
+- Email: Geniusay@qq.com | geniusssbg@gmail.com
- QQ
-
+
- Wechat
-
+
diff --git a/README.zh-CN.md b/README.zh-CN.md
index b974cf4..075808e 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -1,6 +1,6 @@
-
+
@@ -10,19 +10,19 @@
-
+
-
+
-
-
+
+
@@ -31,7 +31,7 @@
- 简体中文 | English
+ 简体中文 | English
@@ -53,22 +53,22 @@
- **可视化管理**: 提供可视化管理界面，让您的使用体验更方便。
# ⚙ 系统架构
-
+
# 🎥 项目预览
## 插件中心
-
+
## 爬虫任务中心
-
-
+
+
## 爬虫仓库
-
+
## 平台热门监控
-
+
## 热门直播推荐
-
+
## 多平台热门直播
-
+
**更多页面正在开发中....**
# 🕹 ChopperBot模块介绍
@@ -88,18 +88,18 @@
# 📈 项目动态
# 🔗 相关链接
-👉 [项目文档](https://969025903.github.io/ChopperBot-Doc/)
+👉 [项目文档](https://Geniusay.github.io/ChopperBot-Doc/)
-👉 [项目开发指南](https://969025903.github.io/ChopperBot-Doc/pages/779a67/#chopperbot%E7%B3%BB%E7%BB%9F%E6%9E%B6%E6%9E%84)
+👉 [项目开发指南](https://Geniusay.github.io/ChopperBot-Doc/pages/779a67/#chopperbot%E7%B3%BB%E7%BB%9F%E6%9E%B6%E6%9E%84)
-👉 [更新日志](https://github.com/969025903/ChopperBot/blob/master/CHANGELOG.md)
+👉 [更新日志](https://github.com/Geniusay/ChopperBot/blob/master/CHANGELOG.md)
# 💬联系我们
-- Email: 969025903@qq.com | geniusssbg@gmail.com
+- Email: Geniusay@qq.com | geniusssbg@gmail.com
- QQ
-
+
- Wechat
-
+
diff --git a/chopperbot-account/src/main/java/org/example/api/LabelManagerPluginApi.java b/chopperbot-account/src/main/java/org/example/api/LabelManagerPluginApi.java
new file mode 100644
index 0000000..0b5484b
--- /dev/null
+++ b/chopperbot-account/src/main/java/org/example/api/LabelManagerPluginApi.java
@@ -0,0 +1,44 @@
+package org.example.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.example.core.label.LabelManagerPlugin;
+import org.example.pojo.VideoLabel;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Genius
+ * @date 2023/10/23 17:22
+ **/
+@Component
+public class LabelManagerPluginApi {
+ @Resource
+ LabelManagerPlugin plugin;
+
+ public List labelList(){
+ return plugin.getMapper().selectList(new QueryWrapper<>());
+ }
+
+ public VideoLabel addLabel(VideoLabel label){
+ try {
+ label.setLabelId(UUID.randomUUID().toString());
+ if (plugin.getMapper().insert(label)>0) {
+ return label;
+ }
+ }catch (Exception e){
+ }
+ return null;
+ }
+
+ public boolean deleteLabel(String label){
+ return plugin.getMapper().deleteByMap(Map.of("label",label))>0;
+ }
+
+ public boolean updateLabel(VideoLabel label){
+ return plugin.getMapper().update(label,new QueryWrapper().eq("label_id",label.getLabelId()))>0;
+ }
+}
diff --git a/chopperbot-account/src/main/java/org/example/api/OpenAPIPluginApi.java b/chopperbot-account/src/main/java/org/example/api/OpenAPIPluginApi.java
index 9136e15..b1175dd 100644
--- a/chopperbot-account/src/main/java/org/example/api/OpenAPIPluginApi.java
+++ b/chopperbot-account/src/main/java/org/example/api/OpenAPIPluginApi.java
@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* @Date 2023/10/12
@@ -22,6 +23,9 @@ public class OpenAPIPluginApi {
return plugin.getMapper().update(newKey, new QueryWrapper().eq("function", newKey.getFunction())) == 1;
}
+ public boolean deleteKey(String function){
+ return plugin.getMapper().deleteByMap(Map.of("function",function))==1;
+ }
public boolean addKey(GPTKey key){
return plugin.getMapper().insert(key)==1;
}
diff --git a/chopperbot-account/src/main/java/org/example/core/gpt/ChatGPTMsgBuilder.java b/chopperbot-account/src/main/java/org/example/core/gpt/ChatGPTMsgBuilder.java
index 85cbe77..d455c19 100644
--- a/chopperbot-account/src/main/java/org/example/core/gpt/ChatGPTMsgBuilder.java
+++ b/chopperbot-account/src/main/java/org/example/core/gpt/ChatGPTMsgBuilder.java
@@ -35,6 +35,7 @@ public class ChatGPTMsgBuilder extends AbstractMsgBuilder {
@Override
public String done() {
+ build("temperature",1);
this.map.put("messages", List.of(system,user));
return super.done();
}
diff --git a/chopperbot-account/src/main/java/org/example/core/gpt/OpenAPIPlugin.java b/chopperbot-account/src/main/java/org/example/core/gpt/OpenAPIPlugin.java
index 2659840..1ebb42d 100644
--- a/chopperbot-account/src/main/java/org/example/core/gpt/OpenAPIPlugin.java
+++ b/chopperbot-account/src/main/java/org/example/core/gpt/OpenAPIPlugin.java
@@ -10,12 +10,12 @@ import org.example.mapper.GPTKeyMapper;
import org.example.plugin.SpringBootPlugin;
import org.example.pojo.GPTKey;
import org.example.sql.annotation.SQLInit;
+import org.example.util.ExceptionUtil;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -68,22 +68,20 @@ public class OpenAPIPlugin extends SpringBootPlugin {
try (Response response = client.newCall(request).execute()){
if (response.body() != null) {
String content = response.body().string();
+ if(content.contains("error")){
+ this.error("OpenAI API 调用错误!",String.format("OpenAI API 调用错误，原因：%s", content),true);
+ }
return JSONObject.parseObject(content);
}
} catch (IOException e) {
- this.error(String.format("Error: api request fail,Cause:%s", e.getCause()));
+ this.error(String.format("Error: api request fail,Cause:%s", ExceptionUtil.getCause(e)));
}
return null;
}
public String getCommonRes(JSONObject resp){
- Pattern pattern = Pattern.compile("\\[(.*?)]");
-
- Matcher matcher = pattern.matcher(resp.getJSONArray("choices").getJSONObject(0).getJSONObject("message").getString("content"));
-
- if (matcher.find()) return matcher.group(1);
- return "";
+ return resp.getJSONArray("choices").getJSONObject(0).getJSONObject("message").getString("content");
}
private RequestBody buildBody(String msg){
@@ -115,6 +113,17 @@ public class OpenAPIPlugin extends SpringBootPlugin {
return Arrays.stream(APIFunc.values()).map(APIFunc::funcName).collect(Collectors.toList());
}
+ public static List zipContent(List contents){
+ Set zipContent = new TreeSet<>(contents);
+ return new ArrayList<>(zipContent);
+ }
+
+ public static String zipContent(String contents){
+ if(contents.length()>3000){
+ return contents.substring(0,3000);
+ }
+ return contents;
+ }
@Override
@SQLInit(table = "gpt_key",tableSQL = "CREATE TABLE \"gpt_key\" (\n" +
"\t\"key\"\tTEXT NOT NULL,\n" +
@@ -123,6 +132,6 @@ public class OpenAPIPlugin extends SpringBootPlugin {
"\t\"function\"\tTEXT NOT NULL DEFAULT 'chatgpt' UNIQUE\n" +
")",mapper = GPTKeyMapper.class)
public List sqlInit() {
- return List.of(new GPTKey("sk-xgUDtOdRgQLigz2D0e4cA665441e4287AfCf8458B1C21b0f","https://oneapi.a9.gay/v1/chat/completions","gpt-3.5-turbo",APIFunc.CHAT_GPT.funcName()));
+ return List.of(new GPTKey("sk-xgUDtOdRgQLigz2D0e4cA665441e4287AfCf8458B1C21b0f","https://oneapi.a9.gay/v1/chat/completions","gpt-4",APIFunc.CHAT_GPT.funcName()));
}
}
diff --git a/chopperbot-account/src/main/java/org/example/core/label/LabelManagerPlugin.java b/chopperbot-account/src/main/java/org/example/core/label/LabelManagerPlugin.java
index 6ccdd6e..80088ce 100644
--- a/chopperbot-account/src/main/java/org/example/core/label/LabelManagerPlugin.java
+++ b/chopperbot-account/src/main/java/org/example/core/label/LabelManagerPlugin.java
@@ -1,6 +1,7 @@
package org.example.core.label;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Data;
import org.example.mapper.LabelMapper;
import org.example.plugin.SpringBootPlugin;
import org.example.pojo.VideoLabel;
@@ -11,6 +12,7 @@ import javax.annotation.Resource;
import java.awt.*;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -18,6 +20,7 @@ import java.util.stream.Collectors;
* @date 2023/10/23 00:10
**/
@Component
+@Data
public class LabelManagerPlugin extends SpringBootPlugin {
@Resource
@@ -31,32 +34,19 @@ public class LabelManagerPlugin extends SpringBootPlugin {
@Override
@SQLInit(table = "video_label",tableSQL = "CREATE TABLE \"video_label\" (\n" +
"\t\"id\"\tINTEGER NOT NULL,\n" +
+ "\t\"label_id\"\tTEXT NOT NULL UNIQUE,\n" +
"\t\"label\"\tTEXT NOT NULL UNIQUE,\n" +
"\tPRIMARY KEY(\"id\" AUTOINCREMENT)\n" +
")",mapper = LabelMapper.class)
public List sqlInit() {
- return List.of(new VideoLabel(null,"搞笑"),
- new VideoLabel(null,"破防"),new VideoLabel(null,"泪目"),
- new VideoLabel(null,"精彩操作"));
+ return List.of(new VideoLabel(null, UUID.randomUUID().toString(),"搞笑"),
+ new VideoLabel(null, UUID.randomUUID().toString(),"破防"),
+ new VideoLabel(null, UUID.randomUUID().toString(),"泪目"),
+ new VideoLabel(null, UUID.randomUUID().toString(),"精彩操作"));
}
public List labelStrList(){
return mapper.selectList(new QueryWrapper<>()).stream().map(VideoLabel::getLabel).collect(Collectors.toList());
}
- public List labelList(){
- return mapper.selectList(new QueryWrapper<>());
- }
-
- public boolean addLabel(VideoLabel label){
- return mapper.insert(label)>0;
- }
-
- public boolean deleteLabel(String label){
- return mapper.deleteByMap(Map.of("label",label))>0;
- }
-
- public boolean updateLabel(VideoLabel label){
- return mapper.update(label,new QueryWrapper().eq("id",label.getId()))>0;
- }
}
diff --git a/chopperbot-account/src/main/java/org/example/pojo/VideoLabel.java b/chopperbot-account/src/main/java/org/example/pojo/VideoLabel.java
index 9142e96..fca4f6e 100644
--- a/chopperbot-account/src/main/java/org/example/pojo/VideoLabel.java
+++ b/chopperbot-account/src/main/java/org/example/pojo/VideoLabel.java
@@ -15,5 +15,6 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class VideoLabel {
private Integer id;
+ private String labelId;
private String label;
}
diff --git a/chopperbot-barrage/src/main/java/org/example/core/LiveAndBarrageHandlerObserver.java b/chopperbot-barrage/src/main/java/org/example/core/LiveAndBarrageHandlerObserver.java
index 1d76dd1..650ed1b 100644
--- a/chopperbot-barrage/src/main/java/org/example/core/LiveAndBarrageHandlerObserver.java
+++ b/chopperbot-barrage/src/main/java/org/example/core/LiveAndBarrageHandlerObserver.java
@@ -52,20 +52,6 @@ public class LiveAndBarrageHandlerObserver extends AbstractTaskCenterObserver {
((BarrageEventCenter)plugin).event(event);
}
},PluginName.BARRAGE_EVENT_PLUGIN);
- } else{
- PluginCheckAndDo.CheckAndDo(plugin -> {
- Object param = task.getRequest().getParam();
-
- if(param instanceof Live){
- SectionRequest request = ((VideoSectionWorkShop)plugin).wrapperReq((Live)param,task.getLoadConfig().getSuffix()
- ,"online",
- task.getLoadConfig().getStartTime(),
- 0,TimeUtil.getTimeNaos(task.getEndTime())
- );
- ((VideoSectionWorkShop)plugin).request(request);
- }
-
- },PluginName.VIDEO_SECTION_WORK_SHOP);
}
}
diff --git a/chopperbot-barrage/src/main/java/org/example/core/bgevnet/BarrageEventCenter.java b/chopperbot-barrage/src/main/java/org/example/core/bgevnet/BarrageEventCenter.java
index 6643d3f..aac6707 100644
--- a/chopperbot-barrage/src/main/java/org/example/core/bgevnet/BarrageEventCenter.java
+++ b/chopperbot-barrage/src/main/java/org/example/core/bgevnet/BarrageEventCenter.java
@@ -93,11 +93,14 @@ public class BarrageEventCenter extends SpringBootPlugin {
String fileName = event.getFileName().split("\\.")[0]+suffix;
String date = event.getDate();
SectionRequest request = new SectionRequest(fileName, action, popularRange.getStartTime(), popularRange.getEndTime(), liver, platform,date);
+ for (BarragePoint point : popularRange.getList()) {
+ List barrages = point.getBarrages();
+ request.getBarrages().addAll(barrages);
+ }
((VideoSectionWorkShop)plugin).request(request);
}
},PluginName.VIDEO_SECTION_WORK_SHOP);
}
- //TODO 弹幕标签插件
}
}
diff --git a/chopperbot-common/src/main/java/org/example/aop/PluginAspect.java b/chopperbot-common/src/main/java/org/example/aop/PluginAspect.java
index af57ea4..77e789d 100644
--- a/chopperbot-common/src/main/java/org/example/aop/PluginAspect.java
+++ b/chopperbot-common/src/main/java/org/example/aop/PluginAspect.java
@@ -35,7 +35,7 @@ public class PluginAspect {
for (String plugin : annotation.needPlugin()) {
if(!InitPluginRegister.isRegister(plugin)){
- throw new PluginNotRegisterException();
+ throw new PluginNotRegisterException(annotation.needPlugin());
}
}
}
diff --git a/chopperbot-common/src/main/java/org/example/bean/section/PackageSection.java b/chopperbot-common/src/main/java/org/example/bean/section/PackageSection.java
new file mode 100644
index 0000000..6fada73
--- /dev/null
+++ b/chopperbot-common/src/main/java/org/example/bean/section/PackageSection.java
@@ -0,0 +1,22 @@
+package org.example.bean.section;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 17:59
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PackageSection extends VideoSection{
+ private String title;
+ private String description;
+ private String coverPath;
+ private String content;
+ private List labels;
+}
diff --git a/chopperbot-section/src/main/java/org/example/core/section/VideoSection.java b/chopperbot-common/src/main/java/org/example/bean/section/VideoSection.java
similarity index 60%
rename from chopperbot-section/src/main/java/org/example/core/section/VideoSection.java
rename to chopperbot-common/src/main/java/org/example/bean/section/VideoSection.java
index d112e83..3410e8f 100644
--- a/chopperbot-section/src/main/java/org/example/core/section/VideoSection.java
+++ b/chopperbot-common/src/main/java/org/example/bean/section/VideoSection.java
@@ -1,9 +1,16 @@
-package org.example.core.section;
+package org.example.bean.section;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
import org.example.bean.Barrage;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
@@ -13,12 +20,16 @@ import java.util.List;
**/
@Data
@TableName("section_parking")
+@NoArgsConstructor
+@AllArgsConstructor
public class VideoSection {
private String videoPath;
private String tag;
private String liver;
- private List barrages;
+ private String barrageFile;
+ @TableField(exist = false)
+ private List barrages;
private String platform;
public VideoSection(String videoPath, String tag, String liver, String platform) {
diff --git a/chopperbot-common/src/main/java/org/example/constpool/PluginName.java b/chopperbot-common/src/main/java/org/example/constpool/PluginName.java
index 19031c9..025b7e7 100644
--- a/chopperbot-common/src/main/java/org/example/constpool/PluginName.java
+++ b/chopperbot-common/src/main/java/org/example/constpool/PluginName.java
@@ -45,8 +45,6 @@ public class PluginName {
public static final String CHAT_GPT = "OpenAPI";
- public static final String EMOTION_ANALYSIS = "EmotionAnalysis";
-
public static final String ACCOUNT_MANAGER = "AccountManager";
public static final String LABEL_MANAGER = "LabelManager";
@@ -56,4 +54,9 @@ public class PluginName {
public static final String LIVE_MANAGER_PLUGIN= "LiveDownLoadManager";
public static final String VIDEO_SECTION_WORK_SHOP = "SectionWorkShop";
+
+ public static final String EMOTION_ANALYSIS = "EmotionAnalysis";
+
+ public static final String TITLE_GENERATE = "TitleGenerate";
+ public static final String DESC_GENERATE = "DescriptionGenerate";
}
diff --git a/chopperbot-common/src/main/java/org/example/exception/plugin/PluginNotRegisterException.java b/chopperbot-common/src/main/java/org/example/exception/plugin/PluginNotRegisterException.java
index f36f9d9..5e80fa2 100644
--- a/chopperbot-common/src/main/java/org/example/exception/plugin/PluginNotRegisterException.java
+++ b/chopperbot-common/src/main/java/org/example/exception/plugin/PluginNotRegisterException.java
@@ -2,14 +2,24 @@ package org.example.exception.plugin;
import org.example.exception.Impl.ResultCode;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
/**
* @author Genius
* @date 2023/08/02 16:59
**/
public class PluginNotRegisterException extends PluginException{
+ private String pluginName[];
public PluginNotRegisterException() {
super("Error! Plugin Not Register!");
resultCode = ResultCode.PLUGIN_NOT_REGISTER;
}
+
+ public PluginNotRegisterException(String...pluginName) {
+ super(String.format("Error! %s Plugin Not Register!",Arrays.stream(pluginName).collect(Collectors.toList()).toString()));
+ resultCode = ResultCode.PLUGIN_NOT_REGISTER;
+ this.pluginName = pluginName;
+ }
}
diff --git a/chopperbot-common/src/main/java/org/example/http/OkHttpAgent.java b/chopperbot-common/src/main/java/org/example/http/OkHttpAgent.java
index 42569eb..f8f1a6d 100644
--- a/chopperbot-common/src/main/java/org/example/http/OkHttpAgent.java
+++ b/chopperbot-common/src/main/java/org/example/http/OkHttpAgent.java
@@ -19,11 +19,16 @@ public class OkHttpAgent implements ProxyAgent{
@Override
public OkHttpClient agentClient() {
+ OkHttpClient.Builder builder;
if(httpProxy.isEnable()){
Proxy proxy = httpProxy.httpProxy();
- return new OkHttpClient.Builder().proxy(proxy).connectTimeout(60, TimeUnit.SECONDS).build();
+ builder = new OkHttpClient.Builder().proxy(proxy);
}else{
- return new OkHttpClient.Builder().build();
+ builder = new OkHttpClient.Builder();
}
+ return builder.connectTimeout(120,TimeUnit.SECONDS)
+ .readTimeout(60,TimeUnit.SECONDS)
+ .writeTimeout(60,TimeUnit.SECONDS)
+ .build();
}
}
diff --git a/chopperbot-common/src/main/java/org/example/util/ClassUtil.java b/chopperbot-common/src/main/java/org/example/util/ClassUtil.java
index d328de7..008a7a0 100644
--- a/chopperbot-common/src/main/java/org/example/util/ClassUtil.java
+++ b/chopperbot-common/src/main/java/org/example/util/ClassUtil.java
@@ -1,12 +1,12 @@
package org.example.util;
+import org.example.bean.section.VideoSection;
import org.reflections.Reflections;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.lang.reflect.Field;
+import java.util.*;
/**
* @author Genius
@@ -71,4 +71,55 @@ public class ClassUtil {
// return List.of(objects);
return set;
}
+
+ public static Map toMap(Object obj) throws IllegalAccessException {
+ Map map = new HashMap<>();
+ Class clazz = obj.getClass();
+
+ for (Field field : clazz.getDeclaredFields()) {
+ field.setAccessible(true);
+ map.put(field.getName(), field.get(obj));
+ }
+
+ return map;
+ }
+
+ public static Map toDeepMap(Object obj) throws IllegalAccessException {
+ Map map = new HashMap<>();
+ Class clazz = obj.getClass();
+
+ // 获取当前类的字段
+ for (Field field : clazz.getDeclaredFields()) {
+ field.setAccessible(true);
+ map.put(field.getName(), field.get(obj));
+ }
+
+ // 如果有父类且不是 Object 类，递归调用获取父类的字段
+ Class superClass = clazz.getSuperclass();
+ if (superClass != null && !superClass.equals(Object.class)) {
+ try {
+ Object superObj = superClass.getDeclaredConstructor().newInstance();
+ copyFields(superObj, obj, superClass);
+ map.putAll(toDeepMap(superObj));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ return map;
+ }
+
+ private static void copyFields(Object dest, Object source, Class clazz) throws IllegalAccessException {
+ for (Field field : clazz.getDeclaredFields()) {
+ field.setAccessible(true);
+ Field destField;
+ try {
+ destField = dest.getClass().getDeclaredField(field.getName());
+ destField.setAccessible(true);
+ destField.set(dest, field.get(source));
+ } catch (NoSuchFieldException e) {
+ // 忽略字段不存在的异常
+ }
+ }
+ }
}
diff --git a/chopperbot-common/src/main/java/org/example/util/MapUtil.java b/chopperbot-common/src/main/java/org/example/util/MapUtil.java
new file mode 100644
index 0000000..2a650e9
--- /dev/null
+++ b/chopperbot-common/src/main/java/org/example/util/MapUtil.java
@@ -0,0 +1,14 @@
+package org.example.util;
+
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 18:44
+ **/
+public class MapUtil {
+ public static String getString(Map map, String key){
+ return Optional.ofNullable(map.get(key)).orElse("").toString();
+ }
+}
diff --git a/chopperbot-common/src/main/java/org/example/util/StringUtil.java b/chopperbot-common/src/main/java/org/example/util/StringUtil.java
new file mode 100644
index 0000000..f2222c6
--- /dev/null
+++ b/chopperbot-common/src/main/java/org/example/util/StringUtil.java
@@ -0,0 +1,14 @@
+package org.example.util;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 21:31
+ **/
+public class StringUtil {
+ public static String lowerCaseFirstLetter(String input){
+ if (input == null || input.isEmpty()) {
+ return input;
+ }
+ return Character.toLowerCase(input.charAt(0)) + input.substring(1);
+ }
+}
diff --git a/chopperbot-console/src/main/java/org/example/controller/AccountController.java b/chopperbot-console/src/main/java/org/example/controller/AccountController.java
index e214af1..6238ddd 100644
--- a/chopperbot-console/src/main/java/org/example/controller/AccountController.java
+++ b/chopperbot-console/src/main/java/org/example/controller/AccountController.java
@@ -1,9 +1,11 @@
package org.example.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.example.pojo.Account;
import org.example.pojo.AccountVO;
import org.example.pojo.GPTKey;
+import org.example.pojo.VideoLabel;
import org.example.service.AccountService;
import org.example.util.Result;
import org.springframework.web.bind.annotation.*;
@@ -47,11 +49,16 @@ public class AccountController {
return Result.success();
}
- @GetMapping(value = "/gpt/key")
+ @GetMapping(value = "/gpt/keys")
public Result getGPT(){
return Result.success(Map.of("list",accountService.chatGptPlugin().getKeys()));
}
+ @GetMapping(value = "/gpt/delete")
+ public Result deleteGPT(@RequestParam String function){
+ return Result.success(Map.of("success",accountService.chatGptPlugin().deleteKey(function)));
+ }
+
@PostMapping(value = "/gpt/add")
public Result addGPT(@RequestBody GPTKey key){
boolean b = accountService.chatGptPlugin().addKey(key);
@@ -63,4 +70,32 @@ public class AccountController {
boolean b = accountService.chatGptPlugin().changeKey(key);
return Result.success(Map.of("success",b));
}
+
+ @GetMapping(value = "/gpt/functions")
+ public Result getFunctions(){
+ return Result.success(Map.of("list",accountService.chatGptPlugin().functions()));
+ }
+
+ @GetMapping(value = "/label/list")
+ public Result labelList(){
+ return Result.success(Map.of("list",accountService.labelManagerPlugin().labelList()));
+ }
+
+ @PostMapping(value = "/label/add")
+ public Result addLabel(@RequestBody VideoLabel label){
+ if (accountService.labelManagerPlugin().addLabel(label)==null) {
+ return Result.error("添加失败");
+ }
+ return Result.success(Map.of("data",label));
+ }
+
+ @GetMapping(value = "/label/delete")
+ public Result deleteLabel(@RequestParam String label){
+ return Result.success(Map.of("success",accountService.labelManagerPlugin().deleteLabel(label)));
+ }
+
+ @PostMapping(value = "/label/update")
+ public Result updateLabel(@RequestBody VideoLabel label){
+ return Result.success(Map.of("success",accountService.labelManagerPlugin().updateLabel(label)));
+ }
}
diff --git a/chopperbot-console/src/main/java/org/example/exception/GlobalExceptionHandler.java b/chopperbot-console/src/main/java/org/example/exception/GlobalExceptionHandler.java
index 7dd8870..00e466a 100644
--- a/chopperbot-console/src/main/java/org/example/exception/GlobalExceptionHandler.java
+++ b/chopperbot-console/src/main/java/org/example/exception/GlobalExceptionHandler.java
@@ -7,6 +7,7 @@ import org.example.exception.plugin.PluginException;
import org.example.exception.plugin.PluginNotRegisterException;
import org.example.log.ChopperLogFactory;
import org.example.log.LoggerType;
+import org.example.util.ExceptionUtil;
import org.example.util.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,10 +33,10 @@ public class GlobalExceptionHandler {
@ExceptionHandler(PluginException.class)
public Result handlerPluginException(HttpServletRequest request,PluginException ex){
- logger.error("Handle Exception Request Url:{},Exception:{}", request.getRequestURL(), ex);
+ logger.error("Handle Exception Request Url:{},Exception:{}", request.getRequestURL(), ExceptionUtil.getCause(ex));
if(ex instanceof PluginNotRegisterException){
PluginNotRegisterException exception = (PluginNotRegisterException) ex;
- return Result.error(exception.getResultCode());
+ return Result.error(exception.getResultCode(),ExceptionUtil.getCause(ex));
}else if(ex instanceof PluginDependOnException){
PluginDependOnException exception = (PluginDependOnException) ex;
String msg = "[%s] plugin depend on [%s]!";
diff --git a/chopperbot-console/src/main/java/org/example/init/WorldInitMachine.java b/chopperbot-console/src/main/java/org/example/init/WorldInitMachine.java
index 66229d0..9e563ce 100644
--- a/chopperbot-console/src/main/java/org/example/init/WorldInitMachine.java
+++ b/chopperbot-console/src/main/java/org/example/init/WorldInitMachine.java
@@ -20,7 +20,7 @@ import java.util.function.Supplier;
@Component
public class WorldInitMachine extends ModuleInitMachine{
- private static final String githubUrl = "https://github.com/969025903/ChopperBot";
+ private static final String githubUrl = "https://github.com/Geniusay/ChopperBot";
public WorldInitMachine() throws Exception {
super("ChopperBot",ChopperLogFactory.getLogger(LoggerType.System));
diff --git a/chopperbot-console/src/main/java/org/example/service/AccountService.java b/chopperbot-console/src/main/java/org/example/service/AccountService.java
index 4ea0e82..14487ed 100644
--- a/chopperbot-console/src/main/java/org/example/service/AccountService.java
+++ b/chopperbot-console/src/main/java/org/example/service/AccountService.java
@@ -3,6 +3,7 @@ package org.example.service;
import org.example.api.AccountApi;
+import org.example.api.LabelManagerPluginApi;
import org.example.api.OpenAPIPluginApi;
/**
@@ -15,4 +16,6 @@ public interface AccountService {
AccountApi accountPlugin();
OpenAPIPluginApi chatGptPlugin();
+
+ LabelManagerPluginApi labelManagerPlugin();
}
diff --git a/chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java b/chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java
index b9ce879..0056fac 100644
--- a/chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java
+++ b/chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java
@@ -2,6 +2,7 @@ package org.example.service.impl;
import org.example.api.AccountApi;
+import org.example.api.LabelManagerPluginApi;
import org.example.api.OpenAPIPluginApi;
import org.example.service.AccountService;
@@ -22,6 +23,9 @@ public class AccountServiceImpl implements AccountService {
@Resource
OpenAPIPluginApi openAPIPluginApi;
+ @Resource
+ LabelManagerPluginApi labelManagerPluginApi;
+
@Override
public AccountApi accountPlugin() {
return accountApi;
@@ -31,4 +35,9 @@ public class AccountServiceImpl implements AccountService {
public OpenAPIPluginApi chatGptPlugin() {
return openAPIPluginApi;
}
+
+ @Override
+ public LabelManagerPluginApi labelManagerPlugin() {
+ return labelManagerPluginApi;
+ }
}
diff --git a/chopperbot-hot/src/main/java/org/example/core/creeper/builder/HuyaLiverCheckerBuilder.java b/chopperbot-hot/src/main/java/org/example/core/creeper/builder/HuyaLiverCheckerBuilder.java
index 04f0916..9277861 100644
--- a/chopperbot-hot/src/main/java/org/example/core/creeper/builder/HuyaLiverCheckerBuilder.java
+++ b/chopperbot-hot/src/main/java/org/example/core/creeper/builder/HuyaLiverCheckerBuilder.java
@@ -12,12 +12,12 @@ import org.springframework.stereotype.Component;
* @author Genius
* @date 2023/10/16 23:06
**/
-@Component
+@Component
public class HuyaLiverCheckerBuilder extends CommonLoadConfigBuilder {
@Override
public HuyaLiverCheckerConfig build(Object obj) {
if(obj instanceof FocusLiver){
- return new HuyaLiverCheckerConfig(((HuyaLive) obj).getLiveId());
+ return new HuyaLiverCheckerConfig(((FocusLiver) obj).getRoomId());
}else if(obj instanceof HuyaLive){
return new HuyaLiverCheckerConfig(((HuyaLive) obj).getLiveId());
}
diff --git a/chopperbot-hot/src/main/java/org/example/service/impl/FocusLiverServiceImpl.java b/chopperbot-hot/src/main/java/org/example/service/impl/FocusLiverServiceImpl.java
index a9f6be5..1a203d4 100644
--- a/chopperbot-hot/src/main/java/org/example/service/impl/FocusLiverServiceImpl.java
+++ b/chopperbot-hot/src/main/java/org/example/service/impl/FocusLiverServiceImpl.java
@@ -37,6 +37,7 @@ public class FocusLiverServiceImpl extends ServiceImpl> extends SpringBootPlugin implements SectionPipeline{
+ @Resource
+ protected Map generatorMap;
+
+ private G generator;
+
+ protected String type;
+
+ @Override
+ public boolean init() {
+ if(!StringUtils.hasText(type)){
+ generatorMap.forEach((k,v)->{
+ this.type = k;
+ this.generator = v;
+ });
+ }else{
+ this.generator = generatorMap.get(type);
+ }
+ if(generator==null){
+ throw new RuntimeException("Invalid generator type");
+ }
+ generator.sqlInit();
+ return super.init();
+ }
+
+ @Override
+ public T process(V section) {
+ generator.preGenerate();
+ try {
+ return generator.generator(section);
+ }catch (Exception e){
+ this.info("生成失败", String.format("生成失败，原因：%s", ExceptionUtil.getCause(e)),true);
+ return (T) section;
+ }
+
+ }
+
+ public boolean changeType(String type){
+ if(generatorMap.containsKey(this.type)){
+ this.generator = generatorMap.get(this.type);
+ generator.sqlInit();
+ this.type = type;
+ return true;
+ }
+ return false;
+ }
+
+ public List types(){
+ return new ArrayList<>(generatorMap.keySet());
+ }
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/AutoGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/AutoGenerator.java
index 237f119..175c34c 100644
--- a/chopperbot-section-work/src/main/java/org/example/core/auto/AutoGenerator.java
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/AutoGenerator.java
@@ -1,5 +1,9 @@
package org.example.core.auto;
+import java.util.Map;
+
public interface AutoGenerator {
- T generate(Object data);
+
+ void preGenerate();
+ T generate(Map data);
}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/SectionGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/SectionGenerator.java
new file mode 100644
index 0000000..4d9c22b
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/SectionGenerator.java
@@ -0,0 +1,17 @@
+package org.example.core.auto;
+
+import org.example.bean.section.PackageSection;
+import org.example.bean.section.VideoSection;
+import org.example.sql.SQLInitMachine;
+import org.example.util.ClassUtil;
+import org.springframework.beans.BeanUtils;
+
+import java.util.Map;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 20:42
+ **/
+public abstract class SectionGenerator implements AutoGenerator,SQLInitMachine {
+ public abstract V generator(T section);
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/SectionPipeline.java b/chopperbot-section-work/src/main/java/org/example/core/auto/SectionPipeline.java
new file mode 100644
index 0000000..d6a0118
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/SectionPipeline.java
@@ -0,0 +1,8 @@
+package org.example.core.auto;
+
+import org.example.bean.section.PackageSection;
+import org.example.bean.section.VideoSection;
+
+public interface SectionPipeline {
+ O process(I section);
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/DescGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/DescGenerator.java
new file mode 100644
index 0000000..3da89c6
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/DescGenerator.java
@@ -0,0 +1,29 @@
+package org.example.core.auto.video.description;
+
+import org.example.bean.section.PackageSection;
+import org.example.bean.section.VideoSection;
+import org.example.core.auto.SectionGenerator;
+import org.example.util.ClassUtil;
+import org.springframework.beans.BeanUtils;
+
+import java.util.Map;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 20:38
+ **/
+public abstract class DescGenerator extends SectionGenerator {
+ @Override
+ public V generator(T section) {
+ PackageSection packageSection = new PackageSection();
+ BeanUtils.copyProperties(section,packageSection);
+ try {
+ Map map = ClassUtil.toDeepMap(packageSection);
+ String desc = this.generate(map);
+ packageSection.setDescription(desc);
+ }catch (Exception e){
+ return (V) section;
+ }
+ return (V) packageSection;
+ }
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/DescGeneratorPlugin.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/DescGeneratorPlugin.java
new file mode 100644
index 0000000..c4afd9c
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/DescGeneratorPlugin.java
@@ -0,0 +1,26 @@
+package org.example.core.auto.video.description;
+
+import org.example.core.auto.AbstractGeneratePlugin;
+import org.example.core.auto.video.title.GptTitleGenerator;
+import org.example.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 21:16
+ **/
+@Component
+public class DescGeneratorPlugin extends AbstractGeneratePlugin {
+
+ @Resource
+ Map descGeneratorMap;
+ @Override
+ public boolean init() {
+ this.generatorMap = descGeneratorMap;
+ this.type = StringUtil.lowerCaseFirstLetter(GptDescGenerator.class.getSimpleName());
+ return super.init();
+ }
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/GptDescGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/GptDescGenerator.java
new file mode 100644
index 0000000..54d22b9
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/GptDescGenerator.java
@@ -0,0 +1,91 @@
+package org.example.core.auto.video.description;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.example.constpool.PluginName;
+import org.example.core.gpt.ChatGPTMsgBuilder;
+import org.example.core.gpt.OpenAPIPlugin;
+import org.example.exception.plugin.PluginDependOnException;
+import org.example.init.InitPluginRegister;
+import org.example.mapper.DescSchemeMapper;
+import org.example.mapper.TitleSchemeMapper;
+import org.example.plugin.PluginCheckAndDo;
+import org.example.pojo.DescScheme;
+import org.example.pojo.GPTKey;
+import org.example.pojo.TitleScheme;
+import org.example.sql.annotation.SQLInit;
+import org.example.util.ExceptionUtil;
+import org.example.util.MapUtil;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 20:55
+ **/
+@Component
+public class GptDescGenerator extends DescGenerator {
+
+ @Resource
+ DescSchemeMapper mapper;
+ private List schemeList;
+
+ public GptDescGenerator() {
+ this.schemeList = new ArrayList<>();
+ }
+
+ @Override
+ @SQLInit(table = "desc_scheme",tableSQL = "CREATE TABLE \"desc_scheme\" (\n" +
+ "\t\"id\"\tINTEGER NOT NULL,\n" +
+ "\t\"system\"\tTEXT NOT NULL,\n" +
+ "\t\"type\"\tTEXT,\n" +
+ "\tPRIMARY KEY(\"id\" AUTOINCREMENT)\n" +
+ ")",mapper = DescSchemeMapper.class)
+ public List sqlInit() {
+ return List.of(new DescScheme(null,"作为一个资深的直播运营人员，请你根据我提供给你的直播弹幕内容，标签和主播来叙述一下该段直播发生了什么事情，叙述过程要有趣符合当前短视频快节奏和吸引眼球的风格，生成一个即可，不需要任何标识和说明，字数不超过100字"
+ ,"global"));
+ }
+
+ @Override
+ public void preGenerate() {
+ if (!InitPluginRegister.isRegister(PluginName.CHAT_GPT)) {
+ throw PluginDependOnException.MissingFatherPlugin(PluginName.CHAT_GPT,"");
+ }
+ try {
+ schemeList = mapper.selectList(new QueryWrapper<>());
+ }catch (Exception e){
+ throw new RuntimeException("读取desc_scheme表失败");
+ }
+ }
+
+ @Override
+ public String generate(Map data) {
+ if (schemeList.isEmpty())return "";
+ try {
+ return PluginCheckAndDo.CheckAndGet((plugin)->{
+ String liver = MapUtil.getString(data,"liver");
+ Object barrages = data.get("barrages");
+ String barrageStr = "";
+ if(barrages instanceof List){
+ barrageStr = OpenAPIPlugin.zipContent(OpenAPIPlugin.zipContent((List) barrages).toString());
+ }
+ String content = MapUtil.getString(data,"content");
+ GPTKey gptKey = ((OpenAPIPlugin) plugin).choseKey(OpenAPIPlugin.APIFunc.CHAT_GPT);
+ DescScheme scheme = schemeList.get(0);
+ if(gptKey==null)return "";
+ ChatGPTMsgBuilder builder = new ChatGPTMsgBuilder().model(gptKey.getModel())
+ .system(scheme.getSystem())
+ .user(String.format("主播：%s\n内容：%s\n直播弹幕：%s", liver,content,barrageStr))
+ .stream(false);
+ JSONObject object = ((OpenAPIPlugin) plugin).reqGPT(builder, OpenAPIPlugin.APIFunc.CHAT_GPT);
+ return ((OpenAPIPlugin) plugin).getCommonRes(object);
+ },PluginName.CHAT_GPT,String.class);
+ } catch (Exception e){
+ throw new RuntimeException(ExceptionUtil.getCause(e));
+ }
+ }
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/RandomDescGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/RandomDescGenerator.java
new file mode 100644
index 0000000..ad3e949
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/description/RandomDescGenerator.java
@@ -0,0 +1,36 @@
+package org.example.core.auto.video.description;
+
+import org.example.util.MapUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 21:17
+ **/
+@Component
+public class RandomDescGenerator extends DescGenerator{
+
+ @Override
+ public List sqlInit() {
+ return null;
+ }
+
+ @Override
+ public void preGenerate() {
+
+ }
+
+ @Override
+ public String generate(Map data) {
+ try {
+ String liver = MapUtil.getString(data,"liver");
+ return String.format("%s直播精彩集锦",liver);
+ } catch (Exception e){
+ return "";
+ }
+ }
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/GptTitleGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/GptTitleGenerator.java
index e60f886..9793c8e 100644
--- a/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/GptTitleGenerator.java
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/GptTitleGenerator.java
@@ -1,28 +1,42 @@
package org.example.core.auto.video.title;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.example.constpool.PluginName;
+import org.example.core.auto.SectionPipeline;
+import org.example.core.gpt.ChatGPTMsgBuilder;
+import org.example.core.gpt.OpenAPIPlugin;
+import org.example.core.label.LabelManagerPlugin;
import org.example.exception.plugin.PluginDependOnException;
-import org.example.exception.plugin.PluginNotRegisterException;
import org.example.init.InitPluginRegister;
import org.example.mapper.TitleSchemeMapper;
+import org.example.plugin.PluginCheckAndDo;
+import org.example.pojo.GPTKey;
import org.example.pojo.TitleScheme;
+import org.example.sql.SQLInitMachine;
import org.example.sql.annotation.SQLInit;
+import org.example.util.ClassUtil;
+import org.example.util.ExceptionUtil;
+import org.example.util.MapUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* @author Genius
* @date 2023/10/22 18:03
**/
@Component
-public class GptTitleGenerator implements TitleGenerator{
+public class GptTitleGenerator extends TitleGenerator{
@Resource
- TitleSchemeMapper titleSchemeMapper;
+ TitleSchemeMapper mapper;
private List schemeList;
public GptTitleGenerator() {
@@ -30,8 +44,43 @@ public class GptTitleGenerator implements TitleGenerator{
}
@Override
- public String generate(Object data) {
- return null;
+ public String generate(Map data) {
+ if (schemeList.isEmpty())return "";
+ try {
+ return PluginCheckAndDo.CheckAndGet((plugin)->{
+ Object barrages = data.get("barrages");
+ String barrageStr = "";
+ if(barrages instanceof List){
+ barrageStr = OpenAPIPlugin.zipContent(OpenAPIPlugin.zipContent((List) barrages).toString());
+ }
+ String content = MapUtil.getString(data,"content");
+ String liver = MapUtil.getString(data,"liver");
+ String labels = MapUtil.getString(data,"labels");
+ GPTKey gptKey = ((OpenAPIPlugin) plugin).choseKey(OpenAPIPlugin.APIFunc.CHAT_GPT);
+ TitleScheme scheme = schemeList.get(0);
+ if(gptKey==null)return "";
+ ChatGPTMsgBuilder builder = new ChatGPTMsgBuilder().model(gptKey.getModel())
+ .system(scheme.getSystem())
+ .user(String.format("主播：%s\n内容：%s\n类型：%s\n弹幕：%s\n", liver,content,labels,barrageStr))
+ .stream(false);
+ JSONObject object = ((OpenAPIPlugin) plugin).reqGPT(builder, OpenAPIPlugin.APIFunc.CHAT_GPT);
+ return ((OpenAPIPlugin) plugin).getCommonRes(object);
+ },PluginName.CHAT_GPT,String.class);
+ } catch (Exception e){
+ throw new RuntimeException(ExceptionUtil.getCause(e));
+ }
+ }
+
+ @Override
+ public void preGenerate() {
+ if (!InitPluginRegister.isRegister(PluginName.CHAT_GPT)) {
+ throw PluginDependOnException.MissingFatherPlugin(PluginName.CHAT_GPT,"");
+ }
+ try {
+ schemeList = mapper.selectList(new QueryWrapper<>());
+ }catch (Exception e){
+ throw new RuntimeException("读取title_scheme表失败");
+ }
}
@Override
@@ -41,21 +90,8 @@ public class GptTitleGenerator implements TitleGenerator{
"\t\"type\"\tTEXT,\n" +
"\tPRIMARY KEY(\"id\" AUTOINCREMENT)\n" +
")",mapper = TitleSchemeMapper.class)
- public Object preGenerate() {
- if (!InitPluginRegister.isRegister(PluginName.CHAT_GPT)) {
- throw PluginDependOnException.MissingFatherPlugin(PluginName.CHAT_GPT,"");
- }
- try {
- schemeList = titleSchemeMapper.selectList(new QueryWrapper<>());
- }catch (Exception e){
- throw new RuntimeException("读取title_scheme表失败");
- }
- return List.of(new TitleScheme(null,"请你学习以下标题风格，并对这种风格做出总结。命名为风格A\n" +
- "标题一:姿态被搞到破防崩溃，上演大型红温现场，这次生气不像演的感觉要掉小珍珠了！\n" +
- "标题二:PDD节食减肥高光时刻回顾，饭后猛炫6只去皮鸡腿！ \n" +
- "标题三:BLG击败FNC！外战一把不输！外战幻神BLG！武器神Bin天降晕四个斩获三杀！ \n" +
- "标题四:前有TheShy天神下凡一锤四，今有刚神下凡一斩四，海龟剑姬jjking荣归故里吊打小代！\n" +
- "标题五:属于男生的综艺来了！姿态最新惩罚局，一手辅助维克托上演“超鬼”"
+ public List sqlInit() {
+ return List.of(new TitleScheme(null,"标题一:主播被搞到破防崩溃，上演大型红温现场，这次生气不像演的感觉要掉小珍珠了！\\n标题二:主播节食减肥高光时刻回顾，饭后猛炫6只去皮鸡腿！ \\n标题三:BLG击败FNC！外战一把不输！外战幻神BLG！武器神Bin天降晕四个斩获三杀！ \\n标题四:前有TheShy天神下凡一锤四，今有刚神下凡一斩四，海龟剑姬jjking荣归故里吊打小代！\\n标题五:属于男生的综艺来了！姿态最新惩罚局，一手辅助维克托上演“超鬼”。请你学习以上标题样例总结出一种风格，我接下来为您提供的主播名称，弹幕内容，直播内容，标签等信息，请你作为一个热门短视频博主，根据你总结的风格和我提供的信息来生成一个吸引眼球，爆火，符合当今流行梗的短视频标题。注意：只需要给我标题，不需要“标题：”等任何前缀词语。你的所有数据信息应该从我为你提供的信息中获取，不要从标题样例中获取任何数据信息。"
,"global"));
}
}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/RandomTitleGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/RandomTitleGenerator.java
new file mode 100644
index 0000000..f488d21
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/RandomTitleGenerator.java
@@ -0,0 +1,57 @@
+package org.example.core.auto.video.title;
+
+import com.alibaba.fastjson.JSONObject;
+import org.example.bean.section.PackageSection;
+import org.example.bean.section.VideoSection;
+import org.example.constpool.PluginName;
+import org.example.core.gpt.ChatGPTMsgBuilder;
+import org.example.core.gpt.OpenAPIPlugin;
+import org.example.plugin.PluginCheckAndDo;
+import org.example.pojo.GPTKey;
+import org.example.pojo.TitleScheme;
+import org.example.util.ClassUtil;
+import org.example.util.MapUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 20:17
+ **/
+@Component
+public class RandomTitleGenerator extends TitleGenerator{
+
+ @Override
+ public List sqlInit() {
+ return null;
+ }
+
+ @Override
+ public void preGenerate() {
+
+ }
+
+ @Override
+ public String generate(Map data) {
+ try {
+ Object barrages = data.get("barrages");
+ Object labels = data.get("labels");
+ if(barrages instanceof List){
+ String barrage = ((List) barrages).get((int) (Math.random() * ((List) barrages).size())).toString();
+ String liver = MapUtil.getString(data,"liver");
+ String tag = MapUtil.getString(data,"tag");
+ String label = "";
+ if(labels instanceof List){
+ label = ((List) labels).get((int) (Math.random() * ((List) labels).size())).toString();
+ }
+ return String.format("【%s】%s%s直播，弹幕直呼:%s!!",tag,liver,label,barrage);
+ }
+ } catch (Exception e){
+ return "";
+ }
+ return "";
+ }
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGeneratePlugin.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGeneratePlugin.java
index de21299..64fb545 100644
--- a/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGeneratePlugin.java
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGeneratePlugin.java
@@ -1,28 +1,37 @@
package org.example.core.auto.video.title;
-import org.example.core.auto.AutoGenerator;
+import org.example.bean.section.PackageSection;
+import org.example.bean.section.VideoSection;
+import org.example.core.auto.AbstractGeneratePlugin;
+import org.example.core.auto.SectionPipeline;
+import org.example.core.auto.video.description.DescGenerator;
import org.example.plugin.SpringBootPlugin;
+import org.example.util.StringUtil;
+import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author Genius
* @date 2023/10/22 17:53
**/
@Component
-public class TitleGeneratePlugin extends SpringBootPlugin {
-
- private TitleGenerator autoGenerator;
+public class TitleGeneratePlugin extends AbstractGeneratePlugin {
+ @Resource
+ Map titleGeneratorMap;
@Override
public boolean init() {
+ this.generatorMap = titleGeneratorMap;
+ this.type = StringUtil.lowerCaseFirstLetter(GptTitleGenerator.class.getSimpleName());
return super.init();
}
- public String generate(Object data) {
- autoGenerator.preGenerate();
- return autoGenerator.generate(data);
- }
}
diff --git a/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGenerator.java b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGenerator.java
index c22efe7..9f555d8 100644
--- a/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGenerator.java
+++ b/chopperbot-section-work/src/main/java/org/example/core/auto/video/title/TitleGenerator.java
@@ -1,8 +1,29 @@
package org.example.core.auto.video.title;
+import org.example.bean.section.PackageSection;
+import org.example.bean.section.VideoSection;
import org.example.core.auto.AutoGenerator;
+import org.example.core.auto.SectionGenerator;
+import org.example.sql.SQLInitMachine;
+import org.example.sql.annotation.SQLInit;
+import org.example.util.ClassUtil;
+import org.springframework.beans.BeanUtils;
-public interface TitleGenerator extends AutoGenerator {
+import java.util.Map;
- Object preGenerate();
+public abstract class TitleGenerator extends SectionGenerator {
+ @Override
+ public V generator(T section) {
+ PackageSection packageSection = new PackageSection();
+ BeanUtils.copyProperties(section,packageSection);
+ try {
+ Map map = ClassUtil.toDeepMap(packageSection);
+ String title = this.generate(map);
+ packageSection.setTitle(title);
+ }catch (Exception e){
+ return (V) section;
+ }
+ return (V) packageSection;
+ }
}
+
diff --git a/chopperbot-section-work/src/main/java/org/example/init/DescGeneratorPluginInitMachine.java b/chopperbot-section-work/src/main/java/org/example/init/DescGeneratorPluginInitMachine.java
new file mode 100644
index 0000000..4d1173b
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/init/DescGeneratorPluginInitMachine.java
@@ -0,0 +1,25 @@
+package org.example.init;
+
+import org.example.constpool.ModuleName;
+import org.example.constpool.PluginName;
+import org.example.core.auto.video.description.DescGeneratorPlugin;
+import org.example.core.auto.video.title.TitleGeneratePlugin;
+import org.example.plugin.annotation.Plugin;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 21:26
+ **/
+
+@Plugin(moduleName = ModuleName.SECTION_WORK,
+ pluginName = PluginName.DESC_GENERATE,
+ pluginName_CN = "标题生成插件",
+ pluginDescription = "根据切片内容自动生成切片标题",
+ pluginClass= DescGeneratorPlugin.class,
+ springBootPlugin = true,
+ ignore=true
+)
+@Component
+public class DescGeneratorPluginInitMachine extends SpringPlugInitMachine{
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/init/TitleGeneratePluginInitMachine.java b/chopperbot-section-work/src/main/java/org/example/init/TitleGeneratePluginInitMachine.java
new file mode 100644
index 0000000..d1d3893
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/init/TitleGeneratePluginInitMachine.java
@@ -0,0 +1,24 @@
+package org.example.init;
+
+import org.example.constpool.ModuleName;
+import org.example.constpool.PluginName;
+import org.example.core.analysis.EmotionAnalysisPlugin;
+import org.example.core.auto.video.title.TitleGeneratePlugin;
+import org.example.plugin.annotation.Plugin;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 19:28
+ **/
+@Plugin(moduleName = ModuleName.SECTION_WORK,
+ pluginName = PluginName.TITLE_GENERATE,
+ pluginName_CN = "标题生成插件",
+ pluginDescription = "根据切片内容自动生成切片标题",
+ pluginClass= TitleGeneratePlugin.class,
+ springBootPlugin = true,
+ ignore=true
+)
+@Component
+public class TitleGeneratePluginInitMachine extends SpringPlugInitMachine{
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/mapper/DescSchemeMapper.java b/chopperbot-section-work/src/main/java/org/example/mapper/DescSchemeMapper.java
new file mode 100644
index 0000000..b80e9a4
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/mapper/DescSchemeMapper.java
@@ -0,0 +1,7 @@
+package org.example.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.example.pojo.DescScheme;
+
+public interface DescSchemeMapper extends BaseMapper {
+}
diff --git a/chopperbot-section-work/src/main/java/org/example/pojo/DescScheme.java b/chopperbot-section-work/src/main/java/org/example/pojo/DescScheme.java
new file mode 100644
index 0000000..0b6eb6f
--- /dev/null
+++ b/chopperbot-section-work/src/main/java/org/example/pojo/DescScheme.java
@@ -0,0 +1,23 @@
+package org.example.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Genius
+ * @date 2023/10/25 21:07
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("desc_scheme")
+public class DescScheme {
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ private String system;
+ private String type;
+}
diff --git a/chopperbot-section/src/main/java/org/example/core/section/SectionParking.java b/chopperbot-section/src/main/java/org/example/core/section/SectionParking.java
index b728b9c..fd09e95 100644
--- a/chopperbot-section/src/main/java/org/example/core/section/SectionParking.java
+++ b/chopperbot-section/src/main/java/org/example/core/section/SectionParking.java
@@ -1,11 +1,40 @@
package org.example.core.section;
+import org.example.bean.Barrage;
+import org.example.bean.section.VideoSection;
+import org.example.constpool.ConstPool;
+import org.example.constpool.GlobalFileCache;
+import org.example.mapper.VideoSectionMapper;
+import org.example.util.JsonFileUtil;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
/**
* @author Genius
* @date 2023/10/22 20:56
**/
@Component
public class SectionParking {
+
+ @Resource
+ VideoSectionMapper mapper;
+
+ private void saveData(VideoSection section){
+ String root = (String) GlobalFileCache.ModuleSrcConfigFile.get("src", ConstPool.BARRAGE);
+ String liveRoot = (String)GlobalFileCache.ModuleSrcConfigFile.get("src", ConstPool.LIVE_RECORD);
+ String path = section.getVideoPath().replace(liveRoot,root);
+ if (JsonFileUtil.writeJsonFile(path, Map.of("data",section.getBarrages())).isFile()) {
+ section.setBarrageFile(path);
+ }
+ }
+ public void parking(VideoSection section){
+ saveData(section);
+ mapper.insert(section);
+ }
}
diff --git a/chopperbot-section/src/main/java/org/example/core/section/VideoSectionWorkShop.java b/chopperbot-section/src/main/java/org/example/core/section/VideoSectionWorkShop.java
index bb73e40..6ea408b 100644
--- a/chopperbot-section/src/main/java/org/example/core/section/VideoSectionWorkShop.java
+++ b/chopperbot-section/src/main/java/org/example/core/section/VideoSectionWorkShop.java
@@ -1,18 +1,19 @@
package org.example.core.section;
-import org.apache.coyote.Request;
import org.example.bean.Live;
-import org.example.cache.FileCache;
+import org.example.bean.section.VideoSection;
import org.example.constpool.ConstPool;
import org.example.constpool.FileNameBuilder;
import org.example.constpool.GlobalFileCache;
import org.example.plugin.SpringGuardPlugin;
import org.example.sql.annotation.SQLInit;
+import org.example.util.ExceptionUtil;
import org.example.util.FileUtil;
import org.example.util.TimeUtil;
import org.example.util.VideoUtil;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.nio.file.Paths;
import java.util.List;
import java.util.concurrent.BlockingQueue;
@@ -30,6 +31,9 @@ public class VideoSectionWorkShop extends SpringGuardPlugin {
private String liveRoot;
+ @Resource
+ SectionParking sectionParking;
+
@Override
public boolean init() {
requests = new LinkedBlockingQueue<>(1000);
@@ -41,12 +45,23 @@ public class VideoSectionWorkShop extends SpringGuardPlugin {
public void start() {
try {
SectionRequest request = requests.poll(1000, TimeUnit.SECONDS);
+ VideoSection videoSection = generateSection(request);
+ sectionParking.parking(videoSection);
+ }catch (InterruptedException e){
+ return;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ private VideoSection generateSection(SectionRequest request){
+ try {
if(request!=null){
long videoStartTime = TimeUtil.getTimeNaos(request.getDate());
long start = (timeBias(request.getStartTime())-videoStartTime)/1000;
start = start<0?0:start;
long end = (timeBias(request.getEndTime())-videoStartTime)/1000;
-
+ List barrages = request.getBarrages();
String root = Paths.get(liveRoot,request.getAction(),request.getPlatform()).toString();
String startTime = VideoUtil.formatTimeToFFMpeg(start);
String endTime = VideoUtil.formatTimeToFFMpeg(end);
@@ -59,14 +74,15 @@ public class VideoSectionWorkShop extends SpringGuardPlugin {
String newPath = Paths.get(root,newVideoName).toString();
if (VideoUtil.cutVideoByFFMpeg(oldPath,newPath,startTime,endTime)) {
this.info("切片生成", String.format("产生切片文件%s 主播:%s", newVideoName,liver),true);
- VideoSection videoSection = new VideoSection(newVideoName,request.getTag(),request.getLiver(),request.getPlatform());
+ VideoSection videoSection = new VideoSection(newVideoName, request.getTag(), request.getLiver(), request.getPlatform());
+ videoSection.setBarrages(barrages);
+ return videoSection;
}
}
- }catch (InterruptedException e){
- return;
}catch (Exception e){
- e.printStackTrace();
+ this.error("切片生成失败", String.format("切片生成失败，原因:%s", ExceptionUtil.getCause(e)),true);
}
+ return null;
}
public long timeBias(long time){
return time+8*1000;
@@ -89,12 +105,12 @@ public class VideoSectionWorkShop extends SpringGuardPlugin {
"\t\"id\"\tINTEGER NOT NULL,\n" +
"\t\"video_name\"\tTEXT NOT NULL,\n" +
"\t\"liver\"\tTEXT NOT NULL,\n" +
- "\t\"barrages\"\tTEXT NOT NULL,\n" +
+ "\t\"barrage_file\"\tTEXT NOT NULL,\n" +
"\t\"tag\"\tTEXT NOT NULL,\n" +
"\t\"date\"\tTEXT NOT NULL,\n" +
"\t\"platform\"\tTEXT,\n" +
"\tPRIMARY KEY(\"id\" AUTOINCREMENT)\n" +
- ")")
+ ");")
public List sqlInit() {
return null;
}
diff --git a/chopperbot-section/src/main/java/org/example/mapper/VideoSectionMapper.java b/chopperbot-section/src/main/java/org/example/mapper/VideoSectionMapper.java
new file mode 100644
index 0000000..d1d2669
--- /dev/null
+++ b/chopperbot-section/src/main/java/org/example/mapper/VideoSectionMapper.java
@@ -0,0 +1,7 @@
+package org.example.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.example.bean.section.VideoSection;
+
+public interface VideoSectionMapper extends BaseMapper {
+}
diff --git a/chopperbot-test/src/test/java/org/example/sectionwork/TitleGenerateTest.java b/chopperbot-test/src/test/java/org/example/sectionwork/TitleGenerateTest.java
index 51dadb0..6750475 100644
--- a/chopperbot-test/src/test/java/org/example/sectionwork/TitleGenerateTest.java
+++ b/chopperbot-test/src/test/java/org/example/sectionwork/TitleGenerateTest.java
@@ -3,12 +3,16 @@ package org.example.sectionwork;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.example.ConsoleApplication;
+import org.example.bean.section.VideoSection;
+import org.example.core.auto.video.description.DescGeneratorPlugin;
+import org.example.core.auto.video.title.TitleGeneratePlugin;
import org.example.util.JsonFileUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -21,6 +25,11 @@ import java.util.stream.Collectors;
@SpringBootTest(classes = ConsoleApplication.class,webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
public class TitleGenerateTest {
+ @Resource
+ TitleGeneratePlugin plugin;
+
+ @Resource
+ DescGeneratorPlugin descGeneratorPlugin;
@Test
public void test(){
Map map = JsonFileUtil.readJsonFile("E:\\Project\\ChopperBot\\config\\Barrage\\online\\huya\\Uzi_2023-10-18 21_22_57.json");
@@ -32,7 +41,14 @@ public class TitleGenerateTest {
}
return "";
}).collect(Collectors.toList());
- System.out.println(content);
+ VideoSection videoSection = new VideoSection();
+ videoSection.setBarrages(content.subList(0,100));
+ videoSection.setTag("英雄联盟");
+ videoSection.setLiver("UZI");
+ VideoSection process = plugin.process(videoSection);
+ System.out.println(process);
+ VideoSection process1 = descGeneratorPlugin.process(process);
+ System.out.println(process1);
}
}
}
diff --git a/chopperbot-test/src/test/java/org/example/sectionwork/VoiceToTextTest.java b/chopperbot-test/src/test/java/org/example/sectionwork/VoiceToTextTest.java
index 831c122..b61961a 100644
--- a/chopperbot-test/src/test/java/org/example/sectionwork/VoiceToTextTest.java
+++ b/chopperbot-test/src/test/java/org/example/sectionwork/VoiceToTextTest.java
@@ -22,9 +22,10 @@ public class VoiceToTextTest {
public static final MediaType MEDIA_TYPE_WAV = MediaType.parse("audio/wav");
public static void main(String... args) throws IOException {
- Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 7890));
- OkHttpClient client = new OkHttpClient.Builder().proxy(proxy).connectTimeout(60, TimeUnit.SECONDS).build();
+// Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 7890));
+ OkHttpClient client = new OkHttpClient.Builder().connectTimeout(120, TimeUnit.SECONDS).readTimeout(120,TimeUnit.SECONDS).writeTimeout(60,TimeUnit.SECONDS).build();
+ long l = System.currentTimeMillis();
// 音频文件
File audioFile = new File("E:\\Project\\chopperbot-1.0\\audioTest.mp3");
@@ -39,8 +40,10 @@ public class VoiceToTextTest {
// 请求
Request request = new Request.Builder()
- .addHeader("Authorization", "Bearer " + "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")
- .url("https://api.openai.com/v1/audio/transcriptions")
+ .addHeader("Authorization", "Bearer " + "sk-xgUDtOdRgQLigz2D0e4cA665441e4287AfCf8458B1C21b0f")
+// .url("https://api.openai.com/v1/audio/transcriptions")
+ //.url("https://oneapi.a9.gay/v1/audio/transcriptions")
+ .url(" https://oneapi.a9.gay/openai/deployments/whisper-1/audio/transcriptions?api-version=2023-09-01-preview")
.post(requestBody)
.build();
@@ -49,6 +52,7 @@ public class VoiceToTextTest {
if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
System.out.println(response.body().string());
+ System.out.println((System.currentTimeMillis() - l)/1000);
}
}
diff --git a/config/chopperBotConfig.json b/config/chopperBotConfig.json
index 56d3827..3c35fff 100644
--- a/config/chopperBotConfig.json
+++ b/config/chopperBotConfig.json
@@ -38,5 +38,5 @@
"OpenAPI":true
}
},
- "updateTime":"2023-10-23 15:10:01"
+ "updateTime":"2023-10-25 15:01:54"
}
\ No newline at end of file
diff --git a/console-ui/src/api/account/labelApi.ts b/console-ui/src/api/account/labelApi.ts
new file mode 100644
index 0000000..50d6007
--- /dev/null
+++ b/console-ui/src/api/account/labelApi.ts
@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+import { Label } from "@/views/app/label/LabelTypes";
+export function list() {
+ return request({
+ url: "/account/label/list/",
+ method: "get",
+ });
+}
+
+export function add(label: string) {
+ return request.post("/account/label/add/", { label: label });
+}
+
+export function remove(label: string) {
+ return request({
+ url: "/account/label/delete/",
+ method: "get",
+ params: {
+ label: label,
+ },
+ });
+}
+
+export function update(Label: Label) {
+ return request.post("/account/label/update/", Label);
+}
diff --git a/console-ui/src/components/navigation/MainMenu.vue b/console-ui/src/components/navigation/MainMenu.vue
index 74634ed..caa6db6 100644
--- a/console-ui/src/components/navigation/MainMenu.vue
+++ b/console-ui/src/components/navigation/MainMenu.vue
@@ -1,7 +1,8 @@
@@ -25,7 +39,7 @@ onMounted(() => {});
{});
v-text="menuItem.key ? $t(menuItem.key) : menuItem.text"
>
-
+
{
- window.open("https://github.com/969025903/ChopperBot", "_blank");
+ window.open("https://github.com/Geniusay/ChopperBot", "_blank");
};
diff --git a/console-ui/src/configs/menus/apps.menu.ts b/console-ui/src/configs/menus/apps.menu.ts
index 8ded758..e6f5033 100644
--- a/console-ui/src/configs/menus/apps.menu.ts
+++ b/console-ui/src/configs/menus/apps.menu.ts
@@ -6,40 +6,53 @@ export default [
link: "/apps/board",
},
{
- icon:"mdi mdi-ladybug",
- key:"menu.creeper_library",
- text:"Creeper Library",
- link: "/apps/creeperLibrary"
+ icon: "mdi mdi-ladybug",
+ key: "menu.creeper_library",
+ text: "Creeper Library",
+ link: "/apps/creeperLibrary",
+ plugin: "CreeperManager",
},
{
- icon:"mdi mdi-account-hard-hat-outline",
- key:"menu.task_center",
- text:"Task Center",
- link: "/apps/taskCenter"
+ icon: "mdi mdi-account-hard-hat-outline",
+ key: "menu.task_center",
+ text: "Task Center",
+ link: "/apps/taskCenter",
+ plugin: "TaskCenter",
},
{
- icon:"mdi mdi-monitor-cellphone-star",
- key:"menu.hot_guard",
- text:"Hot Guard",
- link: "/apps/hotGuard"
+ icon: "mdi mdi-monitor-cellphone-star",
+ key: "menu.hot_guard",
+ text: "Hot Guard",
+ link: "/apps/hotGuard",
+ plugin: "HotGuard",
},
{
- icon:"mdi mdi-bird",
- key:"menu.heat_recommend",
- text:"Heat Recommend",
- link: "/apps/heatRecommend"
+ icon: "mdi mdi-bird",
+ key: "menu.heat_recommend",
+ text: "Heat Recommend",
+ link: "/apps/heatRecommend",
+ plugin: "HotRecommendation",
},
{
- icon:"mdi mdi-star-face",
- key:"menu.live_follow",
- text:"Live Follow",
- link: "/apps/liveFollow"
+ icon: "mdi mdi-star-face",
+ key: "menu.live_follow",
+ text: "Live Follow",
+ link: "/apps/liveFollow",
+ plugin: "LiverFollower",
},
{
- icon:"mdi mdi-chart-line",
- key:"menu.barrage_curve",
- text:"Barrage Curve",
- link: "/apps/barrageCurve"
+ icon: "mdi mdi-chart-line",
+ key: "menu.barrage_curve",
+ text: "Barrage Curve",
+ link: "/apps/barrageCurve",
+ plugin: "BarrageScoreCurve",
+ },
+ {
+ icon: "mdi mdi-tag-faces",
+ key: "menu.label",
+ text: "Label Manage",
+ link: "/apps/label",
+ plugin: "LabelManager",
},
{
icon: "mdi-forum-outline",
diff --git a/console-ui/src/locales/en.ts b/console-ui/src/locales/en.ts
index b9224b2..017290b 100644
--- a/console-ui/src/locales/en.ts
+++ b/console-ui/src/locales/en.ts
@@ -49,7 +49,7 @@ export default {
unsplash: "Unsplash",
booking: "Booking",
ikea: "IKEA",
-
+ label:"Label Manager",
board: "Task Board",
users: "Users",
diff --git a/console-ui/src/locales/zhHans.ts b/console-ui/src/locales/zhHans.ts
index ffb990e..b5996e1 100644
--- a/console-ui/src/locales/zhHans.ts
+++ b/console-ui/src/locales/zhHans.ts
@@ -123,7 +123,8 @@ export default {
heat_recommend:"热门直播推荐",
live_follow:"关注主播",
barrage_curve:"弹幕得分曲线",
- hot_live:"热门直播"
+ hot_live:"热门直播",
+ label:"标签管理"
},
dashboard: {
activity: "活动",
diff --git a/console-ui/src/router/apps.routes.ts b/console-ui/src/router/apps.routes.ts
index 7d93947..73d6767 100644
--- a/console-ui/src/router/apps.routes.ts
+++ b/console-ui/src/router/apps.routes.ts
@@ -120,6 +120,20 @@ export default [
category: "APP",
},
},
+ {
+ path: "/apps/label",
+ name: "app-label-manage",
+ component: () =>
+ import(
+ /* webpackChunkName: "utility-board" */ "@/views/app/label/LabelManageView.vue"
+ ),
+ meta: {
+ requiresAuth: true,
+ title: "Label Manage",
+ layout: "ui",
+ category: "APP",
+ },
+ },
{
path: "/apps/nitori",
meta: {
diff --git a/console-ui/src/utils/request.ts b/console-ui/src/utils/request.ts
index 0015641..0ac7518 100644
--- a/console-ui/src/utils/request.ts
+++ b/console-ui/src/utils/request.ts
@@ -1,47 +1,51 @@
import axios from "axios";
-import {useSnackbarStore} from "@/stores/snackbarStore";
+import { useSnackbarStore } from "@/stores/snackbarStore";
-const snackbarStore = useSnackbarStore();
const request = axios.create({
baseURL: "/appApi",
timeout: 100000,
});
-request.interceptors.request.use(config => {
- //config.headers['Content-Type'] = 'application/json';
- return config
-}, error => {
- return Promise.reject(error)
-});
+request.interceptors.request.use(
+ (config) => {
+ //config.headers['Content-Type'] = 'application/json';
+ return config;
+ },
+ (error) => {
+ return Promise.reject(error);
+ }
+);
// response 拦截器
// 可以在接口响应后统一处理结果
request.interceptors.response.use(
- response => {
- if(response.status!=200){
- snackbarStore.showSuccessMessage("服务异常!")
+ (response) => {
+ const snackbarStore = useSnackbarStore();
+ if (response.status != 200) {
+ snackbarStore.showSuccessMessage("服务异常!");
}
let res = response.data;
- if(res.code === 114514){
- snackbarStore.showErrorMessage("该插件没有启动，请先启动插件！")
+ if (res.code === 114514) {
+ snackbarStore.showErrorMessage(res.msg);
}
// 如果是返回的文件
- if (response.config.responseType === 'blob') {
- return res
+ if (response.config.responseType === "blob") {
+ return res;
}
// 兼容服务端返回的字符串数据
- if (typeof res === 'string') {
- res = res ? JSON.parse(res) : res
+ if (typeof res === "string") {
+ res = res ? JSON.parse(res) : res;
}
return res;
},
- error => {
- console.log('err' + error) // for debug
+ (error) => {
+ const snackbarStore = useSnackbarStore();
+ snackbarStore.showErrorMessage("操作异常!");
+ console.log("err" + error); // for debug
// localStorage.removeItem('token')
//router.replace({path:'/login'})
- return Promise.reject(error)
+ return Promise.reject(error);
}
-)
+);
-
-export default request
+export default request;
diff --git a/console-ui/src/utils/validate.ts b/console-ui/src/utils/validate.ts
index d72879a..c6ddeb5 100644
--- a/console-ui/src/utils/validate.ts
+++ b/console-ui/src/utils/validate.ts
@@ -8,3 +8,8 @@ export const timeRules = [
(v)=> v > 0 || "时间必须大于0",
(v)=> v >= 1000 || "时间必须大于1s",
]
+
+
+export const validate = (rules: [], data: any) =>{
+ return rules.some((rule) => typeof rule(data) === "string")
+}
\ No newline at end of file
diff --git a/console-ui/src/views/app/hot/live_follow/pages/LiveFollowPage.vue b/console-ui/src/views/app/hot/live_follow/pages/LiveFollowPage.vue
index fc7dadf..3e864a0 100644
--- a/console-ui/src/views/app/hot/live_follow/pages/LiveFollowPage.vue
+++ b/console-ui/src/views/app/hot/live_follow/pages/LiveFollowPage.vue
@@ -18,7 +18,6 @@ const headers = [
{ text: "操作", value: "option" },
];
-const open = (item) => {};
const follows = ref([])
follows.value = liveFollowStore.liveFollowList
@@ -32,7 +31,6 @@ onMounted(async () => {
}, 1000);
});
-const keys = ["group","name"]
const deleteLive = async (item) =>{
await unFollow(item.platform,item.liver).then(res=>{
if(res?.data?.success){
diff --git a/console-ui/src/views/app/label/LabelManageView.vue b/console-ui/src/views/app/label/LabelManageView.vue
new file mode 100644
index 0000000..6d761ba
--- /dev/null
+++ b/console-ui/src/views/app/label/LabelManageView.vue
@@ -0,0 +1,126 @@
+
+
+
+ Label Manage
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ 更新Label
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Close
+
+
+ Save
+
+
+
+
+
+
+
+
+
diff --git a/console-ui/src/views/app/label/LabelManagerStore.ts b/console-ui/src/views/app/label/LabelManagerStore.ts
new file mode 100644
index 0000000..f26a897
--- /dev/null
+++ b/console-ui/src/views/app/label/LabelManagerStore.ts
@@ -0,0 +1,48 @@
+import { defineStore } from "pinia";
+import { useSnackbarStore } from "~/src/stores/snackbarStore";
+import { add, remove, update } from "@/api/account/labelApi";
+import { Label } from "@/views/app/label/LabelTypes"
+const snackbarStore = useSnackbarStore();
+
+export const useLabelManageStore = defineStore({
+ id: "labelManage",
+ state: () => ({
+ labels: ref([]),
+ }),
+
+ getters: {},
+
+ actions: {
+ async removeLabel(label: string) {
+ await remove(label).then((res) => {
+ if (res?.data?.success) {
+ this.labels = this.labels.filter((item) => item.label !== label);
+ snackbarStore.showSuccessMessage("删除成功");
+ } else {
+ snackbarStore.showErrorMessage("删除失败");
+ }
+ });
+ },
+ async addLabel(label: string) {
+ await add(label).then((res) => {
+ if (res.code===200) {
+ snackbarStore.showSuccessMessage("添加成功");
+ this.labels.push(res.data.data as Label);
+ } else {
+ snackbarStore.showErrorMessage("添加失败");
+ }
+ });
+ },
+ async updateLabel(label: Label) {
+ await update(label).then((res) => {
+ if (res?.data?.success) {
+ snackbarStore.showSuccessMessage("更新成功");
+ const index = this.labels.findIndex((item) => item.label === label.label);
+ this.labels[index].label = label.label;
+ } else {
+ snackbarStore.showErrorMessage("更新失败");
+ }
+ });
+ },
+ },
+});
diff --git a/console-ui/src/views/app/label/LabelTypes.ts b/console-ui/src/views/app/label/LabelTypes.ts
new file mode 100644
index 0000000..d7812f0
--- /dev/null
+++ b/console-ui/src/views/app/label/LabelTypes.ts
@@ -0,0 +1,5 @@
+export interface Label{
+ id: number;
+ labelId: string;
+ label: string;
+}
\ No newline at end of file
diff --git a/console-ui/src/views/setting/plugin/pluginStore.ts b/console-ui/src/views/setting/plugin/pluginStore.ts
index 8041d1f..55efe0b 100644
--- a/console-ui/src/views/setting/plugin/pluginStore.ts
+++ b/console-ui/src/views/setting/plugin/pluginStore.ts
@@ -1,9 +1,9 @@
import { defineStore } from "pinia";
import { Plugin } from "./pluginTypes"
-import {startPlugin, closePlugin, enablePlugin, disabledPlugin} from "@/api/pluginApi";
+import {startPlugin, closePlugin, enablePlugin, disabledPlugin, allPlugins} from "@/api/pluginApi";
import { useSnackbarStore } from "@/stores/snackbarStore";
-const snackbarStore = useSnackbarStore();
+
export const usePluginStore = defineStore({
id: "plugin",
@@ -35,6 +35,12 @@ export const usePluginStore = defineStore({
}),
getters:{
+ async initList(){
+ await allPlugins().then(res=>{
+ this.pluginList = res.data
+ })
+ return this.pluginList
+ },
getAllList(){
return this.pluginList
},
@@ -65,7 +71,8 @@ export const usePluginStore = defineStore({
actions:{
startPlugin(plugin: Plugin){
- startPlugin(plugin.pluginName).then(res => {
+ startPlugin(plugin.pluginName).then(res => {
+ const snackbarStore = useSnackbarStore();
// @ts-ignore
if(res.code===200){
plugin.register = true
@@ -81,6 +88,7 @@ export const usePluginStore = defineStore({
closePlugin(plugin: Plugin){
closePlugin(plugin.pluginName).then(res => {
+ const snackbarStore = useSnackbarStore();
// @ts-ignore
if(res.code===200){
plugin.register = false
@@ -96,6 +104,7 @@ export const usePluginStore = defineStore({
enablePlugin(plugin: Plugin){
enablePlugin(plugin.pluginName).then(res => {
+ const snackbarStore = useSnackbarStore();
// @ts-ignore
if(res.code === 200 && res.data.success === true){
plugin.start = true
@@ -110,6 +119,7 @@ export const usePluginStore = defineStore({
disabledPlugin(plugin: Plugin){
disabledPlugin(plugin.pluginName).then(res => {
+ const snackbarStore = useSnackbarStore();
// @ts-ignore
if(res.code === 200 && res.data.success === true){
plugin.start = false
diff --git a/doc/ReadMe.md b/doc/ReadMe.md
index cbe8733..b46a595 100644
--- a/doc/ReadMe.md
+++ b/doc/ReadMe.md
@@ -16,6 +16,6 @@ git commit -m 'deploy'
# 推到你仓库的的 gh-page 分支
# 将 / 替换为你的信息
-git push -f git@github.com:969025903/ChopperBot-Doc.git master:gh-pages
+git push -f git@github.com:Geniusay/ChopperBot-Doc.git master:gh-pages
```
diff --git a/doc/docs/.vuepress/config/nav.js b/doc/docs/.vuepress/config/nav.js
index b1fd3bc..a7f83da 100644
--- a/doc/docs/.vuepress/config/nav.js
+++ b/doc/docs/.vuepress/config/nav.js
@@ -23,5 +23,5 @@ module.exports = [
text: "🚀起飞诶~~起飞",
link: "/pages/1fedc1/",
},
- { text: "更新日志", link: "https://github.com/969025903/ChopperBot/blob/master/CHANGELOG.md" },
+ { text: "更新日志", link: "https://github.com/Geniusay/ChopperBot/blob/master/CHANGELOG.md" },
];
diff --git a/doc/docs/.vuepress/config/themeConfig.js b/doc/docs/.vuepress/config/themeConfig.js
index eef87c4..db90767 100644
--- a/doc/docs/.vuepress/config/themeConfig.js
+++ b/doc/docs/.vuepress/config/themeConfig.js
@@ -6,11 +6,11 @@ module.exports = {
nav,
sidebarDepth: 2,
logo: "/img/logo.svg",
- repo: "969025903/ChopperBot",
+ repo: "Geniusay/ChopperBot",
searchMaxSuggestions: 10,
lastUpdated: "上次更新",
- docsRepo: "/969025903/Chopper-Doc",
+ docsRepo: "/Geniusay/Chopper-Doc",
docsDir: "docs",
docsBranch: "master",
editLinks: true,
@@ -29,7 +29,7 @@ module.exports = {
author: {
name: "Genius",
- href: "https://github.com/969025903"
+ href: "https://github.com/Geniusay"
},
social: {
@@ -37,7 +37,7 @@ module.exports = {
{
iconClass: "icon-github",
title: "GitHub",
- link: "https://github.com/969025903"
+ link: "https://github.com/Geniusay"
},
{
iconClass: "icon-gitee",
@@ -55,13 +55,13 @@ module.exports = {
footer: {
createYear: 2016,
copyrightInfo: [
- 'TimeMachine Lab',
+ 'TimeMachine Lab',
' | ',
'Sponsored by JetBrains',
' | ',
'渝ICP备2021000141号-1',
'友情链接：',
- 'GeniusBlog',
+ 'GeniusBlog',
'
'
].join('')
},
diff --git a/doc/docs/01.指南/01.开发指南/01.快速开发/01.系统架构.md b/doc/docs/01.指南/01.开发指南/01.快速开发/01.系统架构.md
index ff92015..20f3d66 100644
--- a/doc/docs/01.指南/01.开发指南/01.快速开发/01.系统架构.md
+++ b/doc/docs/01.指南/01.开发指南/01.快速开发/01.系统架构.md
@@ -34,7 +34,7 @@ ChopperBot将会创建 **./config根目录**，并在其中安装所有模块的
频繁大量的IO流会使项目性能降低，针对ChopperBot的文件操作我们专门使用了文件缓存技术，来实现项目对文件快速的响应。
## ChopperBot的启动过程
-**代码请见** [InitWorld](https://github.com/969025903/ChopperBot/blob/master/common/src/main/java/org/example/init/InitMachine.java) 👈
+**代码请见** [InitWorld](https://github.com/Geniusay/ChopperBot/blob/master/common/src/main/java/org/example/init/InitMachine.java) 👈
## 项目文件层级关系
diff --git a/doc/docs/03.生态/01.生态.md b/doc/docs/03.生态/01.生态.md
index 4bbd215..3568f10 100644
--- a/doc/docs/03.生态/01.生态.md
+++ b/doc/docs/03.生态/01.生态.md
@@ -10,7 +10,7 @@ article: false
## TML研究所其余作品
- [UltimateCache](https://gitee.com/welsir/ultimate-cache) - 致力于开发一个能够用于实际生产的redis注解缓存(开发中)。
-- [Assistant](https://gitee.com/969025903/Assistant) - 致力于开发一个后端开发的百宝箱。
+- [Assistant](https://gitee.com/Geniusay/Assistant) - 致力于开发一个后端开发的百宝箱。
## 更多优秀开源作品
diff --git a/doc/docs/05.支持/01.支持.md b/doc/docs/05.支持/01.支持.md
index 7e3b687..a8c292e 100644
--- a/doc/docs/05.支持/01.支持.md
+++ b/doc/docs/05.支持/01.支持.md
@@ -11,7 +11,7 @@ editLink: false
如果您正在使用这个项目并感觉良好，或者是想支持我们继续开发，您可以通过如下`任意`方式支持我们：
-1. Star 并向您的朋友推荐或分享 [ChopperBot](https://github.com/969025903/ChopperBot) 🚀
+1. Star 并向您的朋友推荐或分享 [ChopperBot](https://github.com/Geniusay/ChopperBot) 🚀
2. 轻轻点击一次页面右下角(ad) 🙃
3. 通过以下二维码进行一次性捐款，请我喝一杯可乐 🥤
@@ -31,12 +31,12 @@ editLink: false
相关联系方式（添加烦请注明来意）：
-- QQ：[969025903](tencent://message/?uin=969025903&Site=&Menu=yes)
+- QQ：[Geniusay](tencent://message/?uin=Geniusay&Site=&Menu=yes)
- QQ：[燧枫](tencent://message/?uin=369202865&Site=&Menu=yes)
- QQ：[Weisir](tencent://message/?uin=1824379011&Site=&Menu=yes)
- QQ：[脑洞大开](tencent://message/?uin=647831033&Site=&Menu=yes)
- 邮件：[geniusssbg@gmail.com](mailto:geniusssbg@gmail.com)
-- Github：[https://github.com/969025903/ChopperBot](https://github.com/969025903/ChopperBot)
+- Github：[https://github.com/Geniusay/ChopperBot](https://github.com/Geniusay/ChopperBot)
## 致谢
diff --git a/doc/docs/06.快速开始/01.快速开始/01.简介.md b/doc/docs/06.快速开始/01.快速开始/01.简介.md
index a9d7b79..37bb7d8 100644
--- a/doc/docs/06.快速开始/01.快速开始/01.简介.md
+++ b/doc/docs/06.快速开始/01.快速开始/01.简介.md
@@ -5,7 +5,7 @@ permalink: /pages/24112f/
article: false
---
-[ChopperBot](https://github.com/969025903/ChopperBot) 一款全自动的主播切片机器人,支持模块热度分析, 主播热度分析,智能爬取,弹幕视频爬取,弹幕分析, 自动切片,切片分类,自动标题,自动封面,账号打造,账号管理, 多平台上传等功能
+[ChopperBot](https://github.com/Geniusay/ChopperBot) 一款全自动的主播切片机器人,支持模块热度分析, 主播热度分析,智能爬取,弹幕视频爬取,弹幕分析, 自动切片,切片分类,自动标题,自动封面,账号打造,账号管理, 多平台上传等功能
::: tip 愿景
ChopperBot 留下每个主播的精彩片段
:::
@@ -29,12 +29,12 @@ ChopperBot 留下每个主播的精彩片段
## 代码托管
-> **[Gitee](https://gitee.com/sbg-genius/ChopperBot)** | **[Github](https://github.com/969025903/ChopperBot)**
+> **[Gitee](https://gitee.com/sbg-genius/ChopperBot)** | **[Github](https://github.com/Geniusay/ChopperBot)**
## 参与贡献
欢迎各路大佬一起来参与完善 ChopperBot捏，我们期待你的 PR！
-- 贡献代码：代码地址 [ChopperBot](https://github.com/969025903/ChopperBot) ，欢迎提交 Issue 或者 Pull Requests
-- 维护文档：文档地址 [ChopperBot-Doc](https://github.com/969025903/ChopperBot-Doc) ，欢迎参与翻译和修订
+- 贡献代码：代码地址 [ChopperBot](https://github.com/Geniusay/ChopperBot) ，欢迎提交 Issue 或者 Pull Requests
+- 维护文档：文档地址 [ChopperBot-Doc](https://github.com/Geniusay/ChopperBot-Doc) ，欢迎参与翻译和修订
diff --git a/doc/docs/07.技术文档/01.模块文档/01.common/01.目录.md b/doc/docs/07.技术文档/01.模块文档/01.common/01.目录.md
index 9c9ff00..fe9cdbf 100644
--- a/doc/docs/07.技术文档/01.模块文档/01.common/01.目录.md
+++ b/doc/docs/07.技术文档/01.模块文档/01.common/01.目录.md
@@ -4,7 +4,7 @@ date: 2023-05-19 02:09:32
permalink: /pages/e3a691/
---
-[👉 源码](https://github.com/969025903/ChopperBot)
+[👉 源码](https://github.com/Geniusay/ChopperBot)
[[toc]]
diff --git a/doc/docs/07.技术文档/01.模块文档/02.FileModule/01.目录.md b/doc/docs/07.技术文档/01.模块文档/02.FileModule/01.目录.md
index 0afa0f5..59d1dd1 100644
--- a/doc/docs/07.技术文档/01.模块文档/02.FileModule/01.目录.md
+++ b/doc/docs/07.技术文档/01.模块文档/02.FileModule/01.目录.md
@@ -5,7 +5,7 @@ permalink: /pages/779a6e/
article: false
---
-[👉 源码](https://github.com/969025903/ChopperBot)
+[👉 源码](https://github.com/Geniusay/ChopperBot)
[[toc]]
@@ -39,7 +39,7 @@ public void testDelete() throws IOException {
```
- `更多例子可查看test包下面的samples`
-- [FileUtilTest](https://github.com/969025903/ChopperBot/blob/master/FileModule/src/test/java/org/example/util/FileUtilTest.java)
+- [FileUtilTest](https://github.com/Geniusay/ChopperBot/blob/master/FileModule/src/test/java/org/example/util/FileUtilTest.java)
## JsonFileUtil
::: tip 说明
Json文件的操作工具类
@@ -77,4 +77,4 @@ public void writeClassInJsonFile() {
```
- `更多例子可查看test包下面的samples`
-- [JsonFileUtilTest](https://github.com/969025903/ChopperBot/blob/master/FileModule/src/test/java/org/example/util/JsonFileUtilTest.java)
+- [JsonFileUtilTest](https://github.com/Geniusay/ChopperBot/blob/master/FileModule/src/test/java/org/example/util/JsonFileUtilTest.java)
diff --git a/doc/docs/07.技术文档/01.模块文档/02.FileModule/02.FileCache.md b/doc/docs/07.技术文档/01.模块文档/02.FileModule/02.FileCache.md
index 24dc309..9d4657f 100644
--- a/doc/docs/07.技术文档/01.模块文档/02.FileModule/02.FileCache.md
+++ b/doc/docs/07.技术文档/01.模块文档/02.FileModule/02.FileCache.md
@@ -128,4 +128,4 @@ ConfigFile的文件缓存池，负责文件内容的缓存与刷入
### GlobalFileCache
- `更多例子可查看test包下面的samples`
-- [FileCacheTest](https://github.com/969025903/ChopperBot/blob/master/FileModule/src/test/java/org/example/cache/FileCacheTest.java)
+- [FileCacheTest](https://github.com/Geniusay/ChopperBot/blob/master/FileModule/src/test/java/org/example/cache/FileCacheTest.java)
diff --git a/doc/docs/index.md b/doc/docs/index.md
index 4656345..9eccd9c 100644
--- a/doc/docs/index.md
+++ b/doc/docs/index.md
@@ -22,7 +22,7 @@ postList: none
-
+