优化代码结构

Yanyutin753 · Jan 3, 2024 · f5eff71 · f5eff71
1 parent f6f1d69
commit f5eff71
Show file tree

Hide file tree

Showing 39 changed files with 519 additions and 606 deletions.
diff --git a/rearServer/.idea/compiler.xml b/rearServer/.idea/compiler.xml
diff --git a/rearServer/.idea/inspectionProfiles/Project_Default.xml b/rearServer/.idea/inspectionProfiles/Project_Default.xml
diff --git a/rearServer/.idea/misc.xml b/rearServer/.idea/misc.xml
diff --git a/rearServer/pom.xml b/rearServer/pom.xml
@@ -82,7 +82,7 @@
             <artifactId>netty-common</artifactId>
             <version>4.1.97.Final</version>
         </dependency>
-<!--        plexpt chatGpt依赖-->
+        <!--        plexpt chatGpt依赖-->
         <dependency>
             <groupId>com.github.plexpt</groupId>
             <artifactId>chatgpt</artifactId>

diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ChatCompletionResult.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ChatCompletionResult.java
@@ -13,18 +13,18 @@
 @NoArgsConstructor
 public class ChatCompletionResult {
 
-   private String id;
+    private String id;
 
-   private String object;
+    private String object;
 
-   private Long created;
+    private Long created;
 
-   private String model;
+    private String model;
 
-   private List<Choice> choices;
+    private List<Choice> choices;
 
-   private Usage usage;
+    private Usage usage;
 
-   private String system_fingerprint;
+    private String system_fingerprint;
 
 }
diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentChoice.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/ContentChoice.java
@@ -5,8 +5,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Data
 @Builder
 @AllArgsConstructor
@@ -25,6 +23,4 @@ public class ContentChoice {
     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
@@ -36,7 +36,7 @@ public class ContentCompletion {
 
 
     /**
-     *  仅考虑概率累积最高的 tokens，而忽略其他概率较低的 tokens。
+     * 仅考虑概率累积最高的 tokens，而忽略其他概率较低的 tokens。
      */
     private int top_p;
 
@@ -54,13 +54,13 @@ public class ContentCompletion {
 
 
     /**
-     *  是否返回每个 token 的对数概率。
+     * 是否返回每个 token 的对数概率。
      */
     private String logprobs;
 
 
     /**
-     *  指定在生成文本时的停止条件，即遇到哪个字符串时停止生成。
+     * 指定在生成文本时的停止条件，即遇到哪个字符串时停止生成。
      */
     private String stop;
 

diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Conversation.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Conversation.java
@@ -15,7 +15,7 @@
 @NoArgsConstructor
 public class Conversation {
 
-    private  String model;
+    private String model;
 
     private List<Message> messages;
 

diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Usage.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/chat/Usage.java
@@ -31,6 +31,4 @@ public class Usage {
     private long totalTokens;
 
 
-
-
 }
diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/config/TaskSchedulerConfig.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/config/TaskSchedulerConfig.java
diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/config/TimerScheduleTask.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/config/TimerScheduleTask.java
diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java
@@ -46,6 +46,7 @@ public class apiController {
      */
     @Value("${deployWay}")
     private String deployWay;
+
     @Value("${pandoara_Ip}")
     private String pandoara_Ip;
 
@@ -99,8 +100,7 @@ public Result addToken(@RequestBody token token) {
             String res = apiService.addToken(token);
             if (res.contains("成功")) {
                 return Result.success(res);
-            }
-            else {
+            } else {
                 return Result.error(res);
             }
         } catch (Exception e) {
@@ -130,18 +130,17 @@ public Result requiredToken(@RequestBody token token) {
     }
 
     /**
-     * @boby token
      * @return 通过token用户名，删除（tokens.json）文件里的值
+     * @boby token
      */
     @Log
     @PutMapping("deleteToken")
     public Result deleteToken(@RequestBody token token) {
         try {
             String res = apiService.deleteToken(token);
-            if(res.contains("成功")){
+            if (res.contains("成功")) {
                 return Result.success(res);
-            }
-            else{
+            } else {
                 return Result.error(res);
             }
         } catch (Exception e) {

diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/autoTokenController.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/autoTokenController.java
@@ -49,6 +49,7 @@ public void toUpdateToken() {
      * 失效变黄
      * 并更新所有access_token和share_token
      * 重新组成pool_token
+     *
      * @return
      */
     @GetMapping("updateAllToken")