Unverified Commit 27c1d4ca authored by BoYiZhang's avatar BoYiZhang Committed by GitHub
Browse files

Merge pull request #5 from apache/dev 

update code
parents 06058dea 28766df5

docker/postgres/docker-entrypoint-initdb/init.sql

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ CREATE TABLE t_ds_command ( 
  dependence varchar(255) DEFAULT NULL ,

  update_time timestamp DEFAULT NULL ,

  process_instance_priority int DEFAULT NULL ,

  worker_group_id int DEFAULT '-1' ,

  worker_group varchar(64),

  PRIMARY KEY (id)

) ;
@@ -275,7 +275,7 @@ CREATE TABLE t_ds_error_command ( 
  update_time timestamp DEFAULT NULL ,

  dependence text ,

  process_instance_priority int DEFAULT NULL ,

  worker_group_id int DEFAULT '-1' ,

  worker_group varchar(64),

  message text ,

  PRIMARY KEY (id)

);
@@ -748,7 +748,7 @@ CREATE SEQUENCE t_ds_worker_server_id_sequence; 
ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_server_id_sequence');





-- Records of t_ds_user，user : admin , password : dolphinscheduler123

-- Records of t_ds_user?user : admin , password : dolphinscheduler123

INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');



-- Records of t_ds_alertgroup，dolphinscheduler warning group

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java

+1 −16
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
package org.apache.dolphinscheduler.alert.template;



import org.apache.dolphinscheduler.alert.template.impl.DefaultHTMLTemplate;

import org.apache.dolphinscheduler.alert.utils.Constants;

import org.apache.dolphinscheduler.alert.utils.PropertyUtils;

import org.apache.dolphinscheduler.common.utils.StringUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -30,8 +27,6 @@ public class AlertTemplateFactory { 


    private static final Logger logger = LoggerFactory.getLogger(AlertTemplateFactory.class);



    private static final String alertTemplate = PropertyUtils.getString(Constants.ALERT_TEMPLATE);



    private AlertTemplateFactory(){}



    /**
@@ -39,16 +34,6 @@ public class AlertTemplateFactory { 
     * @return a template, default is DefaultHTMLTemplate

     */

    public static AlertTemplate getMessageTemplate() {



        if(StringUtils.isEmpty(alertTemplate)){

            return new DefaultHTMLTemplate();

        }



        switch (alertTemplate){

            case "html":

        return new DefaultHTMLTemplate();

            default:

                throw new IllegalArgumentException(String.format("not support alert template: %s",alertTemplate));

        }

    }

}

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ public class Constants { 


    public static final int NUMBER_1000 = 1000;



    public static final String ALERT_TEMPLATE = "alert.template";



    public static final String SPRING_DATASOURCE_DRIVER_CLASS_NAME = "spring.datasource.driver-class-name";



    public static final String SPRING_DATASOURCE_URL = "spring.datasource.url";

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class EnterpriseWeChatUtils { 
    private static final String ENTERPRISE_WE_CHAT_SECRET = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_SECRET);



    private static final String ENTERPRISE_WE_CHAT_TOKEN_URL = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_TOKEN_URL);

    private static final String ENTERPRISE_WE_CHAT_TOKEN_URL_REPLACE = ENTERPRISE_WE_CHAT_TOKEN_URL

    private static final String ENTERPRISE_WE_CHAT_TOKEN_URL_REPLACE = ENTERPRISE_WE_CHAT_TOKEN_URL == null ? null : ENTERPRISE_WE_CHAT_TOKEN_URL

            .replaceAll("\\$corpId", ENTERPRISE_WE_CHAT_CORP_ID)

            .replaceAll("\\$secret", ENTERPRISE_WE_CHAT_SECRET);
@@ -266,5 +266,4 @@ public class EnterpriseWeChatUtils { 
        return result;



    }



}

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java

+7 −2
Original line number Diff line number Diff line
@@ -260,9 +260,14 @@ public class MailUtils { 
        part1.setContent(partContent, Constants.TEXT_HTML_CHARSET_UTF_8);

        // set attach file

        MimeBodyPart part2 = new MimeBodyPart();

        File file = new File(xlsFilePath + Constants.SINGLE_SLASH +  title + Constants.EXCEL_SUFFIX_XLS);

        if (!file.getParentFile().exists()) {

            file.getParentFile().mkdirs();

        }

        // make excel file



        ExcelUtils.genExcelFile(content,title,xlsFilePath);

        File file = new File(xlsFilePath + Constants.SINGLE_SLASH +  title + Constants.EXCEL_SUFFIX_XLS);



        part2.attachFile(file);

        part2.setFileName(MimeUtility.encodeText(title + Constants.EXCEL_SUFFIX_XLS,Constants.UTF_8,"B"));

        // add components to collection