PandoraNext-tokensTool v 0.6.4版本

优化代码结构
修改无法更新share_token的bug

rearServer/src/main/java/com/tokensTool/pandoraNext/controller/chatController.java

@@ -57,13 +57,9 @@ public class chatController {
 
     static {
         modelsUsage = new HashMap<>();
-        modelsUsage.put("gpt-4",0);
-        modelsUsage.put("gpt-3.5-turbo",0);
-        modelsUsage.put("gpt-3.5-turbo-0301",0);
-        log.info("初始化ipList成功！");
-    }
-
-    static {
+        modelsUsage.put("gpt-4", 0);
+        modelsUsage.put("gpt-3.5-turbo", 0);
+        modelsUsage.put("gpt-3.5-turbo-0301", 0);
         copilotTokenList = new HashMap<>();
         coCopilotTokenList = new HashMap<>();
         machineId = generateMachineId();
@@ -95,9 +91,9 @@ private static String generateMachineId() {
     @Scheduled(cron = "0 0 0 * * ?")
     private void clearModelsUsage() {
         HashMap<String, Integer> newModelsUsaget = new HashMap<>();
-        newModelsUsaget.put("gpt-4",0);
-        newModelsUsaget.put("gpt-3.5-turbo",0);
-        newModelsUsaget.put("gpt-3.5-turbo-0301",0);
+        newModelsUsaget.put("gpt-4", 0);
+        newModelsUsaget.put("gpt-3.5-turbo", 0);
+        newModelsUsaget.put("gpt-3.5-turbo-0301", 0);
         modelsUsage = newModelsUsaget;
         log.info("重置modelsUsage成功！");
     }

rearServer/src/main/java/com/tokensTool/pandoraNext/controller/loginColltroller.java

@@ -137,7 +137,7 @@ public Result login(@RequestBody systemSetting setting, HttpServletRequest reque
                 LocalDateTime now = LocalDateTime.now();
                 String formatDateTime = now.format(formatter);
                 loginLog loginLog = new loginLog(getAddress(ip), ip, outRequestNumber, inRequestNumber + 1, formatDateTime);
-                String password = JwtUtils.getJwtPassword().toString();
+                String password = JwtUtils.getJwtPassword();
                 String username = setting.getLoginUsername();
                 Map<String, Object> chaims = new HashMap();
                 chaims.put("password", password);

rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/poolServiceImpl.java

@@ -696,7 +696,7 @@ public String verifyPoolToken(poolToken poolToken, String url) {
                 .build();
 
         try (Response response = client.newCall(request).execute()) {
-            if(!response.isSuccessful() && response.code() == 404) {
+            if (!response.isSuccessful() && response.code() == 404) {
                 return "请检查PandoraNext公网地址是否填写正确！";
             }
             String result = response.body().string();

rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/shareServiceImpl.java

@@ -35,6 +35,13 @@
 public class shareServiceImpl implements shareService {
     private static final String oneApiSelect = "api/channel/?p=0";
     private static final String oneAPiChannel = "api/channel/";
+    private static final HashMap<String, String> share_tokenList;
+
+    static {
+        share_tokenList = new HashMap<>();
+        log.info("初始化share_tokenList成功！");
+    }
+
     private final String deploy = "default";
     @Value("${deployPosition}")
     private String deployPosition;
@@ -118,9 +125,7 @@ public List<shareToken> selectShareToken(String name) {
      */
     public String addShareToken(shareToken shareToken) {
         try {
-            if(shareToken.getToken_value() == null){
-                shareToken = getShareValue(shareToken);
-            }
+            shareToken = getShareValue(shareToken);
             String[] strings = systemService.selectOneAPi();
             boolean b = addKey(shareToken, strings);
             if (b && shareToken.getPriority() != 0) {
@@ -170,6 +175,7 @@ public String addShareToken(shareToken shareToken) {
             // 将修改后的数据写回到文件
             objectMapper.writerWithDefaultPrettyPrinter().writeValue(jsonFile, rootNode);
             log.info("数据成功添加到 JSON 文件中。");
+            share_tokenList.put(shareToken.getOneApi_name(), shareToken.getToken_value());
             return "share_token数据添加成功";
         } catch (IOException e) {
             e.printStackTrace();
@@ -392,9 +398,9 @@ public boolean priorityKey(String[] systemSetting, int keyId, Integer priority)
     public String requireShareToken(shareToken shareToken) {
         try {
             String res1 = deleteShareToken(shareToken);
-            if(res1.contains("成功")){
+            if (res1.contains("成功")) {
                 String res2 = addShareToken(shareToken);
-                if(res2.contains("成功")){
+                if (res2.contains("成功")) {
                     return "修改share_token到oneapi成功";
                 }
             }
@@ -441,21 +447,43 @@ public String deleteShareToken(shareToken shareToken) {
     public String refreshAllToken() {
         try {
             int count = 0;
+            int count_sus = 0;
             List<shareToken> shareTokens = selectShareToken("");
-            for(shareToken shareToken : shareTokens) {
-                String res1 = deleteShareToken(shareToken);
-                if(res1.contains("成功")){
-                    String res2 = addShareToken(shareToken);
-                    if(res2.contains("成功")){
-                        count ++;
+            for (shareToken shareToken : shareTokens) {
+                String newShareToken = getshareToken(shareToken);
+                log.info(newShareToken);
+                if (!newShareToken.equals(share_tokenList.get(shareToken.getOneApi_name()))
+                        && newShareToken != null) {
+                    String res1 = deleteShareToken(shareToken);
+                    if (res1.contains("成功")) {
+                        String res2 = addShareToken(shareToken);
+                        if (res2.contains("成功")) {
+                            count++;
+                        }
                     }
+                } else {
+                    count_sus++;
+                    count++;
+                    log.info(("share_token未发生变化，无需更新"));
                 }
             }
-            return "<br>share_tokens in oneApi刷新成功：" + count + "，失败：" + (shareTokens.size() - count);
+            return "<br>share_tokens in oneApi刷新成功/未过期：" + count + "/" + count_sus + "，失败：" + (shareTokens.size() - count);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return "share_tokens in oneApi刷新失败！";
     }
 
+    public String getshareToken(shareToken shareToken) {
+        if (shareToken == null) {
+            return null;
+        }
+        List<token> tokens = apiService.selectToken("");
+        for (token token : tokens) {
+            if (token.getName().equals(shareToken.getToken_name())) {
+                return token.getShare_token();
+            }
+        }
+        return null;
+    }
 }

rearServer/src/main/java/com/tokensTool/pandoraNext/service/impl/systemServiceImpl.java

@@ -29,7 +29,7 @@
 public class systemServiceImpl implements systemService {
     @Value("${deployPosition}")
     private String deployPosition;
-    private String deploy = "default";
+    private final String deploy = "default";
 
 
     public String selectFile() {

rearServer/src/main/resources/static/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.612ab552.js"></script><script defer="defer" src="js/app.2495121d.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Welcome to PandoraNext-TokensTool</title><script defer="defer" src="js/chunk-vendors.612ab552.js"></script><script defer="defer" src="js/app.37f35a35.js"></script><link href="css/chunk-vendors.8a308144.css" rel="stylesheet"></head><body><div id="app"></div></body></html>