Commit 2faf09d4 authored by baoliang's avatar baoliang
Browse files

Merge remote-tracking branch 'upstream/dev' into dev

parents 246fb221 f17dff70

escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java

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


    public static final String MAIL_TRANSPORT_PROTOCOL = "mail.transport.protocol";



    public static final String MAIL_SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";



    public static final String TEXT_HTML_CHARSET_UTF_8 = "text/html;charset=utf-8";



    public static final String STRING_TRUE = "true";

escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ public class MailUtils { 
                email.setSmtpPort(mailServerPort);

                //set charset

                email.setCharset(Constants.UTF_8);

                // TLS verification

                email.setTLS(true);

                if (CollectionUtils.isNotEmpty(receivers)){

                    // receivers mail

                    for (String receiver : receivers) {
@@ -267,6 +269,7 @@ public class MailUtils { 
        props.setProperty(Constants.MAIL_HOST, mailServerHost);

        props.setProperty(Constants.MAIL_SMTP_AUTH, Constants.STRING_TRUE);

        props.setProperty(Constants.MAIL_TRANSPORT_PROTOCOL, mailProtocol);

        props.setProperty(Constants.MAIL_SMTP_STARTTLS_ENABLE, Constants.STRING_TRUE);

        Authenticator auth = new Authenticator() {

            @Override

            protected PasswordAuthentication getPasswordAuthentication() {

escheduler-common/pom.xml

+12 −0
Original line number Diff line number Diff line
@@ -148,6 +148,10 @@ 
					<groupId>javax.servlet.jsp</groupId>

					<artifactId>jsp-api</artifactId>

				</exclusion>

				<exclusion>

					<groupId>com.google.protobuf</groupId>

					<artifactId>protobuf-java</artifactId>

				</exclusion>



			</exclusions>

		</dependency>
@@ -340,6 +344,14 @@ 
					<artifactId>log4j-slf4j-impl</artifactId>

					<groupId>org.apache.logging.log4j</groupId>

				</exclusion>

				<exclusion>

					<artifactId>javax.servlet</artifactId>

					<groupId>org.eclipse.jetty.orbit</groupId>

				</exclusion>

				<exclusion>

					<artifactId>servlet-api-2.5</artifactId>

					<groupId>org.mortbay.jetty</groupId>

				</exclusion>

			</exclusions>

		</dependency>

escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class FetchTaskThread implements Runnable{ 


                            // check and create Linux users

                            FileUtils.createWorkDirAndUserIfAbsent(execLocalPath,

                                    processDefine.getUserName(), logger);

                                    processInstance.getTenantCode(), logger);





                            // submit task