From c7ca96823c54650ed6c7a8d32cef334c60b72147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 31 Dec 2024 11:59:39 +0800
Subject: [PATCH] 'commit'

---
 src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java | 6 +++++-
 src/main/java/Tools/MaxKb/UploadQA1.java              | 7 ++++---
 src/main/resources/MaxKb.properties                   | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java b/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
index f95949da..0b14a9d0 100644
--- a/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
+++ b/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
@@ -159,7 +159,7 @@ public class MaxKbImpl {
      * @return
      */
     public static JSONObject generateQuestion(String zskId, String modelId, String documentId) {
-        String authCode=MaxKbImpl.getAuthorization();
+        String authCode = MaxKbImpl.getAuthorization();
         String url = baseUrl + "/api/dataset/" + zskId + "/document/batch_generate_related";
         JSONObject jo = new JSONObject();
         jo.put("model_id", modelId);
@@ -167,6 +167,10 @@ public class MaxKbImpl {
         List<String> list = new ArrayList<>();
         list.add(documentId);
         jo.put("document_id_list", list);
+
+        System.out.println("modelId=" + modelId);
+        System.out.println(jo.toString());
+
         HttpResponse response = HttpRequest.put(url)
                 .header("Accept", "application/json, text/plain, */*")
                 .header("Accept-Encoding", "gzip,deflate")
diff --git a/src/main/java/Tools/MaxKb/UploadQA1.java b/src/main/java/Tools/MaxKb/UploadQA1.java
index 4795c6e4..5b4637ba 100644
--- a/src/main/java/Tools/MaxKb/UploadQA1.java
+++ b/src/main/java/Tools/MaxKb/UploadQA1.java
@@ -2,6 +2,7 @@ package Tools.MaxKb;
 
 import Tools.MaxKb.Service.MaxKbService;
 import Tools.MaxKb.Util.MaxKbUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.jfinal.kit.PropKit;
 
@@ -20,14 +21,14 @@ public class UploadQA1 {
         String documentId = MaxKbService.uploadQA(zskName, uploadFile);
         //2、使用哪个模型
         String modelName = PropKit.get("modelName");
-        String model_id = MaxKbService.getModelIdByModelName(modelName);
-
+        Thread.sleep(30000);
         //3、等待模型生成问题完毕
         while (true) {
             boolean finish = MaxKbService.autoIndexed(documentId);
             if (finish) {
                 //手动生成问题
-                MaxKbService.generateQuestion(zskName, model_id, documentId);
+                JSONObject res = MaxKbService.generateQuestion(zskName, modelName, documentId);
+                System.out.println(res);
                 break;
             }
             Thread.sleep(10000);
diff --git a/src/main/resources/MaxKb.properties b/src/main/resources/MaxKb.properties
index c48bfdf3..7be7272b 100644
--- a/src/main/resources/MaxKb.properties
+++ b/src/main/resources/MaxKb.properties
@@ -9,4 +9,4 @@ baseUrl=http://10.10.14.206:8080
 MaxKBUsername=admin
 MaxKBPassword=Dsideal4r5t6y7u!@#
 # 大语言模型名称【通义千问qwen-max】
-modelName=我的模型
\ No newline at end of file
+modelName=DeepSeek
\ No newline at end of file