|
|
@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.alibaba.fastjson.TypeReference; |
|
|
|
import com.alibaba.fastjson.TypeReference; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
|
|
|
|
import org.apache.commons.lang.StringUtils; |
|
|
|
import org.apache.dolphinscheduler.api.enums.Status; |
|
|
|
import org.apache.dolphinscheduler.api.enums.Status; |
|
|
|
import org.apache.dolphinscheduler.api.utils.PageInfo; |
|
|
|
import org.apache.dolphinscheduler.api.utils.PageInfo; |
|
|
|
import org.apache.dolphinscheduler.api.utils.Result; |
|
|
|
import org.apache.dolphinscheduler.api.utils.Result; |
|
|
@ -159,8 +160,18 @@ public class DataSourceService extends BaseService{ |
|
|
|
putMsg(result, Status.DATASOURCE_EXIST); |
|
|
|
putMsg(result, Status.DATASOURCE_EXIST); |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//check password,if the password is not updated, set to the old password.
|
|
|
|
|
|
|
|
JSONObject paramObject = JSON.parseObject(parameter); |
|
|
|
|
|
|
|
String password = paramObject.getString(Constants.PASSWORD); |
|
|
|
|
|
|
|
if (StringUtils.isBlank(password)) { |
|
|
|
|
|
|
|
String oldConnectionParams = dataSource.getConnectionParams(); |
|
|
|
|
|
|
|
JSONObject oldParams = JSON.parseObject(oldConnectionParams); |
|
|
|
|
|
|
|
paramObject.put(Constants.PASSWORD, oldParams.getString(Constants.PASSWORD)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// connectionParams json
|
|
|
|
|
|
|
|
String connectionParams = paramObject.toJSONString(); |
|
|
|
|
|
|
|
|
|
|
|
Boolean isConnection = checkConnection(type, parameter); |
|
|
|
Boolean isConnection = checkConnection(type, connectionParams); |
|
|
|
if (!isConnection) { |
|
|
|
if (!isConnection) { |
|
|
|
logger.info("connect failed, type:{}, parameter:{}", type, parameter); |
|
|
|
logger.info("connect failed, type:{}, parameter:{}", type, parameter); |
|
|
|
putMsg(result, Status.DATASOURCE_CONNECT_FAILED); |
|
|
|
putMsg(result, Status.DATASOURCE_CONNECT_FAILED); |
|
|
@ -172,7 +183,7 @@ public class DataSourceService extends BaseService{ |
|
|
|
dataSource.setNote(desc); |
|
|
|
dataSource.setNote(desc); |
|
|
|
dataSource.setUserName(loginUser.getUserName()); |
|
|
|
dataSource.setUserName(loginUser.getUserName()); |
|
|
|
dataSource.setType(type); |
|
|
|
dataSource.setType(type); |
|
|
|
dataSource.setConnectionParams(parameter); |
|
|
|
dataSource.setConnectionParams(connectionParams); |
|
|
|
dataSource.setUpdateTime(now); |
|
|
|
dataSource.setUpdateTime(now); |
|
|
|
dataSourceMapper.updateById(dataSource); |
|
|
|
dataSourceMapper.updateById(dataSource); |
|
|
|
putMsg(result, Status.SUCCESS); |
|
|
|
putMsg(result, Status.SUCCESS); |
|
|
@ -257,7 +268,6 @@ public class DataSourceService extends BaseService{ |
|
|
|
map.put(PRINCIPAL, datasourceForm.getPrincipal()); |
|
|
|
map.put(PRINCIPAL, datasourceForm.getPrincipal()); |
|
|
|
map.put(DATABASE, database); |
|
|
|
map.put(DATABASE, database); |
|
|
|
map.put(USER_NAME, datasourceForm.getUser()); |
|
|
|
map.put(USER_NAME, datasourceForm.getUser()); |
|
|
|
map.put(PASSWORD, datasourceForm.getPassword()); |
|
|
|
|
|
|
|
map.put(OTHER, otherMap); |
|
|
|
map.put(OTHER, otherMap); |
|
|
|
result.put(Constants.DATA_LIST, map); |
|
|
|
result.put(Constants.DATA_LIST, map); |
|
|
|
putMsg(result, Status.SUCCESS); |
|
|
|
putMsg(result, Status.SUCCESS); |
|
|
|