From e27759b49313637cd07afb29a534fe53ddc4cbf8 Mon Sep 17 00:00:00 2001
From: Mahone <22247537@qq.com>
Date: Tue, 17 May 2022 10:54:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=88=86=E7=B1=BB=E6=97=A0=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ES安装.MD                                          |  4 ++--
 ant-design-vue-jeecg/public/index.html               |  2 +-
 .../modules/KM/service/impl/KmDocServiceImpl.java    | 12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ES安装.MD b/ES安装.MD
index a151d25..736e848 100644
--- a/ES安装.MD
+++ b/ES安装.MD
@@ -28,7 +28,7 @@ tar zxvf elasticsearch-7.6.1-linux-x86_64.tar.gz
         sysctl -p
         　　执行命令sysctl -p生效
 
-## 安装ik分词器(可能需要科学上网)
+## 安装ik分词器(可能需要访问外网)
 cd  /usr/local/elasticsearch-7.6.1/bin
 ./elasticsearch-plugin install https://github.com/medcl/elasticsearch-analysis-ik/releases/download/v7.6.1/elasticsearch-analysis-ik-7.6.1.zip
     
@@ -59,7 +59,7 @@ cd  /usr/local/elasticsearch-7.6.1/bin
         -Xms8g 
         -Xmx8g  
 
-## 安装ik分词器(可能需要科学上网)
+## 安装ik分词器(可能需要访问外网)
 下载 [IK分词器](https://github.com/medcl/elasticsearch-analysis-ik/releases/download/v7.6.1/elasticsearch-analysis-ik-7.6.1.zip)，
 解压到 C:\software\elasticsearch-7.6.1\config\analysis-ik
     
diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html
index 4e4cbbf..8639212 100644
--- a/ant-design-vue-jeecg/public/index.html
+++ b/ant-design-vue-jeecg/public/index.html
@@ -251,7 +251,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 科亿知识库,请耐心等待
+    <div class="load_title">正在加载 科亿知识库,首次加载会比较慢，请耐心等待
 
     </div>
   </div>
diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java
index ff889d4..190230f 100644
--- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java
@@ -212,7 +212,7 @@ public class KmDocServiceImpl extends ServiceImpl<KmDocMapper, KmDoc> implements
 
     @Override
     public void convertDocSync(KmDoc kmDoc) {
-        kmDoc = super.getById(kmDoc.getId());
+        //kmDoc = super.getById(kmDoc.getId());
         if (kmDoc.getConvertFlag() != null && !kmDoc.getConvertFlag().equals(DocConvertFlagEnum.WaitConvert.getCode())) {
             return;
         }
@@ -1225,8 +1225,16 @@ public class KmDocServiceImpl extends ServiceImpl<KmDocMapper, KmDoc> implements
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return Result.error(result.getMessage());
         }
-        else
+        else {
+            //保存到ES
+            result = saveDocToEs(kmdocTarget);
+            if (result.getCode() != CommonConstant.SC_OK_200) {
+                //事务回滚
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return Result.error(result.getMessage());
+            }
             return Result.OK("修改成功");
+        }
     }
 
     //editAndRelease