> future = CompletableFuture.supplyAsync(() -> {
try {
@@ -1042,14 +1046,13 @@ public class ChatController {
if (token == null) {
return new ResponseEntity<>(Result.error("自定义APIKey is wrong"), HttpStatus.UNAUTHORIZED);
}
- selfTokenLimitList.put(apiKey,new AtomicInteger(1));
+ selfTokenLimitList.put(apiKey, new AtomicInteger(1));
selfTokenList.put(apiKey, token);
log.info("自定义selfToken初始化成功！");
- }
- else {
+ } else {
int requestNum = selfTokenLimitList.get(apiKey).incrementAndGet();
- if(requestNum > one_selfCopilot_limit){
- return new ResponseEntity<>(Result.error("current requests is "+ requestNum + " rate limit exceeded"), HttpStatus.TOO_MANY_REQUESTS);
+ if (requestNum > one_selfCopilot_limit) {
+ return new ResponseEntity<>(Result.error("current requests is " + requestNum + " rate limit exceeded"), HttpStatus.TOO_MANY_REQUESTS);
}
}
String chat_token = selfTokenList.get(apiKey);
@@ -1127,14 +1130,19 @@ public class ChatController {
.addHeader("Editor-Plugin-Version", "copilot-chat/" + copilot_chat_version)
.addHeader("User-Agent", "GitHubCopilotChat/" + copilot_chat_version)
.addHeader("Accept", "*/*").build();
+ return getToken(request);
+ }
+
+ @Nullable
+ private String getToken(Request request) throws IOException {
try (Response response = client.newCall(request).execute()) {
log.info(response.toString());
if (!response.isSuccessful()) {
return null;
}
String responseBody = response.body().string();
- JSONObject jsonResponse = new JSONObject(responseBody);
- return jsonResponse.has("token") ? jsonResponse.get("token").toString() : null;
+ JSONObject jsonResponse = com.alibaba.fastjson2.JSON.parseObject(responseBody);
+ return jsonResponse.getString("token");
} catch (JSONException e) {
throw new RuntimeException(e);
}
@@ -1154,17 +1162,7 @@ public class ChatController {
.addHeader("Editor-Plugin-Version", "copilot-chat/" + copilot_chat_version)
.addHeader("User-Agent", "GitHubCopilotChat/" + copilot_chat_version)
.addHeader("Accept", "*/*").build();
- try (Response response = client.newCall(request).execute()) {
- log.info(response.toString());
- if (!response.isSuccessful()) {
- return null;
- }
- String responseBody = response.body().string();
- JSONObject jsonResponse = new JSONObject(responseBody);
- return jsonResponse.has("token") ? jsonResponse.get("token").toString() : null;
- } catch (JSONException e) {
- throw new RuntimeException(e);
- }
+ return getToken(request);
}
/**
@@ -1181,17 +1179,7 @@ public class ChatController {
.addHeader("Editor-Plugin-Version", "copilot-chat/" + copilot_chat_version)
.addHeader("User-Agent", "GitHubCopilotChat/" + copilot_chat_version)
.addHeader("Accept", "*/*").build();
- try (Response response = client.newCall(request).execute()) {
- log.info(response.toString());
- if (!response.isSuccessful()) {
- return null;
- }
- String responseBody = response.body().string();
- JSONObject jsonResponse = new JSONObject(responseBody);
- return jsonResponse.has("token") ? jsonResponse.get("token").toString() : null;
- } catch (JSONException e) {
- throw new RuntimeException(e);
- }
+ return getToken(request);
}
diff --git a/src/main/java/com/gpt4/copilot/controller/CustomErrorController.java b/src/main/java/com/gpt4/copilot/controller/CustomErrorController.java
index a95cb71..f65b6fa 100644
--- a/src/main/java/com/gpt4/copilot/controller/CustomErrorController.java
+++ b/src/main/java/com/gpt4/copilot/controller/CustomErrorController.java
@@ -25,7 +25,7 @@ public class CustomErrorController implements ErrorController {
" Document\n" +
"\n" +
"\n" +
- " Thanks you use gpt4-copilot-java-0.0.5
\n" +
+ " Thanks you use gpt4-copilot-java-0.1.0
\n" +
" 详细使用文档
\n" +
" 项目地址
\n" +
"\n" +
diff --git a/src/main/java/com/gpt4/copilot/pojo/Conversation.java b/src/main/java/com/gpt4/copilot/pojo/Conversation.java
index 2e79097..83fc22e 100644
--- a/src/main/java/com/gpt4/copilot/pojo/Conversation.java
+++ b/src/main/java/com/gpt4/copilot/pojo/Conversation.java
@@ -8,6 +8,9 @@ import lombok.NoArgsConstructor;
import java.util.List;
import java.util.Map;
+/**
+ * @author YANGYANG
+ */
@Data
@Builder
@AllArgsConstructor
diff --git a/src/main/java/com/gpt4/copilot/pojo/Result.java b/src/main/java/com/gpt4/copilot/pojo/Result.java
index ad336d1..b9204e8 100644
--- a/src/main/java/com/gpt4/copilot/pojo/Result.java
+++ b/src/main/java/com/gpt4/copilot/pojo/Result.java
@@ -4,6 +4,9 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+/**
+ * @author YANGYANG
+ */
@Data
@NoArgsConstructor
@AllArgsConstructor
diff --git a/target/classes/com/gpt4/copilot/controller/ChatController$1.class b/target/classes/com/gpt4/copilot/controller/ChatController$1.class
index 1e3a06a..4f647c0 100644
Binary files a/target/classes/com/gpt4/copilot/controller/ChatController$1.class and b/target/classes/com/gpt4/copilot/controller/ChatController$1.class differ
diff --git a/target/classes/com/gpt4/copilot/controller/ChatController.class b/target/classes/com/gpt4/copilot/controller/ChatController.class
index a7454bb..06cd2d4 100644
Binary files a/target/classes/com/gpt4/copilot/controller/ChatController.class and b/target/classes/com/gpt4/copilot/controller/ChatController.class differ
diff --git a/target/classes/com/gpt4/copilot/controller/CustomErrorController.class b/target/classes/com/gpt4/copilot/controller/CustomErrorController.class
index cb3608d..ff58c22 100644
Binary files a/target/classes/com/gpt4/copilot/controller/CustomErrorController.class and b/target/classes/com/gpt4/copilot/controller/CustomErrorController.class differ
diff --git a/target/classes/com/gpt4/copilot/copilotApplication.class b/target/classes/com/gpt4/copilot/copilotApplication.class
index 42f573c..1ffc598 100644
Binary files a/target/classes/com/gpt4/copilot/copilotApplication.class and b/target/classes/com/gpt4/copilot/copilotApplication.class differ
diff --git a/target/classes/com/gpt4/copilot/pojo/Conversation$ConversationBuilder.class b/target/classes/com/gpt4/copilot/pojo/Conversation$ConversationBuilder.class
index 1f00e0a..a5cacf0 100644
Binary files a/target/classes/com/gpt4/copilot/pojo/Conversation$ConversationBuilder.class and b/target/classes/com/gpt4/copilot/pojo/Conversation$ConversationBuilder.class differ
diff --git a/target/classes/com/gpt4/copilot/pojo/Conversation.class b/target/classes/com/gpt4/copilot/pojo/Conversation.class
index c07ec30..dddae83 100644
Binary files a/target/classes/com/gpt4/copilot/pojo/Conversation.class and b/target/classes/com/gpt4/copilot/pojo/Conversation.class differ
diff --git a/target/classes/com/gpt4/copilot/pojo/Result.class b/target/classes/com/gpt4/copilot/pojo/Result.class
index ba52ad2..773fc19 100644
Binary files a/target/classes/com/gpt4/copilot/pojo/Result.class and b/target/classes/com/gpt4/copilot/pojo/Result.class differ
diff --git a/target/gpt-4-copilot-0.0.7.jar.original b/target/gpt-4-copilot-0.0.7.jar.original
deleted file mode 100644
index d269823..0000000
Binary files a/target/gpt-4-copilot-0.0.7.jar.original and /dev/null differ
diff --git a/target/gpt-4-copilot-0.0.7.jar b/target/gpt-4-copilot-0.1.0.jar
similarity index 94%
rename from target/gpt-4-copilot-0.0.7.jar
rename to target/gpt-4-copilot-0.1.0.jar
index eedbb44..14a06e7 100644
Binary files a/target/gpt-4-copilot-0.0.7.jar and b/target/gpt-4-copilot-0.1.0.jar differ
diff --git a/target/gpt-4-copilot-0.1.0.jar.original b/target/gpt-4-copilot-0.1.0.jar.original
new file mode 100644
index 0000000..84d12b8
Binary files /dev/null and b/target/gpt-4-copilot-0.1.0.jar.original differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index d023130..9bbbc06 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,3 +1,3 @@
artifactId=gpt-4-copilot
groupId=com.gpt4.copilot
-version=0.0.7
+version=0.1.0
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index b9d8d1d..1bb8848 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -7,4 +7,4 @@ com\gpt4\copilot\pojo\Conversation.class
com\gpt4\copilot\pojo\SystemSetting.class
com\gpt4\copilot\config\CorsConfig.class
com\gpt4\copilot\pojo\Result.class
-com\gpt4\copilot\copilotApplication.class
+com\gpt4\copilot\CopilotApplication.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index c970c86..db03aa0 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -5,4 +5,4 @@ F:\vue\fakeApiTool\graalvm-demos\spring-native-image\GPT4-Copilot\src\main\java\
F:\vue\fakeApiTool\graalvm-demos\spring-native-image\GPT4-Copilot\src\main\java\com\gpt4\copilot\pojo\SystemSetting.java
F:\vue\fakeApiTool\graalvm-demos\spring-native-image\GPT4-Copilot\src\main\java\com\gpt4\copilot\controller\ChatController.java
F:\vue\fakeApiTool\graalvm-demos\spring-native-image\GPT4-Copilot\src\main\java\com\gpt4\copilot\config\WebConfig.java
-F:\vue\fakeApiTool\graalvm-demos\spring-native-image\GPT4-Copilot\src\main\java\com\gpt4\copilot\copilotApplication.java
+F:\vue\fakeApiTool\graalvm-demos\spring-native-image\GPT4-Copilot\src\main\java\com\gpt4\copilot\CopilotApplication.java