diff --git a/rearServer/.idea/misc.xml b/rearServer/.idea/misc.xml index 02fce0c..e68a673 100644 --- a/rearServer/.idea/misc.xml +++ b/rearServer/.idea/misc.xml @@ -1,3 +1,4 @@ + - + \ No newline at end of file diff --git a/rearServer/pom.xml b/rearServer/pom.xml index e80ad7a..f5c3b3e 100644 --- a/rearServer/pom.xml +++ b/rearServer/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.15 + 3.2.1 com.yyandywt99 @@ -14,7 +14,7 @@ pandoraNext pandoraNext - 11 + 17 @@ -43,6 +43,12 @@ jjwt 0.9.1 + + + javax.xml.bind + jaxb-api + 2.3.1 + org.springframework.boot @@ -59,11 +65,10 @@ docker-java 3.2.10 - + - com.github.plexpt - chatgpt - 4.3.0 + com.squareup.okhttp3 + okhttp diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/aop/LogAspect.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/aop/LogAspect.java index ac701b0..885778e 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/aop/LogAspect.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/aop/LogAspect.java @@ -42,10 +42,10 @@ public void recordLog() { log.info(controller.reloadContainer().toString()); } catch (Exception e) { e.printStackTrace(); - log.info("热重载失败！"); + log.error("热重载失败！"); } } else { - log.info("热重载未开启！"); + log.error("热重载未开启！"); } } } diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ChatCompletionResult.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ChatCompletionResult.java deleted file mode 100644 index 0700448..0000000 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ChatCompletionResult.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.tokensTool.pandoraNext.chat; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ChatCompletionResult { - - private String id; - - private String object; - - private Long created; - - private String model; - - private List choices; - - private Usage usage; - - private String system_fingerprint; - -} diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Choice.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Choice.java deleted file mode 100644 index 9769c8f..0000000 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Choice.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.tokensTool.pandoraNext.chat; - -import com.plexpt.chatgpt.entity.chat.Message; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class Choice { - - private long index; - - private Message message; - - private String finish_reason; - -} diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentChoice.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentChoice.java deleted file mode 100644 index 8fa5921..0000000 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentChoice.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.tokensTool.pandoraNext.chat; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ContentChoice { - - private String text; - - - private int index; - - - private String logprobs; - - - private String finish_reason; - - -} diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentCompletion.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentCompletion.java deleted file mode 100644 index 50af490..0000000 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentCompletion.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.tokensTool.pandoraNext.chat; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ContentCompletion { - - /** - * 指定要使用的模型 - */ - private String model; - - - /** - * 提供一个文本片段，作为模型生成文本的启动点或上下文 - */ - private String prompt; - - - /** - * 限制生成文本的最大长度，以一定数量的 tokens（标记）为单位。 - */ - private int max_tokens; - - - /** - * 控制生成文本的创造性，较高的值增加随机性，较低的值使生成更加确定性。 - */ - private int temperature; - - - /** - * 仅考虑概率累积最高的 tokens，而忽略其他概率较低的 tokens。 - */ - private int top_p; - - - /** - * 生成多少个不同的文本样本。 - */ - private int n; - - - /** - * 指定是否启用流式传输，即是否在生成文本时逐步接收输出。 - */ - private Boolean stream; - - - /** - * 是否返回每个 token 的对数概率。 - */ - private String logprobs; - - - /** - * 指定在生成文本时的停止条件，即遇到哪个字符串时停止生成。 - */ - private String stop; - -} diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentResult.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentResult.java deleted file mode 100644 index d9a02b1..0000000 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentResult.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.tokensTool.pandoraNext.chat; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - - -/** - * 内容补全返回结果 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ContentResult { - - private String id; - - private String object; - - private Long created; - - private String model; - - private List choices; - - private Usage usage; - -} diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Conversation.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Conversation.java index 963b442..80aab80 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Conversation.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Conversation.java @@ -1,7 +1,6 @@ package com.tokensTool.pandoraNext.chat; import com.fasterxml.jackson.annotation.JsonProperty; -import com.plexpt.chatgpt.entity.chat.Message; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Message.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Message.java new file mode 100644 index 0000000..61dc01e --- /dev/null +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Message.java @@ -0,0 +1,63 @@ +package com.tokensTool.pandoraNext.chat; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.*; + +/** + * @author plexpt + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +public class Message { + /** + * 目前支持三种角色参考官网，进行情景输入：https://platform.openai.com/docs/guides/chat/introduction + */ + private String role; + private String content; + private String name; + + + public Message(String role, String content) { + this.role = role; + this.content = content; + } + + public static Message of(String content) { + + return new Message(Message.Role.USER.getValue(), content); + } + + public static Message ofSystem(String content) { + + return new Message(Role.SYSTEM.getValue(), content); + } + + public static Message ofAssistant(String content) { + + return new Message(Role.ASSISTANT.getValue(), content); + } + + public static Message ofFunction(String function) { + + return new Message(Role.FUNCTION.getValue(), function); + } + + @Getter + @AllArgsConstructor + public enum Role { + + SYSTEM("system"), + USER("user"), + ASSISTANT("assistant"), + + FUNCTION("function"), + ; + private String value; + } + +} diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Usage.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Usage.java deleted file mode 100644 index 24258fd..0000000 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Usage.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.tokensTool.pandoraNext.chat; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class Usage { - - /** - * 提示词消耗的tokens - */ - @JsonProperty("prompt_tokens") - private long promptTokens; - - /** - * 回答消耗的tokens - */ - @JsonProperty("completion_tokens") - private long completionTokens; - - /** - * 本次对话消耗的tokens - */ - @JsonProperty("total_tokens") - private long totalTokens; - - -} diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java index eefcdb3..8765874 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java @@ -268,7 +268,7 @@ public Result reloadContainer() { try { int exitCode = reloadProcess.waitFor(); if (exitCode != 0) { - log.info("无法重载PandoraNext服务"); + log.error("无法重载PandoraNext服务"); return Result.success("无法重载PandoraNext服务"); } return Result.success("重置PandoraNext服务成功！"); @@ -305,11 +305,11 @@ public void restartContainer(String containerName) { throw new RuntimeException(e); } } catch (Exception e) { - log.info("无法重启PandoraNext服务"); + log.error("无法重启PandoraNext服务"); throw new RuntimeException(e); } } else { - log.info("jar包填错信息"); + log.error("jar包填错信息"); } } @@ -336,10 +336,10 @@ public void closeRelease(String containName) { throw new RuntimeException(e); } if (exitCode != 0) { - log.info("无法关闭PandoraNext服务"); + log.error("无法关闭PandoraNext服务"); throw new RuntimeException("无法关闭PandoraNext服务"); } - log.info("关闭PandoraNext服务成功！"); + log.error("关闭PandoraNext服务成功！"); } catch (Exception e) { throw new RuntimeException(); } @@ -364,7 +364,7 @@ public void openRelease(String containerName) { Process startProcess = executeCommand(startCommand); int exitCode = startProcess.waitFor(); if (exitCode != 0) { - log.info("无法启动PandoraNext服务"); + log.error("无法启动PandoraNext服务"); throw new RuntimeException("无法启动PandoraNext服务"); } log.info("启动PandoraNext服务成功！"); @@ -384,7 +384,7 @@ public void docker(String containerName, String way) { Process process = executeCommand(dockerCommand); int exitCode = process.waitFor(); if (exitCode != 0) { - log.info("无法" + way + "PandoraNext服务"); + log.error("无法" + way + "PandoraNext服务"); throw new RuntimeException("无法" + way + "PandoraNext服务"); } log.info(way + "PandoraNext服务"); @@ -403,7 +403,7 @@ public Process executeCommand(String command) { ProcessBuilder processBuilder = new ProcessBuilder("bash", "-c", command); return processBuilder.start(); } catch (Exception e) { - throw new RuntimeException(); + throw new RuntimeException("重载失败！"); } } diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/autoTokenController.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/autoTokenController.java index fc5421d..45be567 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/autoTokenController.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/autoTokenController.java @@ -47,7 +47,7 @@ public void toUpdateToken() { } catch (Exception e) { e.printStackTrace(); } - log.info(Result.error("自动检查更新access_token,share_token和pool_token失败").toString()); + log.warn(Result.error("自动检查更新access_token,share_token和pool_token失败").toString()); } /** diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/chatController.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/chatController.java index 176ae61..cd9850d 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/chatController.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/chatController.java @@ -7,6 +7,8 @@ import com.tokensTool.pandoraNext.chat.Conversation; import com.tokensTool.pandoraNext.pojo.Result; import com.tokensTool.pandoraNext.pojo.modelsUsage; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import okhttp3.*; import org.apache.commons.lang.StringUtils; @@ -20,8 +22,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.*; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -67,7 +67,7 @@ public class chatController { @Value("${copilot_interface}") private boolean copilot_interface; - private ExecutorService executor = new ThreadPoolExecutor(0, 1000, + private ExecutorService executor = new ThreadPoolExecutor(0, 100, 60L, TimeUnit.SECONDS, new SynchronousQueue()); @@ -113,9 +113,11 @@ private void clearModelsUsage() { * @throws IOException */ @PostMapping(value = "/v1/chat/completions") - public Object coPilotConversation(HttpServletResponse response, HttpServletRequest request, @org.springframework.web.bind.annotation.RequestBody Conversation conversation) throws ExecutionException, InterruptedException { - Future future = executor.submit(() -> { - try { + public Object coPilotConversation(HttpServletResponse response, HttpServletRequest request, + @org.springframework.web.bind.annotation.RequestBody Conversation conversation) { + try { + Future future = executor.submit(() -> { + if (conversation == null) { return new ResponseEntity<>("Request body is missing or not in JSON format", HttpStatus.BAD_REQUEST); } @@ -157,7 +159,7 @@ public Object coPilotConversation(HttpServletResponse response, HttpServletReque } copilotTokenList.put(apiKey, token); log.info("coCopilotTokenList重置化成功！"); - coPilotConversation(response, request, conversation); + againConversation(response, conversation, token); return null; } // 流式和非流式输出 @@ -165,14 +167,47 @@ public Object coPilotConversation(HttpServletResponse response, HttpServletReque addModel(conversation); } return null; - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - return future.get(); + }); + return future.get(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } } + public Object againConversation(HttpServletResponse response, + @org.springframework.web.bind.annotation.RequestBody Conversation conversation, + String token) { + try { + OkHttpClient client = productClient(5); + Map headersMap = new HashMap<>(); + //添加头部 + addHeader(headersMap, token); + String json = JSON.toJSONString(conversation); + // 创建一个 RequestBody 对象 + MediaType JSON = MediaType.get("application/json; charset=utf-8"); + RequestBody requestBody = RequestBody.create(json, JSON); + Request.Builder requestBuilder = new Request.Builder() + .url("https://api.githubcopilot.com/chat/completions") + .post(requestBody); + headersMap.forEach(requestBuilder::addHeader); + Request streamRequest = requestBuilder.build(); + try (Response resp = client.newCall(streamRequest).execute()) { + if (!resp.isSuccessful()) { + return new ResponseEntity<>("copilot/cocopilot APIKey is wrong Or your network is wrong", HttpStatus.UNAUTHORIZED); + } + // 流式和非流式输出 + outPutChat(response, resp, conversation); + addModel(conversation); + } + return null; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + /** * 请求体不是json 会报Request body is missing or not in JSON format * Authorization token缺失 会报Authorization header is missing @@ -188,8 +223,9 @@ public Object coPilotConversation(HttpServletResponse response, HttpServletReque @PostMapping(value = "/cocopilot/v1/chat/completions") public Object coCoPilotConversation(HttpServletResponse response, HttpServletRequest request, @org.springframework.web.bind.annotation.RequestBody Conversation conversation) throws ExecutionException, InterruptedException { - Future future = executor.submit(() -> { - try { + try { + Future future = executor.submit(() -> { + if (conversation == null) { return new ResponseEntity<>("Request body is missing or not in JSON format", HttpStatus.BAD_REQUEST); } @@ -203,7 +239,7 @@ public Object coCoPilotConversation(HttpServletResponse response, HttpServletReq if (!coCopilotTokenList.containsKey(apiKey)) { String token = getCoCoToken(apiKey); if (token == null) { - return new ResponseEntity<>("copilot APIKey is wrong", HttpStatus.UNAUTHORIZED); + return new ResponseEntity<>("cocopilot APIKey is wrong", HttpStatus.UNAUTHORIZED); } coCopilotTokenList.put(apiKey, token); log.info("coCopilotTokenList初始化成功！"); @@ -227,11 +263,11 @@ public Object coCoPilotConversation(HttpServletResponse response, HttpServletReq if (!resp.isSuccessful()) { String token = getCoCoToken(apiKey); if (token == null) { - return new ResponseEntity<>("copilot APIKey is wrong", HttpStatus.UNAUTHORIZED); + return new ResponseEntity<>("cocopilot APIKey is wrong", HttpStatus.UNAUTHORIZED); } coCopilotTokenList.put(apiKey, token); log.info("coCopilotTokenList重置化成功！"); - coCoPilotConversation(response, request, conversation); + againConversation(response, conversation, token); return null; } // 流式和非流式输出 @@ -239,11 +275,14 @@ public Object coCoPilotConversation(HttpServletResponse response, HttpServletReq addModel(conversation); } return null; - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - return future.get(); + + }); + return future.get(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } } @@ -260,9 +299,9 @@ public Object coCoPilotConversation(HttpServletResponse response, HttpServletReq * @throws IOException */ @PostMapping(value = "/v1/embeddings") - public Object coPilotEmbeddings(HttpServletResponse response, HttpServletRequest request, @org.springframework.web.bind.annotation.RequestBody Object conversation) throws ExecutionException, InterruptedException { - Future future = executor.submit(() -> { - try { + public Object coPilotEmbeddings(HttpServletResponse response, HttpServletRequest request, @org.springframework.web.bind.annotation.RequestBody Object conversation) { + try { + Future future = executor.submit(() -> { if (conversation == null) { return new ResponseEntity<>("Request body is missing or not in JSON format", HttpStatus.BAD_REQUEST); } @@ -318,28 +357,31 @@ public Object coPilotEmbeddings(HttpServletResponse response, HttpServletRequest } } return null; - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - return future.get(); + + }); + return future.get(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } } @PostMapping(value = "/cocopilot/v1/embeddings") - public Object coCoPilotEmbeddings(HttpServletResponse response, HttpServletRequest request, @org.springframework.web.bind.annotation.RequestBody Object conversation) throws ExecutionException, InterruptedException { - Future future = executor.submit(() -> { - if (conversation == null) { - return new ResponseEntity<>("Request body is missing or not in JSON format", HttpStatus.BAD_REQUEST); - } - String authorizationHeader = StringUtils.trimToNull(request.getHeader("Authorization")); - String apiKey; - if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { - apiKey = authorizationHeader.substring(7); - } else { - return new ResponseEntity<>("Authorization header is missing", HttpStatus.UNAUTHORIZED); - } - try { + public Object coCoPilotEmbeddings(HttpServletResponse response, HttpServletRequest request, @org.springframework.web.bind.annotation.RequestBody Object conversation) { + try { + Future future = executor.submit(() -> { + if (conversation == null) { + return new ResponseEntity<>("Request body is missing or not in JSON format", HttpStatus.BAD_REQUEST); + } + String authorizationHeader = StringUtils.trimToNull(request.getHeader("Authorization")); + String apiKey; + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + apiKey = authorizationHeader.substring(7); + } else { + return new ResponseEntity<>("Authorization header is missing", HttpStatus.UNAUTHORIZED); + } if (!coCopilotTokenList.containsKey(apiKey)) { String token = getCoCoToken(apiKey); if (token == null) { @@ -384,13 +426,20 @@ public Object coCoPilotEmbeddings(HttpServletResponse response, HttpServletReque } } return null; - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - return future.get(); + }); + return future.get(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } } + /** + * 添加模型，用于监控 + * + * @param conversation + */ private void addModel(Conversation conversation) { String model = conversation.getModel(); if (modelsUsage.containsKey(model)) { @@ -400,6 +449,11 @@ private void addModel(Conversation conversation) { } } + /** + * 获取用量 + * + * @return + */ @GetMapping(value = "api/modelsUsage") private Result getModelUsage() { try { @@ -411,6 +465,13 @@ private Result getModelUsage() { } } + /** + * 用于copilot——ghu或gho 拿到token + * + * @param apiKey + * @return + * @throws IOException + */ private String getCopilotToken(String apiKey) throws IOException { OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() @@ -434,6 +495,13 @@ private String getCopilotToken(String apiKey) throws IOException { } } + /** + * 用于cocopilot——ccu 拿到token + * + * @param apiKey + * @return + * @throws IOException + */ private String getCoCoToken(String apiKey) throws IOException { OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() @@ -457,28 +525,38 @@ private String getCoCoToken(String apiKey) throws IOException { } } + + /** + * copilot的模型 + * + * @return + * @throws JsonProcessingException + */ @GetMapping("/v1/models") public JsonNode models() throws JsonProcessingException { String jsonString = models; return new ObjectMapper().readTree(jsonString); } + /** + * cocopilot的模型 + * + * @return + * @throws JsonProcessingException + */ @GetMapping("/cocopilot/v1/models") public JsonNode cocoPilotModels() throws JsonProcessingException { String jsonString = models; return new ObjectMapper().readTree(jsonString); } - private void addEmbeddingsHeader(Map headersMap, String chat_token) { - headersMap.put("Host", "api.githubcopilot.com"); - headersMap.put("Accept-Encoding", "gzip, deflate, br"); - headersMap.put("Accept", "*/*"); - headersMap.put("Authorization", "Bearer " + chat_token); - headersMap.put("X-Request-Id", UUID.randomUUID().toString()); - headersMap.put("X-Github-Api-Version", "2023-07-07"); - headersMap.put("Editor-Version", "vscode/1.85.0"); - } + /** + * 提问请求头 + * + * @param headersMap + * @param chat_token + */ private void addHeader(Map headersMap, String chat_token) { headersMap.put("Host", "api.githubcopilot.com"); headersMap.put("Accept-Encoding", "gzip, deflate, br"); @@ -496,6 +574,13 @@ private void addHeader(Map headersMap, String chat_token) { headersMap.put("User-Agent", "GitHubCopilotChat/0.11.1"); } + /** + * chat接口的输出 + * + * @param response + * @param resp + * @param conversation + */ private void outPutChat(HttpServletResponse response, Response resp, Conversation conversation) { try { Boolean isStream = conversation.getStream(); @@ -534,6 +619,12 @@ private void outPutChat(HttpServletResponse response, Response resp, Conversatio } } + /** + * Embeddings接口的输出 + * + * @param response + * @param resp + */ private void outPutEmbeddings(HttpServletResponse response, Response resp) { try { response.setContentType("application/json; charset=utf-8"); @@ -551,7 +642,13 @@ private void outPutEmbeddings(HttpServletResponse response, Response resp) { } } - + /** + * 建立连接，放在超时 + * 默认超时时间为5分钟 + * + * @param timeout + * @return + */ public OkHttpClient productClient(Integer timeout) { try { OkHttpClient.Builder builder = new OkHttpClient.Builder(); diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/loginColltroller.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/loginColltroller.java index ae38e20..b70b737 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/loginColltroller.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/loginColltroller.java @@ -8,6 +8,7 @@ import com.tokensTool.pandoraNext.service.loginService; import com.tokensTool.pandoraNext.util.JwtUtils; import io.jsonwebtoken.Claims; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -17,7 +18,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -88,10 +88,10 @@ public String getAddress(String ip) { String addr = (String) resultMap.get("addr"); return addr; } else { - log.info("No JSON object found in the response"); + log.error("响应中未找到JSON对象"); } } else { - log.info("No JSON object found in the response"); + log.error("响应中未找到JSON对象"); } } catch (Exception e) { @@ -185,7 +185,7 @@ private String getRequestIp(HttpServletRequest request) { } return ip; } catch (Exception e) { - log.error("getIpAddr error! e:", e); + log.error("getIpAddress 获取失败! e:", e); } return ""; } @@ -202,22 +202,23 @@ public Result loginToken(@RequestParam("token") String token) { String username = systemSetting.getLoginUsername(); if (!StringUtils.hasLength(token)) { - log.info("请求头token为空,返回未登录的信息"); + log.error("请求头token为空,返回未登录的信息"); return Result.error("NOT_LOGIN"); } + Claims claims = null; try { - Claims claims = JwtUtils.parseJWT(token); - String resPassword = claims.get("password").toString(); - String resUsername = claims.get("username").toString(); - if (resPassword.equals(password) && resUsername.equals(username)) { - log.info("令牌合法，可以正常登录"); - return Result.success("YES_LOGIN"); - } - return Result.error("YES_LOGIN"); + claims = JwtUtils.parseJWT(token); } catch (Exception e) { - log.info("解析令牌失败, 返回未登录错误信息"); - return Result.error("NOT_LOGIN"); + log.error("解析令牌失败, 返回未登录错误信息"); } + String resPassword = claims.get("password").toString(); + String resUsername = claims.get("username").toString(); + if (resPassword.equals(password) && resUsername.equals(username)) { + log.info("令牌合法，可以正常登录"); + return Result.success("YES_LOGIN"); + } + return Result.error("YES_LOGIN"); + } /** diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.java index 80bfb7b..030e4f5 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.java @@ -6,6 +6,8 @@ import com.tokensTool.pandoraNext.service.impl.systemServiceImpl; import com.tokensTool.pandoraNext.util.JwtUtils; import io.jsonwebtoken.Claims; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -13,8 +15,6 @@ import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; @Slf4j @Component @@ -41,7 +41,7 @@ public boolean preHandle(HttpServletRequest req, HttpServletResponse resp, Objec //4.判断令牌是否存在，如果不存在，返回错误结果（未登录）。 if (!StringUtils.hasLength(jwt) || !jwt.startsWith("Bearer ")) { - log.info("请求头token空或没有Bearer ,返回未登录的信息"); + log.error("请求头token空或没有Bearer ,返回未登录的信息"); Result error = Result.error("NOT_LOGIN"); //手动转换 对象--json --------> 阿里巴巴fastJSON String notLogin = JSONObject.toJSONString(error); diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.java index 65031bf..2c53fa1 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.java @@ -161,7 +161,7 @@ public List selectToken(String name) { // 如果 JSON 文件不存在或为空，则创建一个新的 JSON 对象并写入空数组 if (!jsonFile.exists() || jsonFile.length() == 0) { Files.writeString(Paths.get(parent), "{}"); - log.info("未找到tokens.json,新建tokens.json并初始化tokens.json成功！"); + log.error("未找到tokens.json,新建tokens.json并初始化tokens.json成功！"); return res; } // 读取JSON文件并获取根节点 @@ -459,7 +459,7 @@ else if (tem.isUseRefreshToken() && previousToken.equals(tem.getToken())) { objectMapper.writerWithDefaultPrettyPrinter().writeValue(new File(parent), newObjectNode); return "修改成功！"; } else { - log.info("节点未找到或不是对象,请检查tokens.json！ " + nodeNameToModify); + log.error("节点未找到或不是对象,请检查tokens.json！ " + nodeNameToModify); return "节点未找到或不是对象！"; } } catch (IOException e) { @@ -538,7 +538,7 @@ public String product_requireToken(token tem, boolean autoShare) { objectMapper.writerWithDefaultPrettyPrinter().writeValue(new File(parent), newObjectNode); return "修改成功！"; } else { - log.info("节点未找到或不是对象,请检查tokens.json！ " + nodeNameToModify); + log.error("节点未找到或不是对象,请检查tokens.json！ " + nodeNameToModify); return "节点未找到或不是对象！"; } } catch (IOException e) { @@ -732,26 +732,26 @@ public String updateRefreshToken(token token) { public String getAccessToken(token token) { - String url; - systemSetting systemSetting = systemService.selectSettingUrl(); - String tokenKind; - String tokenName; - if (token.isUseRefreshToken()) { - tokenKind = reAccessToken; - tokenName = "refresh_token"; - } else { - tokenKind = accessToken; - tokenName = "session_token"; - } - if (systemSetting.getAutoToken_url().equals("default")) { - String bingUrl = systemSetting.getBing(); - String[] parts = bingUrl.split(":"); - url = "http://127.0.0.1" + ":" + parts[1] + "/" + systemSetting.getProxy_api_prefix() + tokenKind; - } else { - url = systemSetting.getAutoToken_url() + tokenKind; - } - log.info("将通过这个网址请求登录信息：" + url); try { + String url; + systemSetting systemSetting = systemService.selectSettingUrl(); + String tokenKind; + String tokenName; + if (token.isUseRefreshToken()) { + tokenKind = reAccessToken; + tokenName = "refresh_token"; + } else { + tokenKind = accessToken; + tokenName = "session_token"; + } + if (systemSetting.getAutoToken_url().equals("default")) { + String bingUrl = systemSetting.getBing(); + String[] parts = bingUrl.split(":"); + url = "http://127.0.0.1" + ":" + parts[1] + "/" + systemSetting.getProxy_api_prefix() + tokenKind; + } else { + url = systemSetting.getAutoToken_url() + tokenKind; + } + log.info("将通过这个网址请求登录信息：" + url); OkHttpClient client = new OkHttpClient.Builder() .connectTimeout(30, TimeUnit.SECONDS) // 设置连接超时时间为10秒 .readTimeout(30, TimeUnit.SECONDS) // 设置读取超时时间为30秒 @@ -765,25 +765,22 @@ public String getAccessToken(token token) { .url(url) .post(requestBody) .build(); - try (Response response = client.newCall(request).execute()) { - if (!response.isSuccessful()) { - log.info("Request failed: " + response.body().string().trim()); - return null; - } - String responseContent = response.body().string(); - String resToken = null; - try { - JSONObject jsonResponse = new JSONObject(responseContent); - resToken = jsonResponse.getString("access_token"); - } catch (JSONException e) { - e.printStackTrace(); - } - if (response.code() == 200 && resToken != null && resToken.length() > 400) { - return resToken; - } - } catch (Exception e) { + Response response = client.newCall(request).execute(); + if (!response.isSuccessful()) { + log.error("Request failed: " + response.body().string().trim()); + return null; + } + String responseContent = response.body().string(); + String resToken = null; + try { + JSONObject jsonResponse = new JSONObject(responseContent); + resToken = jsonResponse.getString("access_token"); + } catch (JSONException e) { e.printStackTrace(); } + if (response.code() == 200 && resToken != null && resToken.length() > 400) { + return resToken; + } } catch (Exception e) { e.printStackTrace(); } diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.java index f5f176f..9d8e59a 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.java @@ -370,7 +370,7 @@ public String deletePoolToken(poolToken poolToken) { if (deletePoolToken != null && deletePoolToken.contains("pk")) { String s = apiService.deletePoolToken(deletePoolToken); if (s == null) { - log.info("删除失败，看看自己的poolToken是否合法"); + log.error("删除失败，看看自己的poolToken是否合法"); } } if (poolToken.isIntoOneApi()) { @@ -393,7 +393,7 @@ public String deletePoolToken(poolToken poolToken) { newObjectNode.remove(name); // 将修改后的 newObjectNode 写回文件 objectMapper.writerWithDefaultPrettyPrinter().writeValue(new File(parent), newObjectNode); - log.info("删除成功"); + log.error("删除成功"); return "删除成功！"; } else { System.out.println("Node not found: " + name); @@ -460,7 +460,7 @@ public String refreshAllTokens() { } } } - log.info("pool_token刷新成功:" + count + "，失败:" + (poolTokens.size() - count)); + log.error("pool_token刷新成功:" + count + "，失败:" + (poolTokens.size() - count)); return ("
pool_token刷新成功:" + count + "，失败:" + (poolTokens.size() - count)); } @@ -759,7 +759,7 @@ public boolean addKey(poolToken addKeyPojo, String[] systemSetting) { jsonObject.put("type", 8); jsonObject.put("key", addKeyPojo.getPoolToken()); jsonObject.put("name", addKeyPojo.getPoolName()); - jsonObject.put("base_url", getOpenaiUrl()); + jsonObject.put("base_url", addKeyPojo.getOneApi_pandoraUrl()); jsonObject.put("other", ""); if (addKeyPojo.isPandoraNextGpt4()) { jsonObject.put("models", gpt4Models); diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.java index 5b331a7..72d1ce8 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.java @@ -207,7 +207,6 @@ public shareToken getShareValue(shareToken shareToken) { public boolean addKey(shareToken addKeyPojo, String[] systemSetting) { String url = systemSetting[0].endsWith("/") ? systemSetting[0] + oneAPiChannel : systemSetting[0] + "/" + oneAPiChannel; - log.info(url); try { JSONObject jsonObject = new JSONObject(); jsonObject.put("type", 8); @@ -232,7 +231,7 @@ public boolean addKey(shareToken addKeyPojo, String[] systemSetting) { .build(); try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { - log.info("请求one-api失败，失败码: " + response.code()); + log.error("请求one-api失败，失败码: " + response.code()); return false; } String responseContent = response.body().string(); @@ -241,7 +240,7 @@ public boolean addKey(shareToken addKeyPojo, String[] systemSetting) { if (response.code() == 200 && success) { return true; } else { - log.info("请求one-api失败，失败码: " + response.code()); + log.error("请求one-api失败，失败码: " + response.code()); } } catch (Exception e) { e.printStackTrace(); @@ -255,7 +254,6 @@ public boolean addKey(shareToken addKeyPojo, String[] systemSetting) { public boolean deleteKeyId(shareToken shareToken, String[] systemSetting) { String url = systemSetting[0].endsWith("/") ? systemSetting[0] + oneApiSelect : systemSetting[0] + "/" + oneApiSelect; - log.info(url); try { OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() @@ -264,7 +262,7 @@ public boolean deleteKeyId(shareToken shareToken, String[] systemSetting) { .build(); try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { - log.info("浏览器状态为： " + response.code()); + log.error("浏览器状态为： " + response.code()); return false; } String responseContent = response.body().string(); @@ -284,10 +282,10 @@ public boolean deleteKeyId(shareToken shareToken, String[] systemSetting) { boolean res = deleteKey(systemSetting, id); return res; } - log.info("没有找到相应的key名!"); + log.error("没有找到相应的key名!"); return true; } else { - log.info("浏览器状态为： " + response.code()); + log.error("浏览器状态为： " + response.code()); } } catch (Exception e) { e.printStackTrace(); @@ -301,7 +299,6 @@ public boolean deleteKeyId(shareToken shareToken, String[] systemSetting) { public boolean getPriority(shareToken shareToken, String[] systemSetting) { String url = systemSetting[0].endsWith("/") ? systemSetting[0] + oneApiSelect : systemSetting[0] + "/" + oneApiSelect; - log.info(url); OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() .url(url) @@ -309,7 +306,7 @@ public boolean getPriority(shareToken shareToken, String[] systemSetting) { .build(); try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { - log.info("没有找到相应的key名，浏览器状态为： " + response.code()); + log.error("没有找到相应的key名，浏览器状态为： " + response.code()); return false; } String responseContent = response.body().string(); @@ -323,7 +320,7 @@ public boolean getPriority(shareToken shareToken, String[] systemSetting) { return priorityKey(systemSetting, id, shareToken.getPriority()); } } - log.info("没有找到相应的key名"); + log.error("没有找到相应的key名"); } catch (Exception e) { e.printStackTrace(); } diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/tokensToolApplication.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/tokensToolApplication.java index 7433272..037da15 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/tokensToolApplication.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/tokensToolApplication.java @@ -6,13 +6,14 @@ import com.tokensTool.pandoraNext.service.impl.systemServiceImpl; import com.tokensTool.pandoraNext.util.JwtUtils; import com.tokensTool.pandoraNext.util.MyTaskUtils; +import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; -import javax.annotation.PostConstruct; import java.time.Instant; import java.util.UUID; @@ -28,26 +29,29 @@ @SpringBootApplication public class tokensToolApplication { + @Value("${server.servlet.context-path}") + private String contextPath; + @Value("${server.port}") + private String serverPort; @Autowired private apiServiceImpl serviceImpl; - @Autowired private systemServiceImpl systemService; - @Autowired private poolServiceImpl poolServiceImpl; - @Autowired private MyTaskUtils myTaskUtils; public static void main(String[] args) { - log.info("--------------------------------------------------------------\n" + + log.info("\n--------------------------------------------------------------\n" + "PandoraNext-tokensTool v 0.6.6版本\n" + "1.新增copilot接口的/cocopilot/v1/embeddings,/v1/embeddings\n" + "2.接口使用多线程，提高并发能力\n" + "3.优化失效之后自动关闭分享，恢复之后自动打开分享\n" + "4.修复历史问题bug,优化代码，优化前端\n" + + " - 修复修改Pool传递到oneapi无法更改默认的URl\n" + "--------------------------------------------------------------\n"); + // 启动 Instant instant = Instant.now(); String key = String.valueOf(instant.toEpochMilli()); JwtUtils.setSignKey(key); @@ -56,9 +60,7 @@ public static void main(String[] args) { String uuidString = UUID.randomUUID().toString(); JwtUtils.setJwtPassword(uuidString); log.info("初始化UUID成功！"); - // 启动 SpringApplication.run(tokensToolApplication.class, args); - log.info("原神tokensTool启动！！！！！！！！！！！！！！！"); } @PostConstruct @@ -71,13 +73,19 @@ public void initialize() { serviceImpl.initializeTokenJson(); //初始化定时任务 poolServiceImpl.initializeCheckPool(); - systemSetting setting = systemService.selectSetting(); if (!setting.getAuto_updateSession()) { myTaskUtils.stopTask(); } else { myTaskUtils.changeTask(setting); } + + log.info("------------------------------------------------------"); + log.info("----------原神PandoraNext-tokensTool启动成功------------"); + log.info("初始用户名：root" ); + log.info("初始密码：123456" ); + log.info("访问地址：http://0.0.0.0:" + serverPort + contextPath +""); + log.info("------------------------------------------------------"); } } diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/util/JwtUtils.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/util/JwtUtils.java index f304c90..3af01ab 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/util/JwtUtils.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/util/JwtUtils.java @@ -1,8 +1,6 @@ package com.tokensTool.pandoraNext.util; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.*; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -68,10 +66,15 @@ public static String generateJwt(Map claims) { * @return JWT第二部分负载 payload 中存储的内容 */ public static Claims parseJWT(String jwt) { - Claims claims = Jwts.parser() - .setSigningKey(getSignKey()) - .parseClaimsJws(jwt) - .getBody(); - return claims; + try { + Claims claims = Jwts.parser() + .setSigningKey(getSignKey()) + .parseClaimsJws(jwt) + .getBody(); + return claims; + } catch (Exception e) { + log.error("解析令牌失败, 返回未登录错误信息"); + return null; + } } } diff --git a/rearServer/src/main/resources/application.properties b/rearServer/src/main/resources/application.properties index 02c6c73..b013dfa 100644 --- a/rearServer/src/main/resources/application.properties +++ b/rearServer/src/main/resources/application.properties @@ -8,9 +8,10 @@ deployPosition=default hotReload=true # copilot interface copilot_interface=true -# SpringBoot 2.* prefix +# SpringBoot 3.* prefix server.servlet.context-path=/ + diff --git "a/rearServer/target/classes/PandoraNext-tokensTool\347\232\204docker\345\221\275\344\273\244.txt" "b/rearServer/target/classes/PandoraNext-tokensTool\347\232\204docker\345\221\275\344\273\244.txt" index f48158d..f672f5a 100644 --- "a/rearServer/target/classes/PandoraNext-tokensTool\347\232\204docker\345\221\275\344\273\244.txt" +++ "b/rearServer/target/classes/PandoraNext-tokensTool\347\232\204docker\345\221\275\344\273\244.txt" @@ -62,6 +62,7 @@ docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t yangclivi sudo docker buildx build --platform linux/amd64 -t yangclivia/tokenstooltest -f /www/PandoraNext/Dockerfile --push /www/PandoraNext +cd /tokenTools-sh && sudo sh update.sh sudo docker buildx build --platform linux/amd64,linux/arm/v7,linux/arm64 -t yangclivia/tokenstool -f /www/PandoraNext/Dockerfile --push /www/PandoraNext diff --git a/rearServer/target/classes/application.properties b/rearServer/target/classes/application.properties index 02c6c73..b013dfa 100644 --- a/rearServer/target/classes/application.properties +++ b/rearServer/target/classes/application.properties @@ -8,9 +8,10 @@ deployPosition=default hotReload=true # copilot interface copilot_interface=true -# SpringBoot 2.* prefix +# SpringBoot 3.* prefix server.servlet.context-path=/ + diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/anno/Log.class b/rearServer/target/classes/com/tokensTool/pandoraNext/anno/Log.class index d43f8c3..fc6c304 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/anno/Log.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/anno/Log.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/aop/LogAspect.class b/rearServer/target/classes/com/tokensTool/pandoraNext/aop/LogAspect.class index 1653d50..8343501 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/aop/LogAspect.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/aop/LogAspect.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ChatCompletionResult$ChatCompletionResultBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ChatCompletionResult$ChatCompletionResultBuilder.class deleted file mode 100644 index bf2146e..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ChatCompletionResult$ChatCompletionResultBuilder.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ChatCompletionResult.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ChatCompletionResult.class deleted file mode 100644 index a6fdfcb..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ChatCompletionResult.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Choice$ChoiceBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Choice$ChoiceBuilder.class deleted file mode 100644 index ed0a438..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Choice$ChoiceBuilder.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Choice.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Choice.class deleted file mode 100644 index b580e94..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Choice.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentChoice$ContentChoiceBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentChoice$ContentChoiceBuilder.class deleted file mode 100644 index 791a204..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentChoice$ContentChoiceBuilder.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentChoice.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentChoice.class deleted file mode 100644 index 0dbb9db..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentChoice.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentCompletion$ContentCompletionBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentCompletion$ContentCompletionBuilder.class deleted file mode 100644 index f9a5431..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentCompletion$ContentCompletionBuilder.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentCompletion.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentCompletion.class deleted file mode 100644 index 10cc0ad..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentCompletion.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentResult$ContentResultBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentResult$ContentResultBuilder.class deleted file mode 100644 index 1c1d8c9..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentResult$ContentResultBuilder.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentResult.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentResult.class deleted file mode 100644 index a5f2d88..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ContentResult.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation$ConversationBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation$ConversationBuilder.class index bb8fd62..ebe9200 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation$ConversationBuilder.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation$ConversationBuilder.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation.class index 3784bbb..47e712b 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Conversation.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message$MessageBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message$MessageBuilder.class new file mode 100644 index 0000000..148fe17 Binary files /dev/null and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message$MessageBuilder.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message$Role.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message$Role.class new file mode 100644 index 0000000..7a90a2d Binary files /dev/null and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message$Role.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message.class new file mode 100644 index 0000000..47b3b87 Binary files /dev/null and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Message.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model$ModelBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model$ModelBuilder.class index a4acdfd..6a1a9fc 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model$ModelBuilder.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model$ModelBuilder.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model.class index 6a66985..85a0d78 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Model.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult$ModelResultBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult$ModelResultBuilder.class index 7bed69c..62a232e 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult$ModelResultBuilder.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult$ModelResultBuilder.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult.class index e4e6e25..5a05e02 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/ModelResult.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Usage$UsageBuilder.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Usage$UsageBuilder.class deleted file mode 100644 index c7f77a4..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Usage$UsageBuilder.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Usage.class b/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Usage.class deleted file mode 100644 index c9d7abe..0000000 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/chat/Usage.class and /dev/null differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/config/CorsConfig.class b/rearServer/target/classes/com/tokensTool/pandoraNext/config/CorsConfig.class index 6a0e6a8..600094f 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/config/CorsConfig.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/config/CorsConfig.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class b/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class index 37b4d7a..eb6ebb1 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class index 14ae79d..13d5f66 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/autoTokenController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/autoTokenController.class index 1e958b3..355a7b7 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/autoTokenController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/autoTokenController.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/chatController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/chatController.class index b2140a9..ae66c5e 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/chatController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/chatController.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/loginColltroller.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/loginColltroller.class index 1b4d232..44f5574 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/loginColltroller.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/loginColltroller.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/poolController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/poolController.class index 033ea53..2d49502 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/poolController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/poolController.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/shareController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/shareController.class index 7bbc7d6..304c64a 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/shareController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/shareController.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/systemColltroller.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/systemColltroller.class index 0f8be40..43a3c4e 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/systemColltroller.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/systemColltroller.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/taskController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/taskController.class index 1f77efa..e713ddc 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/taskController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/taskController.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/tokenController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/tokenController.class index fcd359e..75a9e52 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/tokenController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/tokenController.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.class b/rearServer/target/classes/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.class index daad3ee..1c0254a 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/interceptor/LoginCheckInterceptor.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/PandoraLimit.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/PandoraLimit.class index 1c8a81c..a939170 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/PandoraLimit.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/PandoraLimit.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/Result.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/Result.class index f250a4d..a9d02c1 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/Result.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/Result.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/loginLog.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/loginLog.class index 08a437b..27461b3 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/loginLog.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/loginLog.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/modelsUsage.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/modelsUsage.class index 8c321bc..c37a473 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/modelsUsage.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/modelsUsage.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/poolToken.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/poolToken.class index 81d120b..4892e5d 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/poolToken.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/poolToken.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/shareToken.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/shareToken.class index f24c417..9f931f2 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/shareToken.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/shareToken.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/systemSetting.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/systemSetting.class index 6b351d5..3e66e15 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/systemSetting.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/systemSetting.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/tls.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/tls.class index 8b4ffe9..36ab117 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/tls.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/tls.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/token.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/token.class index 18b5e59..8cb03ad 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/token.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/token.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/validation.class b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/validation.class index a3ba4b3..470177f 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/validation.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/pojo/validation.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/apiService.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/apiService.class index cf18a5e..17934fc 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/apiService.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/apiService.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.class index 4275c8f..5ee2248 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/apiServiceImpl.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/loginServiceImpl.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/loginServiceImpl.class index 744ccde..a48c434 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/loginServiceImpl.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/loginServiceImpl.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.class index 1a57be8..7deb8ea 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.class index e0cda41..6a4bd9b 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/systemServiceImpl.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/systemServiceImpl.class index 801f8a3..6889c99 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/systemServiceImpl.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/impl/systemServiceImpl.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/loginService.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/loginService.class index 4b71405..c7383d8 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/loginService.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/loginService.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/poolService.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/poolService.class index 193464d..f3dd406 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/poolService.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/poolService.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/shareService.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/shareService.class index 147d837..1db946e 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/shareService.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/shareService.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/service/systemService.class b/rearServer/target/classes/com/tokensTool/pandoraNext/service/systemService.class index dd9cfeb..54f99ff 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/service/systemService.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/service/systemService.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/tokensToolApplication.class b/rearServer/target/classes/com/tokensTool/pandoraNext/tokensToolApplication.class index fe7fcad..af48435 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/tokensToolApplication.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/tokensToolApplication.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/util/JwtUtils.class b/rearServer/target/classes/com/tokensTool/pandoraNext/util/JwtUtils.class index 3ebfbb6..8e6269e 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/util/JwtUtils.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/util/JwtUtils.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/util/MyTaskUtils.class b/rearServer/target/classes/com/tokensTool/pandoraNext/util/MyTaskUtils.class index 602708e..a7e6c6d 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/util/MyTaskUtils.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/util/MyTaskUtils.class differ diff --git a/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index dfe4df6..21f5ae8 100644 --- a/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,11 +1,7 @@ com\tokensTool\pandoraNext\pojo\modelsUsage.class -com\tokensTool\pandoraNext\chat\ContentChoice$ContentChoiceBuilder.class -com\tokensTool\pandoraNext\chat\Choice.class com\tokensTool\pandoraNext\service\loginService.class com\tokensTool\pandoraNext\pojo\systemSetting.class com\tokensTool\pandoraNext\pojo\poolToken.class -com\tokensTool\pandoraNext\chat\Usage.class -com\tokensTool\pandoraNext\chat\Choice$ChoiceBuilder.class com\tokensTool\pandoraNext\service\systemService.class com\tokensTool\pandoraNext\util\MyTaskUtils.class com\tokensTool\pandoraNext\config\CorsConfig.class @@ -19,36 +15,31 @@ com\tokensTool\pandoraNext\chat\Model.class com\tokensTool\pandoraNext\pojo\validation.class com\tokensTool\pandoraNext\chat\Conversation$ConversationBuilder.class com\tokensTool\pandoraNext\anno\Log.class -com\tokensTool\pandoraNext\chat\ContentChoice.class -com\tokensTool\pandoraNext\chat\ContentCompletion.class +com\tokensTool\pandoraNext\chat\Message$Role.class com\tokensTool\pandoraNext\interceptor\LoginCheckInterceptor.class com\tokensTool\pandoraNext\controller\poolController.class com\tokensTool\pandoraNext\service\impl\shareServiceImpl.class com\tokensTool\pandoraNext\controller\autoTokenController.class com\tokensTool\pandoraNext\config\WebConfig.class +com\tokensTool\pandoraNext\chat\Message$MessageBuilder.class com\tokensTool\pandoraNext\service\impl\apiServiceImpl.class -com\tokensTool\pandoraNext\chat\ContentResult$ContentResultBuilder.class com\tokensTool\pandoraNext\chat\Model$ModelBuilder.class -com\tokensTool\pandoraNext\chat\ContentCompletion$ContentCompletionBuilder.class com\tokensTool\pandoraNext\controller\systemColltroller.class com\tokensTool\pandoraNext\chat\ModelResult.class com\tokensTool\pandoraNext\service\impl\poolServiceImpl.class -com\tokensTool\pandoraNext\chat\ContentResult.class com\tokensTool\pandoraNext\controller\chatController.class com\tokensTool\pandoraNext\pojo\Result.class -com\tokensTool\pandoraNext\chat\ChatCompletionResult$ChatCompletionResultBuilder.class com\tokensTool\pandoraNext\service\impl\systemServiceImpl.class com\tokensTool\pandoraNext\pojo\loginLog.class -com\tokensTool\pandoraNext\chat\Usage$UsageBuilder.class com\tokensTool\pandoraNext\controller\apiController.class com\tokensTool\pandoraNext\pojo\PandoraLimit.class com\tokensTool\pandoraNext\service\apiService.class com\tokensTool\pandoraNext\tokensToolApplication.class com\tokensTool\pandoraNext\chat\ModelResult$ModelResultBuilder.class -com\tokensTool\pandoraNext\chat\ChatCompletionResult.class com\tokensTool\pandoraNext\controller\taskController.class com\tokensTool\pandoraNext\chat\Conversation.class com\tokensTool\pandoraNext\service\poolService.class +com\tokensTool\pandoraNext\chat\Message.class com\tokensTool\pandoraNext\util\JwtUtils.class com\tokensTool\pandoraNext\controller\shareController.class com\tokensTool\pandoraNext\controller\loginColltroller.class diff --git a/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 7abbfe7..857006e 100644 --- a/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/rearServer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,21 +1,18 @@ -F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\Usage.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\service\systemService.java -F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\ContentCompletion.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\service\poolService.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\controller\shareController.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\ModelResult.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\pojo\Result.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\service\impl\systemServiceImpl.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\service\impl\poolServiceImpl.java -F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\ContentResult.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\Conversation.java +F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\Message.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\interceptor\LoginCheckInterceptor.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\service\loginService.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\util\JwtUtils.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\aop\LogAspect.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\pojo\PandoraLimit.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\pojo\shareToken.java -F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\Choice.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\config\CorsConfig.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\pojo\validation.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\anno\Log.java @@ -39,8 +36,6 @@ F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensToo F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\pojo\systemSetting.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\controller\systemColltroller.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\service\shareService.java -F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\ContentChoice.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\util\MyTaskUtils.java -F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\ChatCompletionResult.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\chat\Model.java F:\vue\fakeApiTool\PandoraNext-TokensTool\rearServer\src\main\java\com\tokensTool\pandoraNext\controller\tokenController.java diff --git a/rearServer/target/pandoraNext-0.6.6-SNAPSHOT.jar b/rearServer/target/pandoraNext-0.6.6-SNAPSHOT.jar index af1c3de..1924ac7 100644 Binary files a/rearServer/target/pandoraNext-0.6.6-SNAPSHOT.jar and b/rearServer/target/pandoraNext-0.6.6-SNAPSHOT.jar differ diff --git a/simplyDeploy/pandoraNext-0.6.6-SNAPSHOT.jar b/simplyDeploy/pandoraNext-0.6.6-SNAPSHOT.jar index af1c3de..1924ac7 100644 Binary files a/simplyDeploy/pandoraNext-0.6.6-SNAPSHOT.jar and b/simplyDeploy/pandoraNext-0.6.6-SNAPSHOT.jar differ