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/util/OkHttpUtil.java | 30 ++++++++++----
src/main/java/com/yb/controller/AiController.java | 12 ++++-
pom.xml | 18 +++++++++
src/main/java/com/yb/entity/ResponseEntity.java | 9 ++++
src/main/resources/application.yml | 3 +
5 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d85da5..a26600e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,24 @@
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
<version>2.1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.26</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.26</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.26</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
diff --git a/src/main/java/com/yb/controller/AiController.java b/src/main/java/com/yb/controller/AiController.java
index dbd9b3b..8694787 100644
--- a/src/main/java/com/yb/controller/AiController.java
+++ b/src/main/java/com/yb/controller/AiController.java
@@ -3,6 +3,7 @@
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;
@@ -38,11 +39,13 @@
@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);
Map<String,String> hashMap = new HashMap<>() ;
@@ -67,6 +70,7 @@
}
@GetMapping("/mix")
+ @Operation(summary = "鎰忓浘涓庡ぇ妯″瀷璇锋眰")
public String mix(@RequestParam(value = "message",defaultValue = "Hi") String message){
String json = okHttpUtil.postFastgpt(message);
System.out.println(message);
@@ -91,7 +95,8 @@
}
@GetMapping("/fastgpt")
- public String fastgpt(@RequestParam(value = "message",defaultValue = "Hi") String message){
+ @Operation(summary = "鐭ヨ瘑搴撴煡璇�")
+ public String fastgpt(@RequestParam(value = "message",defaultValue = "涓夌淮瀹炴櫙") String message){
okHttpUtil.requesFast(message);
String json = okHttpUtil.requesFast(message);
@@ -100,10 +105,11 @@
}
@GetMapping("/fastgpt_list")
- public String fastgpt_list(String parentId){
+ @Operation(summary = "鐭ヨ瘑搴撳垪琛�")
+ public String fastgpt_list(){
- String json = okHttpUtil.requesFast_kl(parentId);
+ String json = okHttpUtil.requesFast_kl();
return json ;
}
diff --git a/src/main/java/com/yb/entity/ResponseEntity.java b/src/main/java/com/yb/entity/ResponseEntity.java
new file mode 100644
index 0000000..39bb774
--- /dev/null
+++ b/src/main/java/com/yb/entity/ResponseEntity.java
@@ -0,0 +1,9 @@
+package com.yb.entity;
+
+import lombok.Data;
+
+@Data
+public class ResponseEntity {
+ private String[] eveent;
+ private String[] data ;
+}
diff --git a/src/main/java/com/yb/util/OkHttpUtil.java b/src/main/java/com/yb/util/OkHttpUtil.java
index 94d050e..fcdf3ee 100644
--- a/src/main/java/com/yb/util/OkHttpUtil.java
+++ b/src/main/java/com/yb/util/OkHttpUtil.java
@@ -1,6 +1,8 @@
package com.yb.util;
import com.alibaba.fastjson.JSON;
+import com.google.gson.Gson;
+import com.yb.entity.ResponseEntity;
import okhttp3.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -79,11 +81,12 @@
}
public String requesFast(String message){
- OkHttpClient client = new OkHttpClient();
+ System.out.println("fastgpt:"+message) ;
+ OkHttpClient client = new OkHttpClient();
Response response = null ;
// 鍒涘缓璇锋眰澶达紙Headers锛�
okhttp3.Headers headers = new okhttp3.Headers.Builder()
- .add("Authorization", "Bearer fastgpt-rML09d7nyx8Bn2Al3UipZia3Q8FNuXdekU1nyMlgCfHNwS8NN1giSPNZ1y6Wmt")
+ .add("Authorization", "Bearer "+apikey)
.build();
/*
@@ -105,7 +108,7 @@
// 鏋勫缓璇锋眰浣擄紙RequestBody锛夛紝杩欓噷浣跨敤鐨勬槸瀛楃涓茬被鍨嬬殑璇锋眰鏁版嵁
HashMap<String,Object> hashMap = new HashMap<>() ;
- hashMap.put("chatId",""+Math.random()*100000);
+ hashMap.put("chatId","1111");
hashMap.put("stream","false");
hashMap.put("detail","false");
List<HashMap<String,String>> list = new ArrayList<>();
@@ -130,7 +133,15 @@
if (response.isSuccessful()) {
//System.out.println("Success: " + response.body().string());
String rep = response.body().string();
- return rep ;
+ if( rep.indexOf("flowResponses") > 0) {
+ int index = rep.indexOf("flowResponses");
+ int index_s = rep.indexOf("data", index);
+ String data = rep.substring(index_s + 5);
+ System.out.println(data);
+ return data;
+ }else{
+ return rep ;
+ }
} else {
System.out.println("Error: " + response.code() + " " + response.message());
}
@@ -139,15 +150,15 @@
}
- return response != null?response.body().toString():"null" ;
+ return null ;
}
- public String requesFast_kl(String parentId){
+ public String requesFast_kl(){
OkHttpClient client = new OkHttpClient();
Response response = null ;
// 鍒涘缓璇锋眰澶达紙Headers锛�
okhttp3.Headers headers = new okhttp3.Headers.Builder()
- .add("Authorization", "Bearer fastgpt-rML09d7nyx8Bn2Al3UipZia3Q8FNuXdekU1nyMlgCfHNwS8NN1giSPNZ1y6Wmt")
+ .add("Authorization", "Bearer "+apikey)
.build();
/*
@@ -159,7 +170,7 @@
// 鍒涘缓璇锋眰锛圧equest锛�
- if( parentId != null ) fastgpt_kl = fastgpt_kl+"锛焢arentId="+parentId;
+
okhttp3.Request.Builder builder = new okhttp3.Request.Builder()
.url(fastgpt_kl)
.headers(headers) ;
@@ -171,7 +182,8 @@
response = client.newCall(request).execute();
if (response.isSuccessful()) {
//System.out.println("Success: " + response.body().string());
- String rep = response.body().string();
+ String rep = response.body().toString();
+
return rep ;
} else {
System.out.println("Error: " + response.code() + " " + response.message());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0247aeb..868a393 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,8 @@
model: qwen:1.8b
intent: http://106.120.22.26:5367/intention?message
fastgpt:
- apikey: fastgpt-rML09d7nyx8Bn2Al3UipZia3Q8FNuXdekU1nyMlgCfHNwS8NN1giSPNZ1y6Wmt
+ appid: 6673bfa1d14da0cede023f28
+ apikey: fastgpt-dPcuRIABVdEdnQ5cGI1iL5uIIClxMZ4SYO79hrqs2OKXlh3IUU7jFF
url: http://192.168.11.28/api/v1/chat/completions
kc: http://192.168.11.28/api/core/dataset/create
kl: http://192.168.11.28/api/core/dataset/list
--
Gitblit v1.9.3