opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-07-30 03:03:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
robin
2023-10-26 15:05:30 +08:00
parent 2258421541 551c6881b6
commit 68b48717e4
46 changed files with 631 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlController.java
View File

@ -93,7 +93,7 @@ public class RdbDmlController {
try {
boolean flag = true;
ExecuteResultVO executeResult = null;
connection.setAutoCommit(false);
//connection.setAutoCommit(false);
ListResult<ExecuteResult> resultDTOListResult = dlTemplateService.execute(param);
List<ExecuteResultVO> resultVOS = rdbWebConverter.dto2vo(resultDTOListResult.getData());
if (!CollectionUtils.isEmpty(resultVOS)) {
@ -107,7 +107,7 @@ public class RdbDmlController {
}
}
if (flag) {
connection.commit();
//connection.commit();
return DataResult.of(resultVOS.get(0));
}else {
connection.rollback();

2
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/doc/DatabaseExportService.java
View File

@ -108,7 +108,7 @@ public class DatabaseExportService {
try {
export(outputStream, exportOptions);
} catch (Exception e) {
throw new RuntimeException("导出失败！请联系开发者，邮箱：963565242@qq.com" + e);
throw new RuntimeException("导出失败！请联系开发者" + e);
}
init();
}