opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-09-20 19:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into team

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
JiaJu Zhuang
2023-09-09 10:29:12 +08:00
parent 3066cbe71a a7f354fe91
commit 4204bc511d
20 changed files with 389 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/ChatController.java
View File

@ -89,7 +89,7 @@ public class ChatController {
/**
* chat的超时时间
*/
private static final Long CHAT_TIMEOUT = Duration.ofMinutes(10).toMillis();
private static final Long CHAT_TIMEOUT = Duration.ofMinutes(50).toMillis();
/**
* 提示语最大token数

4
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/listener/RestAIEventSourceListener.java
View File

@ -54,7 +54,7 @@ public class RestAIEventSourceListener extends EventSourceListener {
}
Message message = new Message();
if (StringUtils.isNotBlank(data)) {
message.setContent(data);
message.setContent(data.replace("\"", ""));
sseEmitter.send(SseEmitter.event()
.id(id)
.data(message)
@ -102,7 +102,7 @@ public class RestAIEventSourceListener extends EventSourceListener {
eventSource.cancel();
}
Message message = new Message();
message.setContent("出现异常,请在帮助中查看详细日志：" + bodyString);
message.setContent("Rest AI Error:" + bodyString);
sseEmitter.send(SseEmitter.event()
.id("[ERROR]")
.data(message));

37
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/TableController.java
View File

@ -2,11 +2,7 @@ package ai.chat2db.server.web.api.controller.rdb;
import java.util.List;
import ai.chat2db.server.domain.api.param.DropParam;
import ai.chat2db.server.domain.api.param.ShowCreateTableParam;
import ai.chat2db.server.domain.api.param.TablePageQueryParam;
import ai.chat2db.server.domain.api.param.TableQueryParam;
import ai.chat2db.server.domain.api.param.TableSelector;
import ai.chat2db.server.domain.api.param.*;
import ai.chat2db.server.domain.api.service.DatabaseService;
import ai.chat2db.server.domain.api.service.DlTemplateService;
import ai.chat2db.server.domain.api.service.TableService;
@ -17,13 +13,7 @@ import ai.chat2db.server.tools.base.wrapper.result.PageResult;
import ai.chat2db.server.tools.base.wrapper.result.web.WebPageResult;
import ai.chat2db.server.web.api.aspect.ConnectionInfoAspect;
import ai.chat2db.server.web.api.controller.rdb.converter.RdbWebConverter;
import ai.chat2db.server.web.api.controller.rdb.request.DdlExportRequest;
import ai.chat2db.server.web.api.controller.rdb.request.TableBriefQueryRequest;
import ai.chat2db.server.web.api.controller.rdb.request.TableCreateDdlQueryRequest;
import ai.chat2db.server.web.api.controller.rdb.request.TableDeleteRequest;
import ai.chat2db.server.web.api.controller.rdb.request.TableDetailQueryRequest;
import ai.chat2db.server.web.api.controller.rdb.request.TableModifySqlRequest;
import ai.chat2db.server.web.api.controller.rdb.request.TableUpdateDdlQueryRequest;
import ai.chat2db.server.web.api.controller.rdb.request.*;
import ai.chat2db.server.web.api.controller.rdb.vo.ColumnVO;
import ai.chat2db.server.web.api.controller.rdb.vo.IndexVO;
import ai.chat2db.server.web.api.controller.rdb.vo.SqlVO;
@ -31,6 +21,7 @@ import ai.chat2db.server.web.api.controller.rdb.vo.TableVO;
import ai.chat2db.spi.model.Table;
import ai.chat2db.spi.model.TableColumn;
import ai.chat2db.spi.model.TableIndex;
import ai.chat2db.spi.model.Type;
import com.google.common.collect.Lists;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
@ -73,7 +64,7 @@ public class TableController {
PageResult<Table> tableDTOPageResult = tableService.pageQuery(queryParam, tableSelector);
List<TableVO> tableVOS = rdbWebConverter.tableDto2vo(tableDTOPageResult.getData());
return WebPageResult.of(tableVOS, tableDTOPageResult.getTotal(), request.getPageNo(),
request.getPageSize());
request.getPageSize());
}
@ -178,9 +169,23 @@ public class TableController {
@GetMapping("/modify/sql")
public ListResult<SqlVO> modifySql(@Valid TableModifySqlRequest request) {
return tableService.buildSql(
rdbWebConverter.tableRequest2param(request.getOldTable()),
rdbWebConverter.tableRequest2param(request.getNewTable()))
.map(rdbWebConverter::dto2vo);
rdbWebConverter.tableRequest2param(request.getOldTable()),
rdbWebConverter.tableRequest2param(request.getNewTable()))
.map(rdbWebConverter::dto2vo);
}
/**
* 数据库支持的数据类型
*
* @param request
* @return
*/
@GetMapping("/type_list")
public ListResult<Type> types(@Valid TypeQueryRequest request) {
TypeQueryParam typeQueryParam = TypeQueryParam.builder().dataSourceId(request.getDataSourceId()).build();
List<Type> types = tableService.queryTypes(typeQueryParam);
return ListResult.of(types);
}
/**

16
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/request/TypeQueryRequest.java Normal file
View File

@ -0,0 +1,16 @@
package ai.chat2db.server.web.api.controller.rdb.request;
import ai.chat2db.server.web.api.controller.data.source.request.DataSourceBaseRequestInfo;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Data
public class TypeQueryRequest implements DataSourceBaseRequestInfo {
@NotNull
private Long dataSourceId;
/**
* DB名称
*/
private String databaseName;
}