center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 行权限系统变量

Browse Source
This commit is contained in:
taojinlong 2022-03-31 22:51:54 +08:00
parent fd8e98f44c
commit 178a411131
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -367,11 +367,10 @@ public class JdbcProvider extends DatasourceProvider {
public String checkStatus(DatasourceRequest datasourceRequest) throws Exception { public String checkStatus(DatasourceRequest datasourceRequest) throws Exception {
String queryStr = getTablesSql(datasourceRequest); String queryStr = getTablesSql(datasourceRequest);
try (Connection con = getConnection(datasourceRequest); Statement statement = con.createStatement(); ResultSet resultSet = statement.executeQuery(queryStr)) { try (Connection con = getConnection(datasourceRequest); Statement statement = con.createStatement(); ResultSet resultSet = statement.executeQuery(queryStr)) {
return "Success";
} catch (Exception e) { } catch (Exception e) {
DataEaseException.throwException(e.getMessage()); DataEaseException.throwException(e.getMessage());
} }
return "Error"; return "Success";
} }
@Override @Override

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

@ -191,6 +191,7 @@ public class DatasourceService {
datasource.setDesc(updataDsRequest.getDesc()); datasource.setDesc(updataDsRequest.getDesc());
datasource.setConfiguration(updataDsRequest.getConfiguration()); datasource.setConfiguration(updataDsRequest.getConfiguration());
datasource.setCreateTime(null); datasource.setCreateTime(null);
datasource.setType(updataDsRequest.getType());
datasource.setUpdateTime(System.currentTimeMillis()); datasource.setUpdateTime(System.currentTimeMillis());
checkAndUpdateDatasourceStatus(datasource); checkAndUpdateDatasourceStatus(datasource);
DatasourceExample example = new DatasourceExample(); DatasourceExample example = new DatasourceExample();

33
frontend/src/views/system/datasource/form.vue
View File

@ -337,10 +337,10 @@ export default {
apiConfiguration: [] apiConfiguration: []
}, },
rule: { rule: {
name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'change'}, name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'},
{min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'change'}], {min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}],
desc: [{min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur'}], desc: [{min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur'}],
type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'change'}], type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur'}],
'configuration.dataBase': [{ 'configuration.dataBase': [{
required: true, required: true,
message: i18n.t('datasource.please_input_data_base'), message: i18n.t('datasource.please_input_data_base'),
@ -359,43 +359,43 @@ export default {
'configuration.password': [{ 'configuration.password': [{
required: true, required: true,
message: i18n.t('datasource.please_input_password'), message: i18n.t('datasource.please_input_password'),
trigger: 'change' trigger: 'blur'
}], }],
'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'change'}], 'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'blur'}],
'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'change'}], 'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}],
'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'change'}], 'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'blur'}],
'configuration.initialPoolSize': [{ 'configuration.initialPoolSize': [{
required: true, required: true,
message: i18n.t('datasource.please_input_initial_pool_size'), message: i18n.t('datasource.please_input_initial_pool_size'),
trigger: 'change' trigger: 'blur'
}], }],
'configuration.minPoolSize': [{ 'configuration.minPoolSize': [{
required: true, required: true,
message: i18n.t('datasource.please_input_min_pool_size'), message: i18n.t('datasource.please_input_min_pool_size'),
trigger: 'change' trigger: 'blur'
}], }],
'configuration.maxPoolSize': [{ 'configuration.maxPoolSize': [{
required: true, required: true,
message: i18n.t('datasource.please_input_max_pool_size'), message: i18n.t('datasource.please_input_max_pool_size'),
trigger: 'change' trigger: 'blur'
}], }],
'configuration.maxIdleTime': [{ 'configuration.maxIdleTime': [{
required: true, required: true,
message: i18n.t('datasource.please_input_max_idle_time'), message: i18n.t('datasource.please_input_max_idle_time'),
trigger: 'change' trigger: 'blur'
}], }],
'configuration.acquireIncrement': [{ 'configuration.acquireIncrement': [{
required: true, required: true,
message: i18n.t('datasource.please_input_acquire_increment'), message: i18n.t('datasource.please_input_acquire_increment'),
trigger: 'change' trigger: 'blur'
}], }],
'configuration.connectTimeout': [{ 'configuration.connectTimeout': [{
required: true, required: true,
message: i18n.t('datasource.please_input_connect_timeout'), message: i18n.t('datasource.please_input_connect_timeout'),
trigger: 'change' trigger: 'blur'
}], }],
'url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'change'}], 'url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}],
'dataPath': [{required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'change'}] 'dataPath': [{required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'blur'}]
}, },
allTypes: [ allTypes: [
{name: 'mysql', label: 'MySQL', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true'}, {name: 'mysql', label: 'MySQL', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true'},
@ -764,6 +764,9 @@ export default {
} }
}, },
addApiItem(item) { addApiItem(item) {
this.$nextTick(() => {
this.$refs.apiItem.clearValidate()
})
if (item) { if (item) {
this.add_api_item = false this.add_api_item = false
this.api_table_title = this.$t('datasource.edit_api_table') this.api_table_title = this.$t('datasource.edit_api_table')