Explorar el Código

refactor: 优化配置

fanyanpeng hace 2 años
padre
commit
16790b3402

+ 8 - 3
application.yaml

@@ -52,9 +52,14 @@ openai:
 
 config:
   llm:
-    ChatGLM3: http://10.58.0.2:6678
-    Qwen2-7B: http://10.58.0.2:8000
-    QWen14B: http://10.58.0.2:6679
+    ChatGLM3:
+      url: http://10.58.0.2:6678
+    ChatGLM4:
+      url: http://47.94.251.162:6677
+      token: seec0der
+      modelName: glm4-9b-chat
+    QWen14B:
+      url: http://10.58.0.2:6679
 
 
 

+ 15 - 9
src/main/java/com/njuzr/eaibackend/service/AIRequestService.java

@@ -35,13 +35,19 @@ public class AIRequestService {
     private final String prefix = "/v1/chat/completions";
 
 
-    @Value("${config.llm.ChatGLM3}")
-    private String glmUrl;
+    @Value("${config.llm.ChatGLM3.url}")
+    private String glm3Url;
 
-    @Value("${config.llm.Qwen2-7B}")
-    private String qWen7BUrl;
+    @Value("${config.llm.ChatGLM4.url}")
+    private String glm4Url;
 
-    @Value("${config.llm.QWen14B}")
+    @Value("${config.llm.ChatGLM4.token}")
+    private String glm4Token;
+
+    @Value("${config.llm.ChatGLM4.modelName}")
+    private String glm4ModelName;
+
+    @Value("${config.llm.QWen14B.url}")
     private String qWen14BUrl;
 
     public AIRequestService(WebClientUtil chatgptClient, WebClientUtil chatglmClient, WebClientUtil qwenClient) {
@@ -64,7 +70,7 @@ public class AIRequestService {
 
     public AIResponse requestChatGLM(List<AIEntry> messages) {
         MyRequestObject requestObject = new MyRequestObject("ChatGLM3", messages);
-        String url = glmUrl;
+        String url = glm3Url;
 
         try {
             return chatglmClient.post(url+prefix, requestObject, AIResponse.class);
@@ -76,11 +82,11 @@ public class AIRequestService {
 
 
     public AIResponse requestChatGLM4(List<AIEntry> messages) {
-        MyRequestObject requestObject = new MyRequestObject("Qwen2-7B", messages);
-        String url = qWen7BUrl;
+        MyRequestObject requestObject = new MyRequestObject(glm4ModelName, messages);
+        String url = glm4Url;
 
         try {
-            return chatglmClient.post(url+prefix, requestObject, AIResponse.class);
+            return chatglmClient.postWithToken(url+prefix, requestObject, AIResponse.class, glm4Token);
         } catch (Exception e) {
             log.error("WebClient请求失败,AI请求失败~");
             throw new MyException(HttpStatus.INTERNAL_SERVER_ERROR.value(), HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase()+":"+"服务器请求AI出错");

+ 8 - 3
src/main/resources/application-dev.yaml

@@ -49,9 +49,14 @@ openai:
 
 config:
   llm:
-    ChatGLM3: http://10.58.0.2:6678
-    Qwen2-7B: http://10.58.0.2:8000
-    QWen14B: http://10.58.0.2:6679
+    ChatGLM3:
+      url: http://10.58.0.2:6678
+    ChatGLM4:
+      url: http://47.94.251.162:6677
+      token: seec0der
+      modelName: glm4-9b-chat
+    QWen14B:
+      url: http://10.58.0.2:6679
 
 proxy:
   enabled: true