Skip to content

Commit be3eaa2

Browse files
JerryFan626JerryFan626
committed
Merge branch 'developing' of github.com:chat2db/Chat2DB into developing
2 parents 131e87d + 1abb566 commit be3eaa2

15 files changed

Lines changed: 80 additions & 64 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@ jobs:
7272
java-package: "jre"
7373
architecture: "aarch64"
7474

75+
# java.security 开放tls1 Windows
76+
- name: Enable tls1
77+
if: ${{ runner.os == 'Windows' }}
78+
run: |
79+
sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}/conf/security/java.security"
80+
81+
# java.security 开放tls1 macOS
82+
- name: Enable tls1
83+
if: ${{ runner.os == 'macOS' }}
84+
run: |
85+
sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" $JAVA_HOME/conf/security/java.security
86+
7587
# 复制jre Windows
7688
- name: Copy Jre for Windows
7789
if: ${{ runner.os == 'Windows' }}

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
# matrix:
1010
# include:
1111
# - os: windows-latest
12-
## - os: macos-latest
13-
## arch: amd64
14-
## - os: macos-latest
15-
## arch: arm64
16-
## variant: v8
12+
# - os: macos-latest
1713
# runs-on: ${{ matrix.os }}
1814
# steps:
1915
# - name: Check out Git repository
@@ -29,14 +25,15 @@
2925
#
3026
# # java.security 开放tls1 Windows
3127
# - name: Enable tls1
28+
# if: ${{ runner.os == 'Windows' }}
3229
# run: |
3330
# sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}/conf/security/java.security"
3431
# cat "${{ env.JAVA_HOME }}/conf/security/java.security"
3532
#
36-
##
37-
## # 编译服务端java版本
38-
## - name: Build Java
39-
## run: mvn clean package -B '-Dmaven.test.skip=true' -f ali-dbhub-server/pom.xml
4033
#
41-
## - name: Test with Maven
42-
## run: mvn test -B -Dmaven.test.skip=false -pl ali-dbhub-server-test -am -f ali-dbhub-server/pom.xml
34+
# # java.security 开放tls1 macOS
35+
# - name: Enable tls1
36+
# if: ${{ runner.os == 'macOS' }}
37+
# run: |
38+
# sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" $JAVA_HOME/conf/security/java.security
39+
# cat $JAVA_HOME/conf/security/java.security

‎chat2db-server/chat2db-plugins/chat2b-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlDBManage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void connectDatabase(String database) {
1313
return;
1414
}
1515
try {
16-
SQLExecutor.getInstance().execute("use `" + database + "`;", null);
16+
SQLExecutor.getInstance().execute("use `" + database + "`;");
1717
} catch (SQLException e) {
1818
throw new RuntimeException(e);
1919
}

‎chat2db-server/chat2db-plugins/chat2b-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public MetaData getMetaData() {
2020

2121
@Override
2222
public DBManage getDBManage() {
23-
return null;
23+
return new MysqlDBManage();
2424
}
2525
}

‎chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DataSourceServiceImpl.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,18 @@ public ListResult<DataSource> queryByIds(List<Long> ids) {
114114
}
115115

