Merge remote-tracking branch 'upstream/branch-1.0.2' into 102

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

@@ -59,6 +59,8 @@ public class Constants {
 
     public static final String MAIL_SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
 
+    public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.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

@@ -33,6 +33,7 @@ import org.springframework.util.ResourceUtils;
 import javax.mail.*;
 import javax.mail.internet.*;
 import java.io.*;
+import java.security.Security;
 import java.util.*;
 
 import static cn.escheduler.alert.utils.PropertyUtils.getInt;
@@ -58,6 +59,10 @@ public class MailUtils {
 
     public static final String xlsFilePath = getString(Constants.XLS_FILE_PATH);
 
+    public static final String starttlsEnable = getString(Constants.MAIL_SMTP_STARTTLS_ENABLE);
+
+    public static final String sslEnable = getString(Constants.MAIL_SMTP_SSL_ENABLE);
+
     private static Template MAIL_TEMPLATE;
 
     static {
@@ -122,7 +127,10 @@ public class MailUtils {
                 //set charset
                 email.setCharset(Constants.UTF_8);
                 // TLS verification
-                email.setTLS(true);
+                email.setTLS(Boolean.valueOf(starttlsEnable));
+
+                // SSL verification
+                email.setSSL(Boolean.valueOf(sslEnable));
                 if (CollectionUtils.isNotEmpty(receivers)){
                     // receivers mail
                     for (String receiver : receivers) {
@@ -269,11 +277,15 @@ public class MailUtils {
      * @throws MessagingException
      */
     private static MimeMessage getMimeMessage(Collection<String> receivers) throws MessagingException {
+//        Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+//        final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory";
+
         Properties props = new Properties();
         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);
+        props.setProperty(Constants.MAIL_SMTP_STARTTLS_ENABLE, starttlsEnable);
+        props.setProperty("mail.smtp.ssl.enable", sslEnable);
         Authenticator auth = new Authenticator() {
             @Override
             protected PasswordAuthentication getPasswordAuthentication() {

escheduler-alert/src/main/resources/alert.properties

@@ -8,6 +8,11 @@ mail.server.port=25
 mail.sender=xxxxxxx
 mail.passwd=xxxxxxx
 
+# TLS
+mail.smtp.starttls.enable=false
+# SSL
+mail.smtp.ssl.enable=true
+
 #xls file path,need create if not exist
 xls.file.path=/tmp/xls
 

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

@@ -115,6 +115,9 @@ public class UsersService extends BaseService {
         user.setUserType(UserType.GENERAL_USER);
         user.setCreateTime(now);
         user.setUpdateTime(now);
+        if (StringUtils.isEmpty(queue)){
+            queue = "";
+        }
         user.setQueue(queue);
 
         // save user

escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java

@@ -206,7 +206,10 @@ public class TaskQueueZkImpl extends AbstractZKClient implements ITaskQueue {
         String taskIdPath = tasksQueuePath + nodeValue;
         logger.info("consume task {}", taskIdPath);
         try{
-            zk.delete().forPath(taskIdPath);
+            Stat stat = zk.checkExists().forPath(taskIdPath);
+            if(stat != null){
+                zk.delete().forPath(taskIdPath);
+            }
         }catch(Exception e){
             logger.error(String.format("delete task:%s from zookeeper fail, exception:" ,nodeValue) ,e);
         }

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java

@@ -203,7 +203,9 @@ public class UserMapperProvider {
     public String queryUserPaging(Map<String, Object> parameter) {
         return new SQL() {
             {
-                SELECT("u.*,t.tenant_name,q.queue_name");
+                SELECT("u.id,u.user_name,u.user_password,u.user_type,u.email,u.phone,u.tenant_id,u.create_time,u.update_time,t.tenant_name," +
+                        "case when u.queue <> '' then u.queue else q.queue_name end as queue," +
+                        "q.queue_name");
                 FROM(TABLE_NAME + " u ");
                 LEFT_OUTER_JOIN("t_escheduler_tenant t on u.tenant_id = t.id");
                 LEFT_OUTER_JOIN("t_escheduler_queue q on t.queue_id = q.id");
@@ -228,7 +230,8 @@ public class UserMapperProvider {
     public String queryDetailsById(Map<String, Object> parameter) {
         return new SQL() {
             {
-                SELECT("u.*,q.queue_name,t.tenant_name");
+                SELECT("u.*, t.tenant_name," +
+                        "case when u.queue <> '' then u.queue else q.queue_name end as queue_name");
 
                 FROM(TABLE_NAME + " u,t_escheduler_tenant t,t_escheduler_queue q");
 

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -40,9 +40,13 @@
           </template>
         </m-list-box-f>
         <m-list-box-f v-if="isADMIN">
-          <template slot="name"><b>*</b>{{$t('Queue')}}</template>
+          <template slot="name">{{$t('Queue')}}</template>
           <template slot="content">
             <x-select v-model="queueName">
+              <x-input slot="trigger" slot-scope="{ selectedModel }" readonly :placeholder="$t('Please select a queue')" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="queueName = {}">
+                <i slot="suffix" class="fa fa-times-circle" style="font-size: 15px;cursor: pointer;" v-show="queueName.id"></i>
+                <i slot="suffix" class="ans-icon-arrow-down" style="font-size: 12px;" v-show="!queueName.id"></i>
+              </x-input>
               <x-option
                       v-for="city in queueList"
                       :key="city.id"

escheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -456,5 +456,6 @@ export default {
   'Post Statement': '后置sql',
   'Statement cannot be empty': '语句不能为空',
   'Process Define Count': '流程定义个数',
-  'Process Instance Running Count': '运行流程实例个数'
+  'Process Instance Running Count': '运行流程实例个数',
+  'Please select a queue': '请选择队列',
 }

install.sh

@@ -96,6 +96,13 @@ mailSender="xxxxxxxxxx"
 # 发送人密码
 mailPassword="xxxxxxxxxx"
 
+# TLS邮件协议支持
+starttlsEnable="false"
+
+# SSL邮件协议支持
+# 注意：默认开启的是SSL协议，TLS和SSL只能有一个处于true状态
+sslEnable="true"
+
 # 下载Excel路径
 xlsFilePath="/tmp/xls"
 
@@ -307,6 +314,8 @@ sed -i ${txt} "s#mail.server.host.*#mail.server.host=${mailServerHost}#g" conf/a
 sed -i ${txt} "s#mail.server.port.*#mail.server.port=${mailServerPort}#g" conf/alert.properties
 sed -i ${txt} "s#mail.sender.*#mail.sender=${mailSender}#g" conf/alert.properties
 sed -i ${txt} "s#mail.passwd.*#mail.passwd=${mailPassword}#g" conf/alert.properties
+sed -i ${txt} "s#mail.smtp.starttls.enable.*#mail.smtp.starttls.enable=${starttlsEnable}#g" conf/alert.properties
+sed -i ${txt} "s#mail.smtp.ssl.enable.*#mail.smtp.ssl.enable=${sslEnable}#g" conf/alert.properties
 sed -i ${txt} "s#xls.file.path.*#xls.file.path=${xlsFilePath}#g" conf/alert.properties
 
 

sql/escheduler.sql

@@ -426,7 +426,7 @@ CREATE TABLE `t_escheduler_worker_server` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- Records of t_escheduler_user,user : admin , password : escheduler123
-INSERT INTO `t_escheduler_user` VALUES ('1', 'admin', '055a97b5fcd6d120372ad1976518f371', '0', '825193156@qq.com', '15001335629', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO `t_escheduler_user` VALUES ('1', 'admin', '055a97b5fcd6d120372ad1976518f371', '0', 'xxx@qq.com', 'xxxx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
 INSERT INTO `t_escheduler_alertgroup` VALUES (1, 'escheduler管理员告警组', '0', 'escheduler管理员告警组','2018-11-29 10:20:39', '2018-11-29 10:20:39');
 INSERT INTO `t_escheduler_relation_user_alertgroup` VALUES ('1', '1', '1', '2018-11-29 10:22:33', '2018-11-29 10:22:33');