dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(数据源): 校验时，展示错误信息

Browse Source
This commit is contained in:
taojinlong 2022-09-30 16:31:02 +08:00
parent bc97dd1a2d
commit 6543a9759a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -310,7 +310,7 @@ public class DatasourceService {
}
return ResultHolder.success(datasourceDTO);
} catch (Exception e) {
return ResultHolder.error(Translator.get("I18N_DS_INVALID"), e.getMessage());
return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage());
}
}
@ -350,7 +350,7 @@ public class DatasourceService {
return ResultHolder.success("Success");
} catch (Exception e) {
datasourceStatus = "Error";
return ResultHolder.error(Translator.get("I18N_DS_INVALID"), e.getMessage());
return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage());
} finally {
Datasource record = new Datasource();
record.setStatus(datasourceStatus);

4
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -222,13 +222,13 @@ I18N_START_TIME=Start time
I18N_END_TIME=End time
I18N_STATUS=Status
I18N_DATA=Data
I18N_SYNC_LOG=Sync log
I18N_SYNC_LOG=Sync logI18N_DS_INVALID
I18N_USER_DONOT_EXIST=User does not exist
I18N_USER_SOURCE_PWD_ERROR=Source password error
I18N_USER_PWD_FORMAT_ERROR=Password format error
I18N_DS_INVALID=Datasource is invalid.
I18N_DS_INVALID=Datasource is invalid
I18N_DS_INVALID_TABLE=Datasource has invalid tables

2
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -228,7 +228,7 @@ I18N_USER_DONOT_EXIST=\u7528\u6237\u4E0D\u5B58\u5728
I18N_USER_SOURCE_PWD_ERROR=\u539F\u59CB\u5BC6\u7801\u9519\u8BEF
I18N_USER_PWD_FORMAT_ERROR=\u5BC6\u7801\u683C\u5F0F\u9519\u8BEF
I18N_DS_INVALID=\u6570\u636E\u6E90\u65E0\u6548.
I18N_DS_INVALID=\u6570\u636E\u6E90\u65E0\u6548
I18N_DS_INVALID_TABLE=\u6570\u636E\u6E90\u4E2D\u6709\u65E0\u6548\u7684\u8868

2
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -224,7 +224,7 @@ I18N_USER_DONOT_EXIST=\u7528\u6236\u4E0D\u5B58\u5728
I18N_USER_SOURCE_PWD_ERROR=\u539F\u59CB\u5BC6\u78BC\u932F\u8AA4
I18N_USER_PWD_FORMAT_ERROR=\u5BC6\u78BC\u683C\u5F0F\u932F\u8AA4
I18N_DS_INVALID=\u6578\u64DA\u6E90\u7121\u6548.
I18N_DS_INVALID=\u6578\u64DA\u6E90\u7121\u6548
I18N_DS_INVALID_TABLE=\u6578\u64DA\u6E90\u4E2D\u6709\u7121\u6548\u7684\u8868