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

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

Browse Source
This commit is contained in:
JiaJu Zhuang
2023-07-09 19:18:29 +08:00
parent d0cdb420c0 cc781330a5
commit fd4fbac3df
25 changed files with 272 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/DataSourceController.java
View File

@ -38,6 +38,7 @@ import com.jcraft.jsch.Session;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@ -179,6 +180,11 @@ public class DataSourceController {
public DataResult<DataSourceVO> queryById(@PathVariable("id") Long id) {
DataResult<DataSource> dataResult = dataSourceService.queryById(id);
DataSourceVO dataSourceVO = dataSourceWebConverter.dto2vo(dataResult.getData());
if(StringUtils.isNotBlank(dataSourceVO.getUser())){
dataSourceVO.setAuthenticationType("1");
}else {
dataSourceVO.setAuthenticationType("2");
}
return DataResult.of(dataSourceVO);
}

9
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceCreateRequest.java
View File

@ -42,9 +42,13 @@ public class DataSourceCreateRequest {
@NotNull
private String password;
/**
* 认证类型
*/
private String authenticationType;
/**
* 连接类型
* @see DbTypeEnum
*/
@NotNull
private String type;
@ -100,4 +104,7 @@ public class DataSourceCreateRequest {
* 驱动配置
*/
private DriverConfig driverConfig;
}

5
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceTestRequest.java
View File

@ -47,7 +47,10 @@ public class DataSourceTestRequest {
@NotNull
private String type;
/**
* 认证类型
*/
private String authenticationType;
/**
* host

4
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/vo/DataSourceVO.java
View File

@ -40,6 +40,10 @@ public class DataSourceVO {
*/
private String password;
/**
* 认证类型
*/
private String authenticationType;
/**
* 连接类型
*/