From 7713bf908252d004da5e80454efe07950867cc3e Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期二, 25 三月 2025 10:17:05 +0800
Subject: [PATCH] feat: 1
---
/dev/null | 67 ---------------------------------
ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java | 2 -
ruoyi-admin/src/main/java/org/ruoyi/controller/IndexController.java | 16 +------
3 files changed, 3 insertions(+), 82 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/IndexController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/IndexController.java
index d7e2427..ecbfe71 100644
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/IndexController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/IndexController.java
@@ -2,8 +2,8 @@
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* 棣栭〉
@@ -12,7 +12,7 @@
*/
@SaIgnore
@RequiredArgsConstructor
-@Controller
+@RestController
public class IndexController {
/**
@@ -20,17 +20,7 @@
*/
@GetMapping("/")
public String index() {
- return "RuoYi-AI 鍚姩鎴愬姛锛�";
- }
-
- @GetMapping("/success")
- public String success(){
- return "paySuccess.html";
- }
-
- @GetMapping("/cancel")
- public String cancel(){
- return "cancel";
+ return "RuoYi-AI 鍚姩鎴愬姛";
}
}
diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java
index 6b353a7..d51b2f5 100644
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java
@@ -1,7 +1,6 @@
package org.ruoyi.controller;
import cn.dev33.satoken.stp.StpUtil;
-import com.theokanning.openai.completion.chat.ChatMessageRole;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
@@ -39,7 +38,6 @@
import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-import java.util.ArrayList;
import java.util.List;
diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/OllamaController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/OllamaController.java
deleted file mode 100644
index 647eb47..0000000
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/OllamaController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.ruoyi.controller;
-
-
-import io.github.ollama4j.OllamaAPI;
-import io.github.ollama4j.exceptions.OllamaBaseException;
-import io.github.ollama4j.models.chat.OllamaChatMessageRole;
-import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
-import io.github.ollama4j.models.chat.OllamaChatRequestModel;
-import io.github.ollama4j.models.chat.OllamaChatResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-
-/**
- * 鎻忚堪锛歄llama API璋冪敤
- *
- * @author ageerle@163.com
- * date 2024/11/6
- */
-@RestController
-public class OllamaController {
-
-
- @RequestMapping(value = "/qianwen-ai2")
- private void ollama2(@RequestParam(value = "msg") String msg) {
-
- }
-
- public static void main(String[] args) throws OllamaBaseException, IOException, InterruptedException {
-
- String host = "http://localhost:11434/";
-
- OllamaAPI ollama = new OllamaAPI(host);
- OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.getInstance("qwen2.5:7b");
- // 璁剧疆瓒呮椂鏃堕棿
- ollama.setRequestTimeoutSeconds(100);
- // create first user question
- String text = "";
-
- String json = "{\"instruction\": \"瑙ｇ瓟浠ヤ笅鏁板闂銆俓",\"input\": \"璁＄畻 2 + 3 鐨勭粨鏋溿�俓",\"output\": \"2 + 3 = 5\"}";
-
- OllamaChatRequestModel requestModel = builder.withMessage
- (OllamaChatMessageRole.USER, "###鏂囨湰:"+text+"###,鐞嗚В鏂囨湰鍐呭锛屽苟涓斿皢鏂囨湰鍐呭杞崲涓�:"+json+"杈撳嚭JSON鏍煎紡,涓嶈鍖呭惈鍏朵粬鏃犲叧鍐呭,鍐呴儴浣跨敤鏃犻渶鑴辨晱")
- .withGetJsonResponse()
- .withStreaming()
- .build();
-
- // start conversation with model
- OllamaChatResult chatResult = ollama.chat(requestModel);
-
- System.out.println("First answer: " + chatResult.getResponse());
-
- // create next userQuestion
- // requestModel = builder.withMessages(chatResult.getChatHistory()).withMessage(OllamaChatMessageRole.USER, "And what is the second largest city?").build();
-
- // "continue" conversation with model
- // chatResult = ollamaAPI.chat(requestModel);
-
- //System.out.println("Second answer: " + chatResult.getResponse());
-
- // 鍘嗗彶璁板綍
- //System.out.println("Chat History: " + chatResult.getChatHistory());
- }
-
-}
--
Gitblit v1.9.3