From 7cb7697353c31b257bde7638653c6228e72940a2 Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Mon, 18 Dec 2023 23:15:23 +0800 Subject: [PATCH] (improvement)(chat) Modify the order of demo loaders (#542) Co-authored-by: jolunoluo --- .../listener/ApplicationStartedListener.java | 2 +- .../com/tencent/supersonic/ChatDemoLoader.java | 16 +++++++++++++++- .../java/com/tencent/supersonic/DemoLoader.java | 1 - 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/listener/ApplicationStartedListener.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/listener/ApplicationStartedListener.java index 24bfefba8..c02759717 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/listener/ApplicationStartedListener.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/listener/ApplicationStartedListener.java @@ -17,7 +17,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component -@Order(5) +@Order(2) public class ApplicationStartedListener implements CommandLineRunner { @Autowired diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java index 597cdc1d3..55b1346bb 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java @@ -34,6 +34,8 @@ import com.tencent.supersonic.common.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.CommandLineRunner; +import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -43,7 +45,8 @@ import java.util.List; @Component @Slf4j -public class ChatDemoLoader { +@Order(3) +public class ChatDemoLoader implements CommandLineRunner { private User user = User.getFakeUser(); @Qualifier("chatQueryService") @@ -60,6 +63,13 @@ public class ChatDemoLoader { @Autowired private SysParameterService sysParameterService; + @Override + public void run(String... args) throws Exception { + if (checkEnable()) { + doRun(); + } + } + public void doRun() { try { addSysParameter(); @@ -490,4 +500,8 @@ public class ChatDemoLoader { agentService.createAgent(agent, User.getFakeUser()); } + private boolean checkEnable() { + return chatService.getLastQuery(1L) == null; + } + } diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/DemoLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/DemoLoader.java index 34ea6bf23..a0fcd6378 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/DemoLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/DemoLoader.java @@ -37,7 +37,6 @@ public class DemoLoader implements CommandLineRunner { } modelDataDemoLoader.doRun(); benchMarkDemoLoader.doRun(); - chatDemoLoader.doRun(); } private boolean checkLoadDemo() {