feat: 更新 重写 新增 删除

修改软件包位置
整理代码
/api/reLogin -> /api/getLoginCount

src/main/java/catx/feitu/coze_discord_bridge/Config/ConfigBotsData.java

@@ -1,4 +1,4 @@
-package catx.feitu.coze_discord_bridge.Config;
+package catx.feitu.coze_discord_bridge.config;
 
 public class ConfigBotsData {
     public String Key = "";

src/main/java/catx/feitu/coze_discord_bridge/Config/ConfigData.java

@@ -1,4 +1,4 @@
-package catx.feitu.coze_discord_bridge.Config;
+package catx.feitu.coze_discord_bridge.config;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/catx/feitu/coze_discord_bridge/Config/ConfigManage.java

@@ -1,6 +1,6 @@
-package catx.feitu.coze_discord_bridge.Config;
+package catx.feitu.coze_discord_bridge.config;
 
-import catx.feitu.coze_discord_bridge.Config.YmalReslove.YamlConfig;
+import catx.feitu.coze_discord_bridge.utils.ymal.YamlConfig;
 import catx.feitu.coze_discord_bridge.Main;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/catx/feitu/coze_discord_bridge/DockerHelper.java

@@ -1,7 +1,7 @@
 package catx.feitu.coze_discord_bridge;
 
-import catx.feitu.coze_discord_bridge.Config.ConfigBotsData;
-import catx.feitu.coze_discord_bridge.Config.ConfigManage;
+import catx.feitu.coze_discord_bridge.config.ConfigBotsData;
+import catx.feitu.coze_discord_bridge.config.ConfigManage;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/catx/feitu/coze_discord_bridge/GPTManage.java

@@ -3,7 +3,7 @@
 import catx.feitu.CozeProxy.CozeGPT;
 import catx.feitu.CozeProxy.CozeGPTConfig;
 import catx.feitu.CozeProxy.utils.ConversationUtils;
-import catx.feitu.coze_discord_bridge.Config.ConfigManage;
+import catx.feitu.coze_discord_bridge.config.ConfigManage;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -12,14 +12,16 @@
 import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class GPTManage {
     private static final Logger logger = LogManager.getLogger(GPTManage.class);
 
-    private static ConcurrentHashMap<Object, CozeGPT> ResponseMap = new ConcurrentHashMap<>();
-    public static void newGPT(String botID, CozeGPTConfig config) throws Exception {
-        CozeGPT GPT = new CozeGPT(config, true);
+    private static final ConcurrentHashMap<Object, CozeGPT> ResponseMap = new ConcurrentHashMap<>();
+    public static int newGPT(String botID, CozeGPTConfig config, List<String> tokens) throws Exception {
+        CozeGPT GPT = new CozeGPT(config);
+        GPT.login(tokens);
         GPT.setMark(botID);
         if (!config.Disable_2000Limit_Unlock) {
             if (new File("conversation_" + botID + ".json").exists()) {
@@ -29,6 +31,7 @@ public static void newGPT(String botID, CozeGPTConfig config) throws Exception {
             }
         }
         ResponseMap.put(botID, GPT);
+        return GPT.getLoginCount();
     }
     public static CozeGPT getGPT(String botID) throws NullPointerException {
         if (!ResponseMap.containsKey(botID)) {
@@ -40,7 +43,7 @@ public static void deleteGPT(String botID) {
         try {
             CozeGPT GPT = ResponseMap.get(botID);
             try {
-                GPT.disconnect();
+                GPT.disconnectAll();
             } catch (Exception ignored) { }
             Files.writeString(new File("conversation_" + botID + ".json").toPath(), ConversationUtils.conversation2JsonString(GPT.data.conversations));
             ResponseMap.remove(botID);

src/main/java/catx/feitu/coze_discord_bridge/HttpServer/HttpServerManage.java

@@ -1,10 +1,10 @@
 package catx.feitu.coze_discord_bridge.HttpServer;
 
-import catx.feitu.coze_discord_bridge.Config.ConfigManage;
+import catx.feitu.coze_discord_bridge.config.ConfigManage;
 import catx.feitu.coze_discord_bridge.GPTManage;
 import catx.feitu.coze_discord_bridge.HttpServer.api.Ping;
 import catx.feitu.coze_discord_bridge.HttpServer.api.api.*;
-import catx.feitu.coze_discord_bridge.HttpServer.api.api.Protocol.ReLogin;
+import catx.feitu.coze_discord_bridge.HttpServer.api.api.Protocol.GetLoginCount;
 import catx.feitu.coze_discord_bridge.HttpServer.api.index;
 import catx.feitu.coze_discord_bridge.HttpServer.api.robots;
 import catx.feitu.coze_discord_bridge.HttpServer.api.v1.Models;
@@ -133,7 +133,7 @@ public void configure(HttpsParameters params) {
         AddAPI("/api/Keepalive", new Keepalive(), true);
         AddAPI("/api/GetConversations", new GetConversations(), true);
 
-        AddAPI("/api/protocol/ReLogin", new ReLogin(), true);
+        AddAPI("/api/protocol/GetLoginCount", new GetLoginCount(), true);
 
         AddAPI("/v1/models", new Models(), true);
         AddAPI("/v1/chat/Completions", new Completions(), true);

src/main/java/catx/feitu/coze_discord_bridge/HttpServer/api/api/CreateConversation.java

@@ -5,7 +5,7 @@
 import catx.feitu.coze_discord_bridge.HttpServer.ResponseType;
 import com.alibaba.fastjson.JSONObject;
 
-import static catx.feitu.coze_discord_bridge.Misc.Random.RandomName;
+import static catx.feitu.coze_discord_bridge.utils.RandomUtils.RandomName;
 
 public class CreateConversation implements APIHandler {
 

src/main/java/catx/feitu/coze_discord_bridge/HttpServer/api/api/DeleteConversation.java

@@ -5,7 +5,7 @@
 import catx.feitu.coze_discord_bridge.HttpServer.ResponseType;
 import com.alibaba.fastjson.JSONObject;
 
-import static catx.feitu.coze_discord_bridge.Misc.Random.RandomName;
+import static catx.feitu.coze_discord_bridge.utils.RandomUtils.RandomName;
 
 public class DeleteConversation implements APIHandler {
 

src/main/java/catx/feitu/coze_discord_bridge/HttpServer/api/api/Protocol/GetLoginCount.java

@@ -0,0 +1,24 @@
+package catx.feitu.coze_discord_bridge.HttpServer.api.api.Protocol;
+
+import catx.feitu.coze_discord_bridge.HttpServer.APIHandler;
+import catx.feitu.coze_discord_bridge.HttpServer.HandleType;
+import catx.feitu.coze_discord_bridge.HttpServer.ResponseType;
+import com.alibaba.fastjson.JSONObject;
+
+public class GetLoginCount implements APIHandler {
+    @Override
+    public ResponseType handle(HandleType Handle) {
+        ResponseType Response = new ResponseType();
+        JSONObject json = new JSONObject(true);
+
+        Response.code = 200;
+        json.put("code", 200);
+        json.put("message", "获取成功");
+        JSONObject json_data = new JSONObject(true);
+        json_data.put("count", Handle.CozeGPT.getLoginCount());
+        json.put("data", json_data);
+
+        Response.msg = json.toJSONString();
+        return Response;
+    }
+}

src/main/java/catx/feitu/coze_discord_bridge/HttpServer/api/v1/chat/Completions.java

@@ -2,7 +2,7 @@
 
 import catx.feitu.CozeProxy.exception.InvalidConversationException;
 import catx.feitu.CozeProxy.impl.GenerateMessage;
-import catx.feitu.coze_discord_bridge.Config.ConfigManage;
+import catx.feitu.coze_discord_bridge.config.ConfigManage;
 import catx.feitu.coze_discord_bridge.HttpServer.APIHandler;
 import catx.feitu.coze_discord_bridge.HttpServer.HandleType;
 import catx.feitu.coze_discord_bridge.HttpServer.ResponseType;

src/main/java/catx/feitu/coze_discord_bridge/HttpServer/api/v1/images/Generations.java

@@ -2,7 +2,7 @@
 
 import catx.feitu.CozeProxy.exception.InvalidConversationException;
 import catx.feitu.CozeProxy.impl.GenerateMessage;
-import catx.feitu.coze_discord_bridge.Config.ConfigManage;
+import catx.feitu.coze_discord_bridge.config.ConfigManage;
 import catx.feitu.coze_discord_bridge.HttpServer.APIHandler;
 import catx.feitu.coze_discord_bridge.HttpServer.HandleType;
 import catx.feitu.coze_discord_bridge.HttpServer.ResponseType;

src/main/java/catx/feitu/coze_discord_bridge/KeepaliveTimer.java

@@ -1,5 +1,5 @@
 package catx.feitu.coze_discord_bridge;
-import catx.feitu.coze_discord_bridge.Config.ConfigManage;
+import catx.feitu.coze_discord_bridge.config.ConfigManage;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

src/main/java/catx/feitu/coze_discord_bridge/Main.java

@@ -1,9 +1,10 @@
 package catx.feitu.coze_discord_bridge;
 
 import catx.feitu.CozeProxy.CozeGPTConfig;
-import catx.feitu.coze_discord_bridge.Config.ConfigBotsData;
-import catx.feitu.coze_discord_bridge.Config.ConfigManage;
+import catx.feitu.coze_discord_bridge.config.ConfigBotsData;
+import catx.feitu.coze_discord_bridge.config.ConfigManage;
 import catx.feitu.coze_discord_bridge.HttpServer.HttpServerManage;
+import catx.feitu.coze_discord_bridge.utils.JdkUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.fusesource.jansi.AnsiConsole;
@@ -12,16 +13,15 @@
 import java.net.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 
 
+
 public class Main {
     private static final Logger logger = LogManager.getLogger(Main.class);
 
     public static void main(String[] args) {
-        AnsiConsole.systemInstall();
-        try {
+         AnsiConsole.systemInstall();
          try {
             if (JdkUtils.getJdkVersion() < 11) {
                 throw new Exception("当前JDK版本过低 推荐使用17或更高版本");
@@ -57,7 +57,6 @@ public static void main(String[] args) {
                         throw new Exception("无效的Token");
                     }
                     GPTConfig.loginApp = BotData.Protocol;
-                    GPTConfig.token = new ArrayList<>(Arrays.asList((BotData.Token.split(","))));
                     GPTConfig.serverID = BotData.Server_id;
                     GPTConfig.Discord_CreateChannel_Category =  BotData.CreateChannel_Category;
                     GPTConfig.botID = BotData.CozeBot_id;
@@ -76,8 +75,11 @@ public static void main(String[] args) {
                     }
 
                     logger.info("[" + BotData.Key + "] 开始登录流程..");
-                    GPTManage.newGPT(BotData.Key, GPTConfig);
-                    logger.info("[" + BotData.Key + "] 初始化成功 Token数:" +GPTConfig.token.size());
+                    int LoginCount = GPTManage.newGPT(BotData.Key, GPTConfig, new ArrayList<>(Arrays.asList((BotData.Token.split(",")))));
+                    if (LoginCount == 0) {
+                        throw new Exception("无有效登录信息");
+                    }
+                    logger.info("[" + BotData.Key + "] 初始化成功 账号数:" + LoginCount);
                     successOne = true;
                 } catch (Exception e){
                     logger.error("[" + BotData.Key + "] 初始化失败", e);

src/main/java/catx/feitu/coze_discord_bridge/Misc/Random.java → src/main/java/catx/feitu/coze_discord_bridge/utils/RandomUtils.java

@@ -1,6 +1,6 @@
-package catx.feitu.coze_discord_bridge.Misc;
+package catx.feitu.coze_discord_bridge.utils;
 
-public class Random {
+public class RandomUtils {
     public static String RandomName() {
         java.util.Random random = new java.util.Random();
         StringBuilder sb = new StringBuilder(16);

src/main/java/catx/feitu/coze_discord_bridge/Config/YmalReslove/ReadFile.java → src/main/java/catx/feitu/coze_discord_bridge/utils/ymal/ReadFile.java

@@ -1,4 +1,4 @@
-package catx.feitu.coze_discord_bridge.Config.YmalReslove;
+package catx.feitu.coze_discord_bridge.utils.ymal;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/catx/feitu/coze_discord_bridge/Config/YmalReslove/YamlConfig.java → src/main/java/catx/feitu/coze_discord_bridge/utils/ymal/YamlConfig.java

@@ -1,4 +1,4 @@
-package catx.feitu.coze_discord_bridge.Config.YmalReslove;
+package catx.feitu.coze_discord_bridge.utils.ymal;
 
 import com.esotericsoftware.yamlbeans.YamlException;
 import com.esotericsoftware.yamlbeans.YamlReader;