Unverified Commit 7af63d67 authored by 乔占卫's avatar 乔占卫 Committed by GitHub
Browse files

Merge pull request #545 from qiaozhanwei/dev-1.1.0 

 Constants XXXXXX update
parents a23c0cda 603c478d

escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java

+4 −5
Original line number Diff line number Diff line
@@ -67,14 +67,10 @@ public class DataSourceService extends BaseService{ 
    public static final String PASSWORD = cn.escheduler.common.Constants.PASSWORD;

    public static final String OTHER = "other";



    @Autowired

    private ProjectMapper projectMapper;



    @Autowired

    private DataSourceMapper dataSourceMapper;



    @Autowired

    private ProjectService projectService;



    @Autowired

    private DatasourceUserMapper datasourceUserMapper;
@@ -522,7 +518,10 @@ public class DataSourceService extends BaseService{ 
        parameterMap.put(Constants.JDBC_URL, jdbcUrl);

        parameterMap.put(Constants.USER, userName);

        parameterMap.put(Constants.PASSWORD, password);

        if (CommonUtils.getKerberosStartupState() &&

                (type == DbType.HIVE || type == DbType.SPARK)){

            parameterMap.put(Constants.PRINCIPAL,principal);

        }

        if (other != null && !"".equals(other)) {

            Map map = JSONObject.parseObject(other, new TypeReference<LinkedHashMap<String, String>>() {

            });

escheduler-common/src/main/java/cn/escheduler/common/Constants.java

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ public final class Constants { 


    public static final String DEFAULT = "Default";

    public static final String PASSWORD = "password";

    public static final String XXXXXX = "xxxxxx";

    public static final String XXXXXX = "******";



    public static  String TASK_RECORD_TABLE_HIVE_LOG = "eamp_hive_log_hd";