116116
@Override
117-
public ActionResult preConnect(DataSourcePreConnectParam param) {
117+
public ActionResult preConnect(DataSourcePreConnectParam param) {
118118
DataSourceTestParam testParam
119-
= dataSourceConverter.param2param(param);
120-
121-
DriverConfig driverConfig = new DriverConfig();
122-
driverConfig.setJdbcDriver(param.getDriver());
123-
driverConfig.setJdbcDriverClass(param.getDriver());//todo
119+
= dataSourceConverter.param2param(param);
124120

121+
// todo
122+
// DriverConfig driverConfig = new DriverConfig();
123+
// driverConfig.setJdbcDriver(param.getDriver());
124+
// driverConfig.setJdbcDriverClass(param.getDriver());
125+
DriverConfig driverConfig = Chat2DBContext.getDefaultDriverConfig(param.getType());
125126
DataSourceConnect dataSourceConnect = JdbcUtils.testConnect(testParam.getUrl(), testParam.getHost(),
126-
testParam.getPort(),
127-
testParam.getUsername(), testParam.getPassword(),testParam.getDbType(),
127+
testParam.getPort(),
128+
testParam.getUsername(), testParam.getPassword(), testParam.getDbType(),
128129
driverConfig, param.getSsh(), KeyValue.toMap(param.getExtendInfo()));
129130
if (BooleanUtils.isNotTrue(dataSourceConnect.getSuccess())) {
130131
return ActionResult.fail(dataSourceConnect.getMessage(), dataSourceConnect.getDescription());

‎chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/DlTemplateServiceImpl.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
import ai.chat2db.spi.sql.Chat2DBContext;
2828
import ai.chat2db.spi.sql.SQLExecutor;
2929
import ai.chat2db.spi.util.JdbcUtils;
30-
import com.alibaba.druid.DbType;
31-
import com.alibaba.druid.sql.PagerUtils;
32-
import com.alibaba.druid.sql.SQLUtils;
33-
import com.alibaba.druid.sql.ast.SQLStatement;
34-
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
35-
import com.alibaba.druid.sql.parser.SQLParserUtils;
3630
import lombok.extern.slf4j.Slf4j;
3731
import org.apache.commons.collections4.CollectionUtils;
3832
import org.apache.commons.lang3.BooleanUtils;
@@ -123,7 +117,7 @@ public DataResult<Long> count(DlCountParam param) {
123117
// 解析sql分页
124118
SQLStatement sqlStatement = SQLUtils.parseSingleStatement(sql, dbType);
125119
if (!(sqlStatement instanceof SQLSelectStatement)) {
126-
throw new BusinessException("当前sql不是查询语句");
120+
throw new BusinessException("dataSource.sqlAnalysisError");
127121
}
128122
sql = PagerUtils.count(sql, dbType);
129123
ExecuteResult executeResult = execute(sql);

‎chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/exception/convertor/ExceptionConvertorUtils.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.util.List;
44

55
import ai.chat2db.server.tools.base.constant.SymbolConstant;
6-
76
import ai.chat2db.server.tools.common.util.I18nUtils;
87
import org.springframework.util.CollectionUtils;
98
import org.springframework.validation.BindingResult;
9+
import org.springframework.validation.FieldError;
1010
import org.springframework.validation.ObjectError;
1111

1212
/**
@@ -35,6 +35,10 @@ public static String buildMessage(BindingResult result) {
3535
msg.append(index++);
3636
// 得到错误消息
3737
msg.append(SymbolConstant.DOT);
38+
if (e instanceof FieldError fieldError) {
39+
msg.append(fieldError.getField());
40+
msg.append(" : ");
41+
}
3842
msg.append(e.getDefaultMessage());
3943
msg.append(SymbolConstant.SEMICOLON);
4044
}

‎chat2db-server/chat2db-server-start/src/main/resources/i18n/messages.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
common.businessError=请尝试重新提交或者刷新页面
1+
common.businessError=Please try resubmitting or refreshing the page later
22
common.systemError=系统开小差啦，请尝试刷新页面或者联系管理员
33
common.needLoggedIn=需要登陆页面
44
common.redirect=重定向页面

‎chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_en_US.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
common.businessError=请尝试重新提交或者刷新页面
1+
common.businessError=Please try resubmitting or refreshing the page later
22
common.systemError=系统开小差啦，请尝试刷新页面或者联系管理员
33
common.needLoggedIn=需要登陆页面
44
common.redirect=重定向页面

‎chat2db-server/chat2db-server-start/src/main/resources/i18n/messages_zh_CN.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
common.businessError=请尝试重新提交或者刷新页面
2-
common.systemError=系统开小差啦，请尝试刷新页面或者联系管理员
2+
common.systemError=系统发生异常，可在帮助中查看异常详情，如无法解决，可关注微信公众号Text2SQL咨询帮助
33
common.needLoggedIn=需要登陆页面
44
common.redirect=重定向页面
55
common.paramError=您输入的参数异常

0 commit comments

Comments
 (0)