Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
refactor: HttpServer -> server
Browse files Browse the repository at this point in the history
  • Loading branch information
@NahidaLing
NahidaLing committed Apr 25, 2024
1 parent 7a67008 commit 912d8da
Show file tree
Hide file tree
Showing 22 changed files with 84 additions and 84 deletions.
2 changes: 1 addition & 1 deletion src/main/java/catx/feitu/coze_discord_bridge/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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.HttpServer.HttpServerManage;
import catx.feitu.coze_discord_bridge.server.HttpServerManage;
import catx.feitu.coze_discord_bridge.utils.JdkUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...discord_bridge/HttpServer/APIHandler.java → ...oze_discord_bridge/server/APIHandler.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package catx.feitu.coze_discord_bridge.HttpServer;
package catx.feitu.coze_discord_bridge.server;



Expand Down
2 changes: 1 addition & 1 deletion ...discord_bridge/HttpServer/HandleType.java → ...oze_discord_bridge/server/HandleType.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package catx.feitu.coze_discord_bridge.HttpServer;
package catx.feitu.coze_discord_bridge.server;

import catx.feitu.CozeProxy.CozeGPT;
import com.alibaba.fastjson.JSONObject;
Expand Down
22 changes: 11 additions & 11 deletions ...d_bridge/HttpServer/HttpServerManage.java → ...scord_bridge/server/HttpServerManage.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package catx.feitu.coze_discord_bridge.HttpServer;
package catx.feitu.coze_discord_bridge.server;

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.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;
import catx.feitu.coze_discord_bridge.HttpServer.api.v1.chat.Completions;
import catx.feitu.coze_discord_bridge.HttpServer.api.v1.images.Generations;
import catx.feitu.coze_discord_bridge.server.api.Ping;
import catx.feitu.coze_discord_bridge.server.api.api.*;
import catx.feitu.coze_discord_bridge.server.api.api.Protocol.GetLoginCount;
import catx.feitu.coze_discord_bridge.server.api.index;
import catx.feitu.coze_discord_bridge.server.api.robots;
import catx.feitu.coze_discord_bridge.server.api.v1.Models;
import catx.feitu.coze_discord_bridge.server.api.v1.chat.Completions;
import catx.feitu.coze_discord_bridge.server.api.v1.images.Generations;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.sun.net.httpserver.*;
Expand All @@ -34,8 +34,8 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;

import static catx.feitu.coze_discord_bridge.HttpServer.HttpServerManage.APIS;
import static catx.feitu.coze_discord_bridge.HttpServer.HttpServerManage.ProtectPaths;
import static catx.feitu.coze_discord_bridge.server.HttpServerManage.APIS;
import static catx.feitu.coze_discord_bridge.server.HttpServerManage.ProtectPaths;

