From 12aae5acd8449d896278e4274c245b4a9a69aafb Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期二, 25 六月 2024 16:16:40 +0800
Subject: [PATCH] 空异常处理mix接口
---
src/main/java/com/yb/util/OkHttpUtil.java | 4 +
.idea/uiDesigner.xml | 124 +++++++++++++++++++++++++++++++++++++++++
src/main/java/com/yb/controller/AiController.java | 18 +++--
pom.xml | 6 --
src/main/resources/application.yml | 11 ++-
5 files changed, 146 insertions(+), 17 deletions(-)
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a26600e..684fde7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,12 +78,6 @@
<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 8694787..2ded6a3 100644
--- a/src/main/java/com/yb/controller/AiController.java
+++ b/src/main/java/com/yb/controller/AiController.java
@@ -41,7 +41,7 @@
@GetMapping("/chat")
@Operation(summary = "澶фā鍨嬪璇�")
public String chat(@RequestParam(value = "message",defaultValue = "Hi") String message){
- return chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+message);
+ return chatModel.call(message);
}
@GetMapping("/intent")
@@ -72,21 +72,25 @@
@GetMapping("/mix")
@Operation(summary = "鎰忓浘涓庡ぇ妯″瀷璇锋眰")
public String mix(@RequestParam(value = "message",defaultValue = "Hi") String message){
- String json = okHttpUtil.postFastgpt(message);
+ String json = okHttpUtil.getMessage(intent+"="+message);
System.out.println(message);
// JSONObject jsonObject = JSONObject.parseObject(json);
Map<String,String> hashMap = new HashMap<>() ;
- iteraJson(json,hashMap);
+ String place = null ;
+ if( json != null) {
+ iteraJson(json, hashMap);
- String place = hashMap.get("place");
+ place = hashMap.get("place");
+ }
if( place != null ){
- String llm = chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+place);
+ String llm = chatModel.call(place);
hashMap.put("content",llm);
json = JSON.toJSON(hashMap).toString() ;
}else{
- json = hashMap.put("content", chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+message));
+ json = hashMap.put("content", chatModel.call(message));
}
+ hashMap.put("code","200");
System.out.println(JSON.toJSON(hashMap).toString());
System.out.println("====================================");
return JSON.toJSON(hashMap).toString() ;
@@ -98,7 +102,7 @@
@Operation(summary = "鐭ヨ瘑搴撴煡璇�")
public String fastgpt(@RequestParam(value = "message",defaultValue = "涓夌淮瀹炴櫙") String message){
- okHttpUtil.requesFast(message);
+ //okHttpUtil.requesFast(message);
String json = okHttpUtil.requesFast(message);
return json ;
diff --git a/src/main/java/com/yb/util/OkHttpUtil.java b/src/main/java/com/yb/util/OkHttpUtil.java
index fcdf3ee..cd9199c 100644
--- a/src/main/java/com/yb/util/OkHttpUtil.java
+++ b/src/main/java/com/yb/util/OkHttpUtil.java
@@ -5,6 +5,7 @@
import com.yb.entity.ResponseEntity;
import okhttp3.*;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RestController;
@@ -80,6 +81,7 @@
return null ;
}
+ @Async
public String requesFast(String message){
System.out.println("fastgpt:"+message) ;
OkHttpClient client = new OkHttpClient();
@@ -137,7 +139,7 @@
int index = rep.indexOf("flowResponses");
int index_s = rep.indexOf("data", index);
String data = rep.substring(index_s + 5);
- System.out.println(data);
+ System.out.println("data is ok....");
return data;
}else{
return rep ;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 868a393..e6699da 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,18 +7,23 @@
name: ollama-ai
ai:
ollama:
- base-url: http://192.168.11.41:11434
+ base-url: http://192.168.11.104:11434
chat:
# model: yi:9b-chat-v1.5-q4_0
- model: qwen:1.8b
+ model: qwen2:1.5b
intent: http://106.120.22.26:5367/intention?message
fastgpt:
appid: 6673bfa1d14da0cede023f28
- apikey: fastgpt-dPcuRIABVdEdnQ5cGI1iL5uIIClxMZ4SYO79hrqs2OKXlh3IUU7jFF
+ apikey: fastgpt-4HbHYUnw3ICJWwIAObTfq2BWV94KQzsssFSrM3MMZjjCZrYjulv5zqp5RVL
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
kd: http://192.168.11.28/api/core/dataset/detail
+# apikey: fastgpt-hTO28RRPbu8nvPk7mp4jYHHLWfoKfgtATtkOqy1WyoRq30qR7WPtac
+# url: http://192.168.11.104:13000/api/v1/chat/completions
+# kc: http://192.168.11.104:13000/api/core/dataset/create
+# kl: http://192.168.11.104:13000/api/core/dataset/list
+# kd: http://192.168.11.104:13000/api/core/dataset/detail
--
Gitblit v1.9.3