From 3f1ea1e3240f045412189619d7e4021d5f26a4f2 Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期一, 24 六月 2024 14:14:17 +0800
Subject: [PATCH] apikey更新

---
 src/main/java/com/yb/controller/AiController.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yb/controller/AiController.java b/src/main/java/com/yb/controller/AiController.java
index ae5c676..8694787 100644
--- a/src/main/java/com/yb/controller/AiController.java
+++ b/src/main/java/com/yb/controller/AiController.java
@@ -3,9 +3,12 @@
 
 import com.alibaba.fastjson.JSON;
 import com.yb.util.OkHttpUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 
 import net.sf.json.JSONObject;
+import okhttp3.Response;
 import org.springframework.ai.ollama.OllamaChatModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +23,7 @@
 import java.util.Set;
 
 
+@Tag(name="terra openai")
 @RestController
 @RequestMapping("/api/v1")
 public class AiController {
@@ -32,16 +36,21 @@
     @Value("${spring.intent}")
     String intent ;
 
+
+
     @GetMapping("/chat")
+    @Operation(summary = "澶фā鍨嬪璇�")
     public String chat(@RequestParam(value = "message",defaultValue = "Hi") String message){
         return chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+message);
     }
 
     @GetMapping("/intent")
+    @Operation(summary = "鎰忓浘璇锋眰")
     public String intent(@RequestParam(value = "message",defaultValue = "Hi") String message){
         String json = okHttpUtil.getMessage(intent+"="+message);
-
-        return json ;
+        Map<String,String> hashMap = new HashMap<>() ;
+        iteraJson(json,hashMap);
+        return  JSON.toJSON(hashMap).toString() ;
     }
     public  boolean iteraJson(String str, Map res){
         if(str.toString().indexOf(":") == -1){
@@ -61,8 +70,10 @@
     }
 
     @GetMapping("/mix")
+    @Operation(summary = "鎰忓浘涓庡ぇ妯″瀷璇锋眰")
     public String mix(@RequestParam(value = "message",defaultValue = "Hi") String message){
-        String json = okHttpUtil.getMessage(intent+"="+message);
+        String json = okHttpUtil.postFastgpt(message);
+        System.out.println(message);
 //        JSONObject jsonObject = JSONObject.parseObject(json);
         Map<String,String> hashMap = new HashMap<>() ;
         iteraJson(json,hashMap);
@@ -76,8 +87,30 @@
         }else{
             json = hashMap.put("content", chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+message));
         }
-        return json ;
+        System.out.println(JSON.toJSON(hashMap).toString());
+        System.out.println("====================================");
+        return JSON.toJSON(hashMap).toString() ;
 
 
     }
+
+    @GetMapping("/fastgpt")
+    @Operation(summary = "鐭ヨ瘑搴撴煡璇�")
+    public String fastgpt(@RequestParam(value = "message",defaultValue = "涓夌淮瀹炴櫙") String message){
+
+        okHttpUtil.requesFast(message);
+        String json = okHttpUtil.requesFast(message);
+
+        return  json ;
+    }
+
+    @GetMapping("/fastgpt_list")
+    @Operation(summary = "鐭ヨ瘑搴撳垪琛�")
+    public String fastgpt_list(){
+
+
+        String json = okHttpUtil.requesFast_kl();
+
+        return  json ;
+    }
 }

--
Gitblit v1.9.3