public class HttpServerManage {

Expand Down
2 changes: 1 addition & 1 deletion ...scord_bridge/HttpServer/ResponseType.java → ...e_discord_bridge/server/ResponseType.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package catx.feitu.coze_discord_bridge.HttpServer;
package catx.feitu.coze_discord_bridge.server;

public class ResponseType {
public int code = 200;
Expand Down
10 changes: 5 additions & 5 deletions ...e_discord_bridge/HttpServer/api/Ping.java → .../coze_discord_bridge/server/api/Ping.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package catx.feitu.coze_discord_bridge.HttpServer.api;
package catx.feitu.coze_discord_bridge.server.api;

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 catx.feitu.coze_discord_bridge.HttpServer.api.api.GetLatestMessage;
import catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import catx.feitu.coze_discord_bridge.server.api.api.GetLatestMessage;
import com.alibaba.fastjson.JSONObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
8 changes: 4 additions & 4 deletions ...scord_bridge/HttpServer/api/api/Chat.java → ...e_discord_bridge/server/api/api/Chat.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

import catx.feitu.CozeProxy.impl.GPTFile;
import catx.feitu.CozeProxy.impl.GenerateMessage;
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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

import java.util.ArrayList;
Expand Down
8 changes: 4 additions & 4 deletions ...bridge/HttpServer/api/api/ChatStream.java → ...ord_bridge/server/api/api/ChatStream.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

import catx.feitu.CozeProxy.impl.GPTFile;
import catx.feitu.CozeProxy.impl.GenerateMessage;
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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

import java.io.OutputStream;
Expand Down
8 changes: 4 additions & 4 deletions ...tpServer/api/api/ConversationIsFound.java → ...e/server/api/api/ConversationIsFound.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

import catx.feitu.CozeProxy.exception.InvalidConversationException;
import catx.feitu.CozeProxy.impl.ConversationInfo;
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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

public class ConversationIsFound implements APIHandler {
Expand Down
8 changes: 4 additions & 4 deletions ...ttpServer/api/api/CreateConversation.java → ...ge/server/api/api/CreateConversation.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

import static catx.feitu.coze_discord_bridge.utils.RandomUtils.RandomName;
Expand Down
8 changes: 4 additions & 4 deletions ...ttpServer/api/api/DeleteConversation.java → ...ge/server/api/api/DeleteConversation.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

import static catx.feitu.coze_discord_bridge.utils.RandomUtils.RandomName;
Expand Down
8 changes: 4 additions & 4 deletions .../HttpServer/api/api/GetConversations.java → ...idge/server/api/api/GetConversations.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

public class GetConversations implements APIHandler {
Expand Down
8 changes: 4 additions & 4 deletions .../HttpServer/api/api/GetLatestMessage.java → ...idge/server/api/api/GetLatestMessage.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

public class GetLatestMessage implements APIHandler {
Expand Down
8 changes: 4 additions & 4 deletions ...ridge/HttpServer/api/api/IsBotOnline.java → ...rd_bridge/server/api/api/IsBotOnline.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

public class IsBotOnline implements APIHandler {
Expand Down
8 changes: 4 additions & 4 deletions ..._bridge/HttpServer/api/api/Keepalive.java → ...cord_bridge/server/api/api/Keepalive.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

import catx.feitu.coze_discord_bridge.GPTManage;
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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

public class Keepalive implements APIHandler {
Expand Down
8 changes: 4 additions & 4 deletions ...erver/api/api/Protocol/GetLoginCount.java → ...erver/api/api/Protocol/GetLoginCount.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api.Protocol;
package catx.feitu.coze_discord_bridge.server.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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

public class GetLoginCount implements APIHandler {
Expand Down
8 changes: 4 additions & 4 deletions ...ttpServer/api/api/RenameConversation.java → ...ge/server/api/api/RenameConversation.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.api;
package catx.feitu.coze_discord_bridge.server.api.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

public class RenameConversation implements APIHandler {
Expand Down
8 changes: 4 additions & 4 deletions ..._discord_bridge/HttpServer/api/index.java → ...coze_discord_bridge/server/api/index.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api;
package catx.feitu.coze_discord_bridge.server.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONObject;

import java.time.Instant;
Expand Down
8 changes: 4 additions & 4 deletions ...discord_bridge/HttpServer/api/robots.java → ...oze_discord_bridge/server/api/robots.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api;
package catx.feitu.coze_discord_bridge.server.api;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;

public class robots implements APIHandler {

Expand Down
8 changes: 4 additions & 4 deletions ...cord_bridge/HttpServer/api/v1/Models.java → ..._discord_bridge/server/api/v1/Models.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.v1;
package catx.feitu.coze_discord_bridge.server.api.v1;

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 catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

Expand Down
8 changes: 4 additions & 4 deletions ...e/HttpServer/api/v1/chat/Completions.java → ...ridge/server/api/v1/chat/Completions.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.v1.chat;
package catx.feitu.coze_discord_bridge.server.api.v1.chat;

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.HttpServer.APIHandler;
import catx.feitu.coze_discord_bridge.HttpServer.HandleType;
import catx.feitu.coze_discord_bridge.HttpServer.ResponseType;
import catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.apache.logging.log4j.LogManager;
Expand Down
8 changes: 4 additions & 4 deletions ...HttpServer/api/v1/images/Generations.java → ...dge/server/api/v1/images/Generations.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package catx.feitu.coze_discord_bridge.HttpServer.api.v1.images;
package catx.feitu.coze_discord_bridge.server.api.v1.images;

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.HttpServer.APIHandler;
import catx.feitu.coze_discord_bridge.HttpServer.HandleType;
import catx.feitu.coze_discord_bridge.HttpServer.ResponseType;
import catx.feitu.coze_discord_bridge.server.APIHandler;
import catx.feitu.coze_discord_bridge.server.HandleType;
import catx.feitu.coze_discord_bridge.server.ResponseType;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

Expand Down

0 comments on commit 912d8da

Please sign in to comment.