Merge fa65b6eff7 into e5a41765b4

这里的多数据集其实对召回的结果没有影响，取第一个就好了

assembly/bin/supersonic-daemon.bat

@@ -20,7 +20,9 @@ if "%profile%"=="" (
 
 set "model_name=%service%"
 
-cd %baseDir%
+REM fix path configuration - point to the correct release package directory
+set "releaseDir=%buildDir%\supersonic-%service%-1.0.0-SNAPSHOT"
+cd %releaseDir%
 
 if "%command%"=="restart" (
    call :stop
@@ -50,20 +52,58 @@ if "%command%"=="restart" (
 
 :runJavaService
    echo 'java service starting, see logs in logs/'
-   set "libDir=%baseDir%\lib"
+   echo 'Using release directory: %releaseDir%'
-   set "confDir=%baseDir%\conf"
+   
-   set "webDir=%baseDir%\webapp"
+   REM use release package directory as base path
-   set "logDir=%baseDir%\logs"
+   set "libDir=%releaseDir%\lib"
-   set "classpath=%baseDir%;%webDir%;%libDir%\*;%confDir%"
+   set "confDir=%releaseDir%\conf"
-   set "property=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile%"
+   set "webDir=%releaseDir%\webapp"
-   set "java-command=%property% -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%"
+   set "logDir=%releaseDir%\logs"
+   
+   REM fix variable name matching problem
+   set "CLASSPATH=%releaseDir%;%webDir%;%libDir%\*;%confDir%"
+   set "MAIN_CLASS=%main_class%"
+   
+   REM add port configuration
+   set "property=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile% -Dserver.port=9080"
+   set "java_command=%property% -Xms1024m -Xmx2048m -cp "%CLASSPATH%" %MAIN_CLASS%"
+   
    if not exist %logDir% mkdir %logDir%
-   start /B java %java-command% >nul 2>&1
+   
-   timeout /t 10 >nul
+   REM check if the main jar file exists
+   if not exist "%libDir%\launchers-standalone-1.0.0-SNAPSHOT.jar" (
+       echo "Error: Main jar file not found in %libDir%"
+       echo "Please make sure the application has been built and packaged correctly."
+       goto :EOF
+   )
+   
+   echo 'Main Class: %MAIN_CLASS%'
+   echo 'Profile: %profile%'
+   echo 'Starting Java service...'
+   
+   REM start service and save logs
+   start /B java %java_command% > "%logDir%\supersonic.log" 2>&1
+   timeout /t 15 >nul
+   
+   REM check service status
+   netstat -an | findstr ":9080" >nul
+   if errorlevel 1 (
+       echo "Warning: Port 9080 is not listening"
+       echo "Please check the log file: %logDir%\supersonic.log"
+       if exist "%logDir%\supersonic.log" (
+           echo "Recent log entries:"
+           powershell -Command "Get-Content '%logDir%\supersonic.log' | Select-Object -Last 10"
+       )
+   ) else (
+       echo "Service started successfully on port 9080"
+       echo "You can access the application at: http://localhost:9080"
+   )
+   
    echo 'java service started'
    goto :EOF
 
 :stopJavaService
+   echo 'Stopping Java service...'
    for /f "tokens=2" %%i in ('tasklist ^| findstr /i "java"') do (
             taskkill /PID %%i /F
             echo "java service (PID = %%i) is killed."

chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java

@@ -88,10 +88,10 @@ public class WebServiceQuery extends PluginSemanticQuery {
         restTemplate = ContextUtils.getBean(RestTemplate.class);
         try {
             responseEntity =
-                    restTemplate.exchange(requestUrl, HttpMethod.POST, entity, Object.class);
+                    restTemplate.exchange(requestUrl, HttpMethod.POST, entity, String.class);
             objectResponse = responseEntity.getBody();
             log.info("objectResponse:{}", objectResponse);
-            Map<String, Object> response = JsonUtil.objectToMap(objectResponse);
+            Map<String, Object> response = JSON.parseObject(objectResponse.toString());
             webServiceResponse.setResult(response);
         } catch (Exception e) {
             log.info("Exception:{}", e.getMessage());

chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java

@@ -19,7 +19,7 @@ public class ParseContext {
     }
 
     public boolean enableNL2SQL() {
-        return Objects.nonNull(agent) && agent.containsDatasetTool();
+        return Objects.nonNull(agent) && agent.containsDatasetTool()&&response.getSelectedParses().size() == 0;
     }
 
     public boolean enableLLM() {