Merge pull request #75 from qiaozhanwei/dev-20190415

api access token dev

escheduler-api/src/main/java/cn/escheduler/api/controller/AccessTokenController.java

@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.api.controller;
+
+
+import cn.escheduler.api.enums.Status;
+import cn.escheduler.api.service.AccessTokenService;
+import cn.escheduler.api.service.UsersService;
+import cn.escheduler.api.utils.Constants;
+import cn.escheduler.api.utils.Result;
+import cn.escheduler.dao.model.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+import static cn.escheduler.api.enums.Status.*;
+
+
+/**
+ * user controller
+ */
+@RestController
+@RequestMapping("/access-token")
+public class AccessTokenController extends BaseController{
+
+
+    private static final Logger logger = LoggerFactory.getLogger(AccessTokenController.class);
+
+
+    @Autowired
+    private AccessTokenService accessTokenService;
+
+    /**
+     * create token
+     * @param loginUser
+     * @return
+     */
+    @PostMapping(value = "/create")
+    @ResponseStatus(HttpStatus.CREATED)
+    public Result createToken(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                                  @RequestParam(value = "userId") int userId,
+                                                  @RequestParam(value = "expireTime") String expireTime,
+                                                  @RequestParam(value = "token") String token){
+        logger.info("login user {}, create token , userId : {} , token expire time : {} , token : {}", loginUser.getUserName(),
+                userId,expireTime,token);
+
+        try {
+            Map<String, Object> result = accessTokenService.createToken(userId, expireTime, token);
+            return returnDataList(result);
+        }catch (Exception e){
+            logger.error(CREATE_ACCESS_TOKEN_ERROR.getMsg(),e);
+            return error(CREATE_ACCESS_TOKEN_ERROR.getCode(), CREATE_ACCESS_TOKEN_ERROR.getMsg());
+        }
+    }
+
+    /**
+     * create token
+     * @param loginUser
+     * @return
+     */
+    @PostMapping(value = "/generate")
+    @ResponseStatus(HttpStatus.CREATED)
+    public Result generateToken(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                              @RequestParam(value = "userId") int userId,
+                              @RequestParam(value = "expireTime") String expireTime){
+        logger.info("login user {}, generate token , userId : {} , token expire time : {}",loginUser,userId,expireTime);
+        try {
+            Map<String, Object> result = accessTokenService.generateToken(userId, expireTime);
+            return returnDataList(result);
+        }catch (Exception e){
+            logger.error(GENERATE_TOKEN_ERROR.getMsg(),e);
+            return error(GENERATE_TOKEN_ERROR.getCode(), GENERATE_TOKEN_ERROR.getMsg());
+        }
+    }
+
+    /**
+     * query access token list paging
+     *
+     * @param loginUser
+     * @param pageNo
+     * @param searchVal
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value="/list-paging")
+    @ResponseStatus(HttpStatus.OK)
+    public Result queryAccessTokenList(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                @RequestParam("pageNo") Integer pageNo,
+                                @RequestParam(value = "searchVal", required = false) String searchVal,
+                                @RequestParam("pageSize") Integer pageSize){
+        logger.info("login user {}, list access token paging, pageNo: {}, searchVal: {}, pageSize: {}",
+                loginUser.getUserName(),pageNo,searchVal,pageSize);
+        try{
+            Map<String, Object> result = checkPageParams(pageNo, pageSize);
+            if(result.get(Constants.STATUS) != Status.SUCCESS){
+                return returnDataListPaging(result);
+            }
+            result = accessTokenService.queryAccessTokenList(loginUser, searchVal, pageNo, pageSize);
+            return returnDataListPaging(result);
+        }catch (Exception e){
+            logger.error(QUERY_ACCESSTOKEN_LIST_PAGING_ERROR.getMsg(),e);
+            return error(QUERY_ACCESSTOKEN_LIST_PAGING_ERROR.getCode(),QUERY_ACCESSTOKEN_LIST_PAGING_ERROR.getMsg());
+        }
+    }
+
+    /**
+     * delete access token by id
+     * @param loginUser
+     * @param id
+     * @return
+     */
+    @PostMapping(value = "/delete")
+    @ResponseStatus(HttpStatus.OK)
+    public Result delAccessTokenById(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                              @RequestParam(value = "id") int  id) {
+        logger.info("login user {}, delete access token, id: {},", loginUser.getUserName(), id);
+        try {
+            Map<String, Object> result = accessTokenService.delAccessTokenById(loginUser, id);
+            return returnDataList(result);
+        }catch (Exception e){
+            logger.error(DELETE_USER_BY_ID_ERROR.getMsg(),e);
+            return error(Status.DELETE_USER_BY_ID_ERROR.getCode(), Status.DELETE_USER_BY_ID_ERROR.getMsg());
+        }
+    }
+
+
+    /**
+     * update token
+     * @param loginUser
+     * @return
+     */
+    @PostMapping(value = "/update")
+    @ResponseStatus(HttpStatus.CREATED)
+    public Result updateToken(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                              @RequestParam(value = "id") int id,
+                              @RequestParam(value = "userId") int userId,
+                              @RequestParam(value = "expireTime") String expireTime,
+                              @RequestParam(value = "token") String token){
+        logger.info("login user {}, update token , userId : {} , token expire time : {} , token : {}", loginUser.getUserName(),
+                userId,expireTime,token);
+
+        try {
+            Map<String, Object> result = accessTokenService.updateToken(id,userId, expireTime, token);
+            return returnDataList(result);
+        }catch (Exception e){
+            logger.error(CREATE_ACCESS_TOKEN_ERROR.getMsg(),e);
+            return error(CREATE_ACCESS_TOKEN_ERROR.getCode(), CREATE_ACCESS_TOKEN_ERROR.getMsg());
+        }
+    }
+
+}

escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java

@@ -46,7 +46,6 @@ public class SchedulerController extends BaseController{
     private static final Logger logger = LoggerFactory.getLogger(SchedulerController.class);
     public static final String DEFAULT_WARNING_TYPE = "NONE";
     public static final String DEFAULT_NOTIFY_GROUP_ID = "1";
-    public static final String DEFAULT_MAX_TRY_TIMES = "0";
     public static final String DEFAULT_FAILURE_POLICY = "CONTINUE";
 
 

escheduler-api/src/main/java/cn/escheduler/api/controller/TaskRecordController.java

@@ -68,7 +68,7 @@ public class TaskRecordController extends BaseController{
    try{
         logger.info("query task record list, task name:{}, state :{}, taskDate: {}, start:{}, end:{}",
                 taskName, state,  taskDate, startTime, endTime);
-        Map<String, Object> result = taskRecordService.queryTaskRecordListPaging(taskName, startTime,  taskDate, sourceTable, destTable, endTime,state, pageNo, pageSize);
+        Map<String, Object> result = taskRecordService.queryTaskRecordListPaging(false, taskName, startTime,  taskDate, sourceTable, destTable, endTime,state, pageNo, pageSize);
         return returnDataListPaging(result);
     }catch (Exception e){
         logger.error(QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e);
@@ -77,4 +77,36 @@ public class TaskRecordController extends BaseController{
 
     }
 
+    /**
+     * query history task record list paging
+     *
+     * @param loginUser
+     * @return
+     */
+    @GetMapping("/history-list-paging")
+    @ResponseStatus(HttpStatus.OK)
+    public Result queryHistoryTaskRecordListPaging(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                            @RequestParam(value = "taskName", required = false) String taskName,
+                                            @RequestParam(value = "state", required = false) String state,
+                                            @RequestParam(value = "sourceTable", required = false) String sourceTable,
+                                            @RequestParam(value = "destTable", required = false) String destTable,
+                                            @RequestParam(value = "taskDate", required = false) String taskDate,
+                                            @RequestParam(value = "startDate", required = false) String startTime,
+                                            @RequestParam(value = "endDate", required = false) String endTime,
+                                            @RequestParam("pageNo") Integer pageNo,
+                                            @RequestParam("pageSize") Integer pageSize
+    ){
+
+        try{
+            logger.info("query hisotry task record list, task name:{}, state :{}, taskDate: {}, start:{}, end:{}",
+                    taskName, state,  taskDate, startTime, endTime);
+            Map<String, Object> result = taskRecordService.queryTaskRecordListPaging(true, taskName, startTime,  taskDate, sourceTable, destTable, endTime,state, pageNo, pageSize);
+            return returnDataListPaging(result);
+        }catch (Exception e){
+            logger.error(QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e);
+            return error(QUERY_TASK_RECORD_LIST_PAGING_ERROR.getCode(), QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg());
+        }
+
+    }
+
 }

escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java

@@ -64,13 +64,14 @@ public class UsersController extends BaseController{
                                                      @RequestParam(value = "userName") String userName,
                                                      @RequestParam(value = "userPassword") String userPassword,
                                                      @RequestParam(value = "tenantId") int tenantId,
+                                                     @RequestParam(value = "queue") String queue,
                                                      @RequestParam(value = "email") String email,
                                                      @RequestParam(value = "phone", required = false) String phone) {
-        logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, proxyUsers: {}",
-                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone);
+        logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
+                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone,queue);
 
         try {
-            Map<String, Object> result = usersService.createUser(loginUser, userName, userPassword, email, tenantId, phone);
+            Map<String, Object> result = usersService.createUser(loginUser, userName, userPassword,email,tenantId, phone,queue);
             return returnDataList(result);
         }catch (Exception e){
             logger.error(CREATE_USER_ERROR.getMsg(),e);
@@ -127,13 +128,14 @@ public class UsersController extends BaseController{
                                                      @RequestParam(value = "id") int id,
                                                      @RequestParam(value = "userName") String userName,
                                                      @RequestParam(value = "userPassword") String userPassword,
+                                                     @RequestParam(value = "queue") String queue,
                                                      @RequestParam(value = "email") String email,
                                                      @RequestParam(value = "tenantId") int tenantId,
                                                      @RequestParam(value = "phone", required = false) String phone) {
-        logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, proxyUsers: {}",
-                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone);
+        logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
+                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone,queue);
         try {
-            Map<String, Object> result = usersService.updateUser(id,userName,userPassword,email,tenantId,phone);
+            Map<String, Object> result = usersService.updateUser(id,userName,userPassword,email,tenantId,phone,queue);
             return returnDataList(result);
         }catch (Exception e){
             logger.error(UPDATE_USER_ERROR.getMsg(),e);

escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java

@@ -199,6 +199,12 @@ public enum Status {
 
 
     HDFS_NOT_STARTUP(60001,"hdfs not startup"),
+
+
+    CREATE_ACCESS_TOKEN_ERROR(70001,"create access token error"),
+    GENERATE_TOKEN_ERROR(70002,"generate token error"),
+    QUERY_ACCESSTOKEN_LIST_PAGING_ERROR(70003,"query access token list paging error"),
+
     ;
 
     private int code;

escheduler-api/src/main/java/cn/escheduler/api/interceptor/LoginHandlerInterceptor.java

@@ -22,6 +22,7 @@ import cn.escheduler.dao.mapper.UserMapper;
 import cn.escheduler.dao.model.Session;
 import cn.escheduler.dao.model.User;
 import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,37 +65,31 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
   @Override
   public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
 
-    Session session = sessionService.getSession(request);
-
-    if(logger.isDebugEnabled()){
-      logger.debug("session info : " + session);
-    }
-
-    if (session == null) {
-      response.setStatus(HttpStatus.SC_UNAUTHORIZED);
-      logger.info("session info is null ");
-      return false;
-    }
-
-    if(logger.isDebugEnabled()){
-      logger.debug("session id: {}", session.getId());
+    // get token
+    String token = request.getHeader("token");
+    User user = null;
+    if (StringUtils.isEmpty(token)){
+      Session session = sessionService.getSession(request);
+
+      if (session == null) {
+        response.setStatus(HttpStatus.SC_UNAUTHORIZED);
+        logger.info("session info is null ");
+        return false;
+      }
+
+      //get user object from session
+      user = userMapper.queryById(session.getUserId());
+    }else {
+       user = userMapper.queryUserByToken(token);
     }
 
-    //get user object from session
-    User user = userMapper.queryById(session.getUserId());
-
-    if(logger.isDebugEnabled()){
-      logger.info("user info : " + user);
-    }
-
-
+    // if user is null
     if (user == null) {
       response.setStatus(HttpStatus.SC_UNAUTHORIZED);
+      logger.info("user does not exist");
       return false;
     }
-
     request.setAttribute(Constants.SESSION_USER, user);
-
     return true;
   }
 

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

@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.api.service;
+
+import cn.escheduler.api.enums.Status;
+import cn.escheduler.api.utils.CheckUtils;
+import cn.escheduler.api.utils.Constants;
+import cn.escheduler.api.utils.PageInfo;
+import cn.escheduler.api.utils.Result;
+import cn.escheduler.common.enums.UserType;
+import cn.escheduler.common.utils.*;
+import cn.escheduler.dao.mapper.*;
+import cn.escheduler.dao.model.*;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * user service
+ */
+@Service
+public class AccessTokenService extends BaseService {
+
+    private static final Logger logger = LoggerFactory.getLogger(AccessTokenService.class);
+
+    @Autowired
+    private AccessTokenMapper accessTokenMapper;
+
+
+    /**
+     * query access token list
+     *
+     * @param loginUser
+     * @param searchVal
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    public Map<String, Object> queryAccessTokenList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
+        Map<String, Object> result = new HashMap<>(5);
+
+        if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM, Constants.STATUS)) {
+            return result;
+        }
+
+        Integer count = accessTokenMapper.countAccessTokenPaging(searchVal);
+
+        PageInfo<AccessToken> pageInfo = new PageInfo<>(pageNo, pageSize);
+
+        List<AccessToken> accessTokenList = accessTokenMapper.queryAccessTokenPaging(searchVal, pageInfo.getStart(), pageSize);
+
+        pageInfo.setTotalCount(count);
+        pageInfo.setLists(accessTokenList);
+        result.put(Constants.DATA_LIST, pageInfo);
+        putMsg(result, Status.SUCCESS);
+
+        return result;
+    }
+
+    /**
+     * check
+     *
+     * @param result
+     * @param bool
+     * @param userNoOperationPerm
+     * @param status
+     * @return
+     */
+    private boolean check(Map<String, Object> result, boolean bool, Status userNoOperationPerm, String status) {
+        //only admin can operate
+        if (bool) {
+            result.put(Constants.STATUS, userNoOperationPerm);
+            result.put(status, userNoOperationPerm.getMsg());
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * create token
+     *
+     * @param userId
+     * @param expireTime
+     * @param token
+     * @return
+     */
+    public Map<String, Object> createToken(int userId, String expireTime, String token) {
+        Map<String, Object> result = new HashMap<>(5);
+
+        AccessToken accessToken = new AccessToken();
+        accessToken.setUserId(userId);
+        accessToken.setExpireTime(DateUtils.stringToDate(expireTime));
+        accessToken.setToken(token);
+        accessToken.setCreateTime(new Date());
+        accessToken.setUpdateTime(new Date());
+
+        // insert
+        int insert = accessTokenMapper.insert(accessToken);
+
+        if (insert > 0) {
+            putMsg(result, Status.SUCCESS);
+        } else {
+            putMsg(result, Status.CREATE_ALERT_GROUP_ERROR);
+        }
+
+        return result;
+    }
+
+    /**
+     * generate token
+     * @param userId
+     * @param expireTime
+     * @return
+     */
+    public Map<String, Object> generateToken(int userId, String expireTime) {
+        Map<String, Object> result = new HashMap<>(5);
+        String token = EncryptionUtils.getMd5(userId + expireTime + String.valueOf(System.currentTimeMillis()));
+        result.put(Constants.DATA_LIST, token);
+        putMsg(result, Status.SUCCESS);
+        return result;
+    }
+
+    /**
+     *  delete access token
+     * @param loginUser
+     * @param id
+     * @return
+     */
+    public Map<String, Object> delAccessTokenById(User loginUser, int id) {
+        Map<String, Object> result = new HashMap<>(5);
+        //only admin can operate
+        if (!isAdmin(loginUser)) {
+            putMsg(result, Status.USER_NOT_EXIST, id);
+            return result;
+        }
+
+        accessTokenMapper.delete(id);
+        putMsg(result, Status.SUCCESS);
+        return result;
+    }
+
+    /**
+     * update token by id
+     * @param id
+     * @param userId
+     * @param expireTime
+     * @param token
+     * @return
+     */
+    public Map<String, Object> updateToken(int id,int userId, String expireTime, String token) {
+        Map<String, Object> result = new HashMap<>(5);
+        AccessToken accessToken = new AccessToken();
+        accessToken.setId(id);
+        accessToken.setUserId(userId);
+        accessToken.setExpireTime(DateUtils.stringToDate(expireTime));
+        accessToken.setToken(token);
+        accessToken.setUpdateTime(new Date());
+
+        accessTokenMapper.update(accessToken);
+
+        putMsg(result, Status.SUCCESS);
+        return result;
+    }
+}

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

@@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.util.*;
 
 /**
@@ -209,12 +210,13 @@ public class DataSourceService extends BaseService{
 
         switch (dataSource.getType()) {
             case HIVE:
+            case SQLSERVER:
                 separator = ";";
                 break;
             case MYSQL:
-                separator = "&";
-                break;
             case POSTGRESQL:
+            case CLICKHOUSE:
+            case ORACLE:
                 separator = "&";
                 break;
             default:
@@ -367,6 +369,18 @@ public class DataSourceService extends BaseService{
                     datasource = JSONObject.parseObject(parameter, SparkDataSource.class);
                     Class.forName(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER);
                     break;
+                case CLICKHOUSE:
+                    datasource = JSONObject.parseObject(parameter, ClickHouseDataSource.class);
+                    Class.forName(Constants.COM_CLICKHOUSE_JDBC_DRIVER);
+                    break;
+                case ORACLE:
+                    datasource = JSONObject.parseObject(parameter, OracleDataSource.class);
+                    Class.forName(Constants.COM_ORACLE_JDBC_DRIVER);
+                    break;
+                case SQLSERVER:
+                    datasource = JSONObject.parseObject(parameter, SQLServerDataSource.class);
+                    Class.forName(Constants.COM_SQLSERVER_JDBC_DRIVER);
+                    break;
                 default:
                     break;
             }
@@ -392,6 +406,11 @@ public class DataSourceService extends BaseService{
         Connection con = getConnection(type, parameter);
         if (con != null) {
             isConnection = true;
+            try {
+                con.close();
+            } catch (SQLException e) {
+                logger.error("close connection fail at DataSourceService::checkConnection()", e);
+            }
         }
         return isConnection;
     }
@@ -428,9 +447,14 @@ public class DataSourceService extends BaseService{
         String address = buildAddress(type, host, port);
         String jdbcUrl = address + "/" + database;
         String separator = "";
-        if (Constants.MYSQL.equals(type.name()) || Constants.POSTGRESQL.equals(type.name())) {
+        if (Constants.MYSQL.equals(type.name())
+                || Constants.POSTGRESQL.equals(type.name())
+                || Constants.CLICKHOUSE.equals(type.name())
+                || Constants.ORACLE.equals(type.name())) {
             separator = "&";
-        } else if (Constants.HIVE.equals(type.name()) || Constants.SPARK.equals(type.name())) {
+        } else if (Constants.HIVE.equals(type.name())
+                || Constants.SPARK.equals(type.name())
+                || Constants.SQLSERVER.equals(type.name())) {
             separator = ";";
         }
 
@@ -479,6 +503,15 @@ public class DataSourceService extends BaseService{
                 }
                 sb.deleteCharAt(sb.length() - 1);
             }
+        } else if (Constants.CLICKHOUSE.equals(type.name())) {
+            sb.append(Constants.JDBC_CLICKHOUSE);
+            sb.append(host).append(":").append(port);
+        } else if (Constants.ORACLE.equals(type.name())) {
+            sb.append(Constants.JDBC_ORACLE);
+            sb.append(host).append(":").append(port);
+        } else if (Constants.SQLSERVER.equals(type.name())) {
+            sb.append(Constants.JDBC_SQLSERVER);
+            sb.append(host).append(":").append(port);
         }
 
         return sb.toString();

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

@@ -29,6 +29,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static cn.escheduler.common.Constants.*;
+
 /**
  * task record service
  */
@@ -51,7 +53,7 @@ public class TaskRecordService extends BaseService{
      * @param pageSize
      * @return
      */
-    public Map<String,Object> queryTaskRecordListPaging(String taskName, String startDate,
+    public Map<String,Object> queryTaskRecordListPaging(boolean isHistory, String taskName, String startDate,
                                                         String taskDate, String sourceTable,
                                                         String destTable, String endDate,
                                                         String state, Integer pageNo, Integer pageSize) {
@@ -69,8 +71,9 @@ public class TaskRecordService extends BaseService{
         map.put("offset", pageInfo.getStart().toString());
         map.put("pageSize", pageInfo.getPageSize().toString());
 
-        int count = TaskRecordDao.countTaskRecord(map);
-        List<TaskRecord> recordList = TaskRecordDao.queryAllTaskRecord(map);
+        String table = isHistory ? TASK_RECORD_TABLE_HISTORY_HIVE_LOG : TASK_RECORD_TABLE_HIVE_LOG;
+        int count = TaskRecordDao.countTaskRecord(map, table);
+        List<TaskRecord> recordList = TaskRecordDao.queryAllTaskRecord(map, table);
         pageInfo.setTotalCount(count);
         pageInfo.setLists(recordList);
         result.put(Constants.DATA_LIST, pageInfo);

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

@@ -87,7 +87,8 @@ public class UsersService extends BaseService {
                                           String userPassword,
                                           String email,
                                           int tenantId,
-                                          String phone) throws Exception {
+                                          String phone,
+                                          String queue) throws Exception {
 
         Map<String, Object> result = new HashMap<>(5);
         result = CheckUtils.checkUserParams(userName, userPassword, email, phone);
@@ -114,6 +115,7 @@ public class UsersService extends BaseService {
         user.setUserType(UserType.GENERAL_USER);
         user.setCreateTime(now);
         user.setUpdateTime(now);
+        user.setQueue(queue);
 
         // save user
         userMapper.insert(user);
@@ -194,7 +196,13 @@ public class UsersService extends BaseService {
      * @param phone
      * @return
      */
-    public Map<String, Object> updateUser(int userId, String userName, String userPassword, String email, int tenantId, String phone) throws Exception {
+    public Map<String, Object> updateUser(int userId,
+                                          String userName,
+                                          String userPassword,
+                                          String email,
+                                          int tenantId,
+                                          String phone,
+                                          String queue) throws Exception {
         Map<String, Object> result = new HashMap<>(5);
         result.put(Constants.STATUS, false);
 
@@ -218,6 +226,7 @@ public class UsersService extends BaseService {
         if (StringUtils.isNotEmpty(email)) {
             user.setEmail(email);
         }
+        user.setQueue(queue);
         user.setPhone(phone);
         user.setUpdateTime(now);
 

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

@@ -82,6 +82,9 @@ public class Constants {
     public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver";
     public static final String COM_MYSQL_JDBC_DRIVER = "com.mysql.jdbc.Driver";
     public static final String ORG_APACHE_HIVE_JDBC_HIVE_DRIVER = "org.apache.hive.jdbc.HiveDriver";
+    public static final String COM_CLICKHOUSE_JDBC_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver";
+    public static final String COM_ORACLE_JDBC_DRIVER = "oracle.jdbc.driver.OracleDriver";
+    public static final String COM_SQLSERVER_JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
 
     /**
      * database type
@@ -90,6 +93,9 @@ public class Constants {
     public static final String POSTGRESQL = "POSTGRESQL";
     public static final String HIVE = "HIVE";
     public static final String SPARK = "SPARK";
+    public static final String CLICKHOUSE = "CLICKHOUSE";
+    public static final String ORACLE = "ORACLE";
+    public static final String SQLSERVER = "SQLSERVER";
 
     /**
      * jdbc url
@@ -97,6 +103,9 @@ public class Constants {
     public static final String JDBC_MYSQL = "jdbc:mysql://";
     public static final String JDBC_POSTGRESQL = "jdbc:postgresql://";
     public static final String JDBC_HIVE_2 = "jdbc:hive2://";
+    public static final String JDBC_CLICKHOUSE = "jdbc:clickhouse://";
+    public static final String JDBC_ORACLE = "jdbc:oracle:thin:@//";
+    public static final String JDBC_SQLSERVER = "jdbc:sqlserver://";
 
 
     public static final String ADDRESS = "address";

escheduler-api/src/test/java/cn/escheduler/api/HttpClientTest.java

@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.api;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import cn.escheduler.common.utils.EncryptionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+public class HttpClientTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(HttpClientTest.class);
+
+    public static void main(String[] args) throws Exception {
+//        doGETParamPathVariableAndChinese();
+//        doGETParam();
+//        doPOSTParam();
+
+        String md5 = EncryptionUtils.getMd5(String.valueOf(System.currentTimeMillis()) + "张三");
+        System.out.println(md5);
+        System.out.println(md5.length());
+    }
+
+    public static void doPOSTParam()throws Exception{
+        // create Httpclient
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+        // 创建http POST请求
+        HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/escheduler/projects/create");
+        httpPost.setHeader("token", "123");
+        // set parameters
+        List<NameValuePair> parameters = new ArrayList<NameValuePair>();
+        parameters.add(new BasicNameValuePair("projectName", "qzw"));
+        parameters.add(new BasicNameValuePair("desc", "qzw"));
+
+        UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(parameters);
+        httpPost.setEntity(formEntity);
+
+
+        CloseableHttpResponse response = null;
+        try {
+            // execute
+            response = httpclient.execute(httpPost);
+            // eponse status code 200
+            if (response.getStatusLine().getStatusCode() == 200) {
+                String content = EntityUtils.toString(response.getEntity(), "UTF-8");
+                System.out.println(content);
+            }
+        } finally {
+            if (response != null) {
+                response.close();
+            }
+            httpclient.close();
+        }
+    }
+
+    /**
+     *
+     * @throws Exception
+     */
+    public static void doGETParamPathVariableAndChinese()throws Exception{
+        // create HttpClient
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+
+        List<NameValuePair> parameters = new ArrayList<NameValuePair>();
+//        parameters.add(new BasicNameValuePair("pageSize", "10"));
+
+        // define the parameters of the request
+        URI uri = new URIBuilder("http://127.0.0.1:12345/escheduler/projects/%E5%85%A8%E9%83%A8%E6%B5%81%E7%A8%8B%E6%B5%8B%E8%AF%95/process/list")
+                .build();
+
+        // create http GET request
+        HttpGet httpGet = new HttpGet(uri);
+        httpGet.setHeader("token","123");
+        //response object
+        CloseableHttpResponse response = null;
+        try {
+            // execute http get request
+            response = httpclient.execute(httpGet);
+            // reponse status code 200
+            if (response.getStatusLine().getStatusCode() == 200) {
+                String content = EntityUtils.toString(response.getEntity(), "UTF-8");
+                logger.info("start--------------->");
+                logger.info(content);
+                logger.info("end----------------->");
+            }
+        } finally {
+            if (response != null) {
+                response.close();
+            }
+            httpclient.close();
+        }
+    }
+
+    /**
+     *
+     * @throws Exception
+     */
+    public static void doGETParam()throws Exception{
+        // create HttpClient
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+
+        List<NameValuePair> parameters = new ArrayList<NameValuePair>();
+        parameters.add(new BasicNameValuePair("processInstanceId", "41415"));
+
+        // define the parameters of the request
+        URI uri = new URIBuilder("http://127.0.0.1:12345/escheduler/projects/%E5%85%A8%E9%83%A8%E6%B5%81%E7%A8%8B%E6%B5%8B%E8%AF%95/instance/view-variables")
+                 .setParameters(parameters)
+                .build();
+
+        // create http GET request
+        HttpGet httpGet = new HttpGet(uri);
+        httpGet.setHeader("token","123");
+        //response object
+        CloseableHttpResponse response = null;
+        try {
+            // execute http get request
+            response = httpclient.execute(httpGet);
+            // reponse status code 200
+            if (response.getStatusLine().getStatusCode() == 200) {
+                String content = EntityUtils.toString(response.getEntity(), "UTF-8");
+                logger.info("start--------------->");
+                logger.info(content);
+                logger.info("end----------------->");
+            }
+        } finally {
+            if (response != null) {
+                response.close();
+            }
+            httpclient.close();
+        }
+    }
+
+}

escheduler-common/pom.xml

@@ -371,6 +371,32 @@
 			<groupId>com.github.oshi</groupId>
 			<artifactId>oshi-core</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>ru.yandex.clickhouse</groupId>
+			<artifactId>clickhouse-jdbc</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>com.fasterxml.jackson.core</artifactId>
+					<groupId>jackson-core</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>com.fasterxml.jackson.core</artifactId>
+					<groupId>jackson-databind</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.microsoft.sqlserver</groupId>
+			<artifactId>mssql-jdbc</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>com.microsoft.azure</artifactId>
+					<groupId>azure-keyvault</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 

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

@@ -463,6 +463,10 @@ public final class Constants {
 
     public static final String TASK_RECORD_PWD = "task.record.datasource.password";
 
+    public static  String TASK_RECORD_TABLE_HIVE_LOG = "eamp_hive_log_hd";
+
+    public static  String TASK_RECORD_TABLE_HISTORY_HIVE_LOG = "eamp_hive_hist_log_hd";
+
     public static final String STATUS = "status";
 
 
@@ -602,15 +606,29 @@ public final class Constants {
     public static final String JDBC_POSTGRESQL_CLASS_NAME = "org.postgresql.Driver";
 
     /**
-     * postgresql
+     * hive
      */
     public static final String JDBC_HIVE_CLASS_NAME = "org.apache.hive.jdbc.HiveDriver";
 
     /**
-     * postgresql
+     * spark
      */
     public static final String JDBC_SPARK_CLASS_NAME = "org.apache.hive.jdbc.HiveDriver";
 
+    /**
+     * ClickHouse
+     */
+    public static final String JDBC_CLICKHOUSE_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
+
+    /**
+     * Oracle
+     */
+    public static final String JDBC_ORACLE_CLASS_NAME = "oracle.jdbc.driver.OracleDriver";
+
+    /**
+     * Oracle
+     */
+    public static final String JDBC_SQLSERVER_CLASS_NAME = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
 
     /**
      * spark params constant
@@ -812,4 +830,9 @@ public final class Constants {
     public static final String CONTENT = "content";
     public static final String DEPENDENT_SPLIT = ":||";
     public static final String DEPENDENT_ALL = "ALL";
+
+
+    /**
+     *
+     */
 }

escheduler-common/src/main/java/cn/escheduler/common/enums/DbType.java

@@ -25,6 +25,9 @@ public enum DbType {
    * 1 postgresql
    * 2 hive
    * 3 spark
+   * 4 clickhouse
+   * 5 oracle
+   * 6 sqlserver
    */
-  MYSQL, POSTGRESQL, HIVE, SPARK
+  MYSQL, POSTGRESQL, HIVE, SPARK, CLICKHOUSE, ORACLE, SQLSERVER
 }

escheduler-common/src/main/java/cn/escheduler/common/job/db/ClickHouseDataSource.java

@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.common.job.db;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+/**
+ * data source of ClickHouse
+ */
+public class ClickHouseDataSource extends BaseDataSource {
+    private static final Logger logger = LoggerFactory.getLogger(ClickHouseDataSource.class);
+
+    /**
+     * gets the JDBC url for the data source connection
+     * @return
+     */
+    @Override
+    public String getJdbcUrl() {
+        String jdbcUrl = getAddress();
+        if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {
+            jdbcUrl += "/";
+        }
+
+        jdbcUrl += getDatabase();
+
+        if (StringUtils.isNotEmpty(getOther())) {
+            jdbcUrl += "?" + getOther();
+        }
+
+        return jdbcUrl;
+    }
+
+    /**
+     * test whether the data source can be connected successfully
+     * @throws Exception
+     */
+    @Override
+    public void isConnectable() throws Exception {
+        Connection con = null;
+        try {
+            Class.forName("ru.yandex.clickhouse.ClickHouseDriver");
+            con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    logger.error("ClickHouse datasource try conn close conn error", e);
+                    throw e;
+                }
+            }
+        }
+
+    }
+}

escheduler-common/src/main/java/cn/escheduler/common/job/db/DataSourceFactory.java

@@ -39,6 +39,12 @@ public class DataSourceFactory {
           return JSONUtils.parseObject(parameter, HiveDataSource.class);
         case SPARK:
           return JSONUtils.parseObject(parameter, SparkDataSource.class);
+        case CLICKHOUSE:
+          return JSONUtils.parseObject(parameter, ClickHouseDataSource.class);
+        case ORACLE:
+          return JSONUtils.parseObject(parameter, OracleDataSource.class);
+        case SQLSERVER:
+          return JSONUtils.parseObject(parameter, SQLServerDataSource.class);
         default:
           return null;
       }

escheduler-common/src/main/java/cn/escheduler/common/job/db/OracleDataSource.java

@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.common.job.db;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+/**
+ * data source of Oracle
+ */
+public class OracleDataSource extends BaseDataSource {
+    private static final Logger logger = LoggerFactory.getLogger(OracleDataSource.class);
+
+    /**
+     * gets the JDBC url for the data source connection
+     * @return
+     */
+    @Override
+    public String getJdbcUrl() {
+        String jdbcUrl = getAddress();
+        if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {
+            jdbcUrl += "/";
+        }
+
+        jdbcUrl += getDatabase();
+
+        if (StringUtils.isNotEmpty(getOther())) {
+            jdbcUrl += "?" + getOther();
+        }
+
+        return jdbcUrl;
+    }
+
+    /**
+     * test whether the data source can be connected successfully
+     * @throws Exception
+     */
+    @Override
+    public void isConnectable() throws Exception {
+        Connection con = null;
+        try {
+            Class.forName("oracle.jdbc.driver.OracleDriver");
+            con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    logger.error("Oracle datasource try conn close conn error", e);
+                    throw e;
+                }
+            }
+        }
+
+    }
+}

escheduler-common/src/main/java/cn/escheduler/common/job/db/SQLServerDataSource.java

@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.common.job.db;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+/**
+ * data source of SQL Server
+ */
+public class SQLServerDataSource extends BaseDataSource {
+    private static final Logger logger = LoggerFactory.getLogger(SQLServerDataSource.class);
+
+    /**
+     * gets the JDBC url for the data source connection
+     * @return
+     */
+    @Override
+    public String getJdbcUrl() {
+        String jdbcUrl = getAddress();
+        jdbcUrl += ";databaseName=" + getDatabase();
+
+        if (StringUtils.isNotEmpty(getOther())) {
+            jdbcUrl += ";" + getOther();
+        }
+
+        return jdbcUrl;
+    }
+
+    /**
+     * test whether the data source can be connected successfully
+     * @throws Exception
+     */
+    @Override
+    public void isConnectable() throws Exception {
+        Connection con = null;
+        try {
+            Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+            con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    logger.error("SQL Server datasource try conn close conn error", e);
+                    throw e;
+                }
+            }
+        }
+
+    }
+}

escheduler-common/src/main/java/cn/escheduler/common/utils/DateUtils.java

@@ -72,7 +72,7 @@ public class DateUtils {
 	public static Date parse(String date,String format){
 		try {
 			return new SimpleDateFormat(format).parse(date);
-		} catch (ParseException e) {
+		} catch (Exception e) {
 			logger.error("error while parse date:" + date, e);
 		}
 		return null;

escheduler-common/src/main/java/cn/escheduler/common/utils/FileUtils.java

@@ -368,5 +368,61 @@ public class FileUtils {
         org.apache.commons.io.FileUtils.forceDelete(new File(filename));
     }
 
+    /**
+     * Gets all the parent subdirectories of the parentDir directory
+     * @param parentDir
+     * @return
+     */
+    public static File[] getAllDir(String parentDir){
+        if(parentDir == null || "".equals(parentDir)) {
+            throw new RuntimeException("parentDir can not be empty");
+        }
+
+        File file = new File(parentDir);
+        if(!file.exists() || !file.isDirectory()) {
+            throw new RuntimeException("parentDir not exist, or is not a directory:"+parentDir);
+        }
+
+        File[] schemaDirs = file.listFiles(new FileFilter() {
+
+            @Override
+            public boolean accept(File pathname) {
+                if (pathname.isDirectory()) {
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+        });
+
+        return schemaDirs;
+    }
+
+    /**
+     * Get Content
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
+    public static String readFile2Str(InputStream inputStream) throws IOException{
+        String all_content=null;
+        try {
+            all_content = new String();
+            InputStream ins = inputStream;
+            ByteArrayOutputStream outputstream = new ByteArrayOutputStream();
+            byte[] str_b = new byte[1024];
+            int i = -1;
+            while ((i=ins.read(str_b)) > 0) {
+                outputstream.write(str_b,0,i);
+            }
+            all_content = outputstream.toString();
+            return all_content;
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e);
+        }
+    }
+
 
 }

escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtil.java

@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.*;
+
+public class MysqlUtil {
+
+	public static final Logger logger = LoggerFactory.getLogger(MysqlUtil.class);
+
+	private static MysqlUtil instance;
+
+	MysqlUtil() {
+	}
+
+	public static MysqlUtil getInstance() {
+		if (null == instance) {
+			syncInit();
+		}
+		return instance;
+	}
+
+	private static synchronized void syncInit() {
+		if (instance == null) {
+			instance = new MysqlUtil();
+		}
+	}
+
+	public void release(ResultSet rs, Statement stmt, Connection conn) {
+		try {
+			if (rs != null) {
+				rs.close();
+				rs = null;
+			}
+		} catch (SQLException e) {
+			logger.error(e.getMessage(),e);
+			throw new RuntimeException(e);
+		} finally {
+			try {
+				if (stmt != null) {
+					stmt.close();
+					stmt = null;
+				}
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+				throw new RuntimeException(e);
+			} finally {
+				try {
+					if (conn != null) {
+						conn.close();
+						conn = null;
+					}
+				} catch (SQLException e) {
+					logger.error(e.getMessage(),e);
+					throw new RuntimeException(e);
+				}
+			}
+		}
+	}
+
+	public static void realeaseResource(ResultSet rs, PreparedStatement ps, Connection conn) {
+		MysqlUtil.getInstance().release(rs,ps,conn);
+		if (null != rs) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+			}
+		}
+
+		if (null != ps) {
+			try {
+				ps.close();
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+			}
+		}
+
+		if (null != conn) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+			}
+		}
+	}
+}

escheduler-common/src/main/java/cn/escheduler/common/utils/SchemaUtils.java

@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Metadata related common classes
+ *
+ */
+public class SchemaUtils {
+	
+	private static final Logger logger = LoggerFactory.getLogger(SchemaUtils.class);
+	private static Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+
+	/**
+	 * 获取所有upgrade目录下的可升级的schema
+	 * Gets upgradable schemas for all upgrade directories
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static List<String> getAllSchemaList() {
+		List<String> schemaDirList = new ArrayList<>();
+		File[] schemaDirArr = FileUtils.getAllDir("sql/upgrade");
+		if(schemaDirArr == null || schemaDirArr.length == 0) {
+			return null;
+		}
+		
+		for(File file : schemaDirArr) {
+			schemaDirList.add(file.getName());
+		}
+		
+		Collections.sort(schemaDirList , new Comparator() {
+			@Override
+			public int compare(Object o1 , Object o2){
+				try {
+					String dir1 = String.valueOf(o1);
+					String dir2 = String.valueOf(o2);
+					String version1 = dir1.split("_")[0];
+					String version2 = dir2.split("_")[0];
+					if(version1.equals(version2)) {
+						return 0;
+					}
+					
+					if(SchemaUtils.isAGreatVersion(version1, version2)) {
+						return 1;
+					}
+					
+					return -1;
+					
+				} catch (Exception e) {
+					logger.error(e.getMessage(),e);
+					throw new RuntimeException(e);
+				}
+			}
+		});
+		
+		return schemaDirList;
+	}
+	
+	/**
+	 * 判断schemaVersion是否比version版本高
+	 * Determine whether schemaVersion is higher than version
+	 * @param schemaVersion
+	 * @param version
+	 * @return
+	 */
+	public static boolean isAGreatVersion(String schemaVersion, String version) {
+		if(StringUtils.isEmpty(schemaVersion) || StringUtils.isEmpty(version)) {
+			throw new RuntimeException("schemaVersion or version is empty");
+		}
+		
+		String[] schemaVersionArr = schemaVersion.split("\\.");
+		String[] versionArr = version.split("\\.");
+		int arrLength = schemaVersionArr.length < versionArr.length ? schemaVersionArr.length : versionArr.length;
+		for(int i = 0 ; i < arrLength ; i++) {
+			if(Integer.valueOf(schemaVersionArr[i]) > Integer.valueOf(versionArr[i])) {
+				return true;
+			}else if(Integer.valueOf(schemaVersionArr[i]) < Integer.valueOf(versionArr[i])) {
+				return false;
+			}
+		}
+		
+		// 说明直到第arrLength-1个元素，两个版本号都一样，此时谁的arrLength大，谁的版本号就大
+		// If the version and schema version is the same from 0 up to the arrlength-1 element,whoever has a larger arrLength has a larger version number
+		return schemaVersionArr.length > versionArr.length;
+	}
+	
+	/**
+	 * Gets the current software version number of the system
+	 * @return
+	 */
+	public static String getSoftVersion() {
+		String soft_version;
+		try {
+			soft_version = FileUtils.readFile2Str(new FileInputStream(new File("sql/soft_version")));
+			soft_version = replaceBlank(soft_version);
+		} catch (FileNotFoundException e) {
+			logger.error(e.getMessage(),e);
+			throw new RuntimeException("Failed to get the product version description file. The file could not be found", e);
+		} catch (IOException e) {
+			logger.error(e.getMessage(),e);
+			throw new RuntimeException("Failed to get product version number description file, failed to read the file", e);
+		}
+		return soft_version;
+	}
+	
+	/**
+	 * 去掉字符串中的空格回车换行和制表符
+	 * Strips the string of space carriage returns and tabs
+	 * @param str
+	 * @return
+	 */
+	public static String replaceBlank(String str) {
+		String dest = "";
+		if (str!=null) {
+
+			Matcher m = p.matcher(str);
+			dest = m.replaceAll("");
+		}
+		return dest;
+	}
+}

escheduler-common/src/main/java/cn/escheduler/common/utils/ScriptRunner.java

@@ -0,0 +1,317 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.sql.*;
+
+/*
+ * Slightly modified version of the com.ibatis.common.jdbc.ScriptRunner class
+ * from the iBATIS Apache project. Only removed dependency on Resource class
+ * and a constructor
+ */
+/*
+ *  Copyright 2004 Clinton Begin
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * Tool to run database scripts
+ */
+public class ScriptRunner {
+
+	public static final Logger logger = LoggerFactory.getLogger(ScriptRunner.class);
+
+	private static final String DEFAULT_DELIMITER = ";";
+
+	private Connection connection;
+
+	private boolean stopOnError;
+	private boolean autoCommit;
+
+	private String delimiter = DEFAULT_DELIMITER;
+	private boolean fullLineDelimiter = false;
+
+	/**
+	 * Default constructor
+	 */
+	public ScriptRunner(Connection connection, boolean autoCommit, boolean stopOnError) {
+		this.connection = connection;
+		this.autoCommit = autoCommit;
+		this.stopOnError = stopOnError;
+	}
+
+	public static void main(String[] args) {
+		String dbName = "db_mmu";
+		String appKey = dbName.substring(dbName.lastIndexOf("_")+1, dbName.length());
+		System.out.println(appKey);
+	}
+
+	public void setDelimiter(String delimiter, boolean fullLineDelimiter) {
+		this.delimiter = delimiter;
+		this.fullLineDelimiter = fullLineDelimiter;
+	}
+
+	/**
+	 * Runs an SQL script (read in using the Reader parameter)
+	 *
+	 * @param reader
+	 *            - the source of the script
+	 */
+	public void runScript(Reader reader) throws IOException, SQLException {
+		try {
+			boolean originalAutoCommit = connection.getAutoCommit();
+			try {
+				if (originalAutoCommit != this.autoCommit) {
+					connection.setAutoCommit(this.autoCommit);
+				}
+				runScript(connection, reader);
+			} finally {
+				connection.setAutoCommit(originalAutoCommit);
+			}
+		} catch (IOException e) {
+			throw e;
+		} catch (SQLException e) {
+			throw e;
+		} catch (Exception e) {
+			throw new RuntimeException("Error running script.  Cause: " + e, e);
+		}
+	}
+
+	public void runScript(Reader reader, String dbName) throws IOException, SQLException {
+		try {
+			boolean originalAutoCommit = connection.getAutoCommit();
+			try {
+				if (originalAutoCommit != this.autoCommit) {
+					connection.setAutoCommit(this.autoCommit);
+				}
+				runScript(connection, reader, dbName);
+			} finally {
+				connection.setAutoCommit(originalAutoCommit);
+			}
+		} catch (IOException e) {
+			throw e;
+		} catch (SQLException e) {
+			throw e;
+		} catch (Exception e) {
+			throw new RuntimeException("Error running script.  Cause: " + e, e);
+		}
+	}
+
+	/**
+	 * Runs an SQL script (read in using the Reader parameter) using the connection
+	 * passed in
+	 *
+	 * @param conn
+	 *            - the connection to use for the script
+	 * @param reader
+	 *            - the source of the script
+	 * @throws SQLException
+	 *             if any SQL errors occur
+	 * @throws IOException
+	 *             if there is an error reading from the Reader
+	 */
+	private void runScript(Connection conn, Reader reader) throws IOException, SQLException {
+		StringBuffer command = null;
+		try {
+			LineNumberReader lineReader = new LineNumberReader(reader);
+			String line = null;
+			while ((line = lineReader.readLine()) != null) {
+				if (command == null) {
+					command = new StringBuffer();
+				}
+				String trimmedLine = line.trim();
+				if (trimmedLine.startsWith("--")) {
+					logger.info(trimmedLine);
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("//")) {
+					// Do nothing
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("--")) {
+					// Do nothing
+
+				} else if (trimmedLine.startsWith("delimiter")) {
+					String newDelimiter = trimmedLine.split(" ")[1];
+					this.setDelimiter(newDelimiter, fullLineDelimiter);
+
+				} else if (!fullLineDelimiter && trimmedLine.endsWith(getDelimiter())
+						|| fullLineDelimiter && trimmedLine.equals(getDelimiter())) {
+					command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
+					command.append(" ");
+					Statement statement = conn.createStatement();
+
+					// logger.info(command.toString());
+
+					boolean hasResults = false;
+					logger.info("sql:"+command.toString());
+					if (stopOnError) {
+						hasResults = statement.execute(command.toString());
+					} else {
+						try {
+							statement.execute(command.toString());
+						} catch (SQLException e) {
+							logger.error(e.getMessage(),e);
+							throw e;
+						}
+					}
+
+					ResultSet rs = statement.getResultSet();
+					if (hasResults && rs != null) {
+						ResultSetMetaData md = rs.getMetaData();
+						int cols = md.getColumnCount();
+						for (int i = 0; i < cols; i++) {
+							String name = md.getColumnLabel(i);
+							logger.info(name + "\t");
+						}
+						logger.info("");
+						while (rs.next()) {
+							for (int i = 0; i < cols; i++) {
+								String value = rs.getString(i);
+								logger.info(value + "\t");
+							}
+							logger.info("");
+						}
+					}
+
+					command = null;
+					try {
+						statement.close();
+					} catch (Exception e) {
+						// Ignore to workaround a bug in Jakarta DBCP
+					}
+					Thread.yield();
+				} else {
+					command.append(line);
+					command.append(" ");
+				}
+			}
+
+		} catch (SQLException e) {
+			logger.error("Error executing: " + command.toString());
+			throw e;
+		} catch (IOException e) {
+			e.fillInStackTrace();
+			logger.error("Error executing: " + command.toString());
+			throw e;
+		}
+	}
+
+	private void runScript(Connection conn, Reader reader , String dbName) throws IOException, SQLException {
+		StringBuffer command = null;
+		String sql = "";
+		String appKey = dbName.substring(dbName.lastIndexOf("_")+1, dbName.length());
+		try {
+			LineNumberReader lineReader = new LineNumberReader(reader);
+			String line = null;
+			while ((line = lineReader.readLine()) != null) {
+				if (command == null) {
+					command = new StringBuffer();
+				}
+				String trimmedLine = line.trim();
+				if (trimmedLine.startsWith("--")) {
+					logger.info(trimmedLine);
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("//")) {
+					// Do nothing
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("--")) {
+					// Do nothing
+
+				} else if (trimmedLine.startsWith("delimiter")) {
+					String newDelimiter = trimmedLine.split(" ")[1];
+					this.setDelimiter(newDelimiter, fullLineDelimiter);
+
+				} else if (!fullLineDelimiter && trimmedLine.endsWith(getDelimiter())
+						|| fullLineDelimiter && trimmedLine.equals(getDelimiter())) {
+					command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
+					command.append(" ");
+					Statement statement = conn.createStatement();
+
+					// logger.info(command.toString());
+
+					sql = command.toString().replaceAll("\\{\\{APPDB\\}\\}", dbName);
+					boolean hasResults = false;
+					logger.info("sql:"+sql);
+					if (stopOnError) {
+						hasResults = statement.execute(sql);
+					} else {
+						try {
+							statement.execute(sql);
+						} catch (SQLException e) {
+							logger.error(e.getMessage(),e);
+							throw e;
+						}
+					}
+
+					ResultSet rs = statement.getResultSet();
+					if (hasResults && rs != null) {
+						ResultSetMetaData md = rs.getMetaData();
+						int cols = md.getColumnCount();
+						for (int i = 0; i < cols; i++) {
+							String name = md.getColumnLabel(i);
+							logger.info(name + "\t");
+						}
+						logger.info("");
+						while (rs.next()) {
+							for (int i = 0; i < cols; i++) {
+								String value = rs.getString(i);
+								logger.info(value + "\t");
+							}
+							logger.info("");
+						}
+					}
+
+					command = null;
+					try {
+						statement.close();
+					} catch (Exception e) {
+						// Ignore to workaround a bug in Jakarta DBCP
+					}
+					Thread.yield();
+				} else {
+					command.append(line);
+					command.append(" ");
+				}
+			}
+
+		} catch (SQLException e) {
+			logger.error("Error executing: " + sql);
+			throw e;
+		} catch (IOException e) {
+			e.fillInStackTrace();
+			logger.error("Error executing: " + sql);
+			throw e;
+		}
+	}
+
+	private String getDelimiter() {
+		return delimiter;
+	}
+	
+}

escheduler-dao/readme.txt

@@ -0,0 +1,13 @@
+-- 用户指定队列
+alter table t_escheduler_user add queue varchar(64);
+
+-- 访问token
+CREATE TABLE `t_escheduler_access_token` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` int(11) DEFAULT NULL COMMENT '用户id',
+  `token` varchar(64) DEFAULT NULL COMMENT 'token令牌',
+  `expire_time` datetime DEFAULT NULL COMMENT 'token有效结束时间',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;

escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java

@@ -59,7 +59,7 @@ public class ProcessDao extends AbstractBaseDao {
             ExecutionStatus.READY_STOP.ordinal()};
 
     @Autowired
-    private ProjectMapper projectMapper;
+    private UserMapper userMapper;
 
     @Autowired
     private ProcessDefinitionMapper processDefineMapper;
@@ -102,7 +102,7 @@ public class ProcessDao extends AbstractBaseDao {
      */
     @Override
     protected void init() {
-        projectMapper = getMapper(ProjectMapper.class);
+        userMapper=getMapper(UserMapper.class);
         processDefineMapper = getMapper(ProcessDefinitionMapper.class);
         processInstanceMapper = getMapper(ProcessInstanceMapper.class);
         dataSourceMapper = getMapper(DataSourceMapper.class);
@@ -120,48 +120,64 @@ public class ProcessDao extends AbstractBaseDao {
      * find one command from command queue, construct process instance
      * @param logger
      * @param host
-     * @param vaildThreadNum
+     * @param validThreadNum
      * @return
      */
     @Transactional(value = "TransactionManager",rollbackFor = Exception.class)
-    public ProcessInstance scanCommand(Logger logger, String host, int vaildThreadNum){
+    public ProcessInstance scanCommand(Logger logger, String host, int validThreadNum){
 
         ProcessInstance processInstance = null;
         Command command = findOneCommand();
-
         if (command == null) {
             return null;
         }
         logger.info(String.format("find one command: id: %d, type: %s", command.getId(),command.getCommandType().toString()));
 
-        processInstance = constructProcessInstance(command, host);
-
-        //cannot construct process instance, return null;
-        if(processInstance == null){
-            logger.error("scan command, command parameter is error: %s", command.toString());
-        }else{
-            // check thread number enough for this command, if not, change state to waiting thread.
-            int commandThreadCount = this.workProcessThreadNumCount(command.getProcessDefinitionId());
-            if(vaildThreadNum < commandThreadCount){
-                logger.info("there is not enough thread for this command: {}",command.toString() );
-                processInstance.setState(ExecutionStatus.WAITTING_THREAD);
-                if(command.getCommandType() != CommandType.RECOVER_WAITTING_THREAD){
-                    processInstance.addHistoryCmd(command.getCommandType());
-                }
-                saveProcessInstance(processInstance);
-                this.setSubProcessParam(processInstance);
-                createRecoveryWaitingThreadCommand(command, processInstance);
+        try{
+            processInstance = constructProcessInstance(command, host);
+            //cannot construct process instance, return null;
+            if(processInstance == null){
+                logger.error("scan command, command parameter is error: %s", command.toString());
+                delCommandByid(command.getId());
                 return null;
+            }else if(!checkThreadNum(command, validThreadNum)){
+                    logger.info("there is not enough thread for this command: {}",command.toString() );
+                    return setWaitingThreadProcess(command, processInstance);
             }else{
-                processInstance.setCommandType(command.getCommandType());
-                processInstance.addHistoryCmd(command.getCommandType());
-                saveProcessInstance(processInstance);
-                this.setSubProcessParam(processInstance);
+                    processInstance.setCommandType(command.getCommandType());
+                    processInstance.addHistoryCmd(command.getCommandType());
+                    saveProcessInstance(processInstance);
+                    this.setSubProcessParam(processInstance);
+                    delCommandByid(command.getId());
+                    return processInstance;
             }
+        }catch (Exception e){
+            logger.error("scan command error ", e);
+            delCommandByid(command.getId());
         }
-        // delete command
-        delCommandByid(command.getId());
-        return processInstance;
+        return null;
+    }
+
+    /**
+     * set process waiting thread
+     * @param command
+     * @param processInstance
+     * @return
+     */
+    private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) {
+        processInstance.setState(ExecutionStatus.WAITTING_THREAD);
+        if(command.getCommandType() != CommandType.RECOVER_WAITTING_THREAD){
+            processInstance.addHistoryCmd(command.getCommandType());
+        }
+        saveProcessInstance(processInstance);
+        this.setSubProcessParam(processInstance);
+        createRecoveryWaitingThreadCommand(command, processInstance);
+        return null;
+    }
+
+    private boolean checkThreadNum(Command command, int validThreadNum) {
+        int commandThreadCount = this.workProcessThreadNumCount(command.getProcessDefinitionId());
+        return validThreadNum >= commandThreadCount;
     }
 
     /**
@@ -245,7 +261,7 @@ public class ProcessDao extends AbstractBaseDao {
     public ProcessInstance findProcessInstanceByScheduleTime(int defineId, Date scheduleTime){
 
         return processInstanceMapper.queryByScheduleTime(defineId,
-                DateUtils.dateToString(scheduleTime), 0,null, null);
+                DateUtils.dateToString(scheduleTime), 0, null, null);
     }
 
     /**
@@ -669,7 +685,7 @@ public class ProcessDao extends AbstractBaseDao {
             paramMap.put(CMDPARAM_SUB_PROCESS, String.valueOf(processInstance.getId()));
             processInstance.setCommandParam(JSONUtils.toJson(paramMap));
             processInstance.setIsSubProcess(Flag.YES);
-            this.updateProcessInstance(processInstance);
+            this.saveProcessInstance(processInstance);
         }
         // copy parent instance user def params to sub process..
         String parentInstanceId = paramMap.get(CMDPARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
@@ -677,7 +693,7 @@ public class ProcessDao extends AbstractBaseDao {
             ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId));
             if(parentInstance != null){
                 processInstance.setGlobalParams(parentInstance.getGlobalParams());
-                this.updateProcessInstance(processInstance);
+                this.saveProcessInstance(processInstance);
             }else{
                 logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
             }
@@ -1194,7 +1210,7 @@ public class ProcessDao extends AbstractBaseDao {
     public int updateProcessInstance(Integer processInstanceId, String processJson,
                                      String globalParams, Date scheduleTime, Flag flag,
                                      String locations, String connects){
-        return processInstanceMapper.updateProcessInstance( processInstanceId, processJson,
+        return processInstanceMapper.updateProcessInstance(processInstanceId, processJson,
                 globalParams, scheduleTime, locations, connects, flag);
     }
 
@@ -1538,4 +1554,16 @@ public class ProcessDao extends AbstractBaseDao {
                 DateUtils.dateToString(dateInterval.getEndTime()),
                 stateArray);
     }
+
+    /**
+     *  query user queue by process instance id
+     * @param processInstanceId
+     * @return
+     */
+    public String queryQueueByProcessInstanceId(int processInstanceId){
+        return userMapper.queryQueueByProcessInstanceId(processInstanceId);
+    }
+
+
+
 }

escheduler-dao/src/main/java/cn/escheduler/dao/TaskRecordDao.java

@@ -17,6 +17,7 @@
 package cn.escheduler.dao;
 
 import cn.escheduler.common.Constants;
+import cn.escheduler.common.utils.DateUtils;
 import cn.escheduler.dao.model.TaskRecord;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
@@ -39,6 +40,8 @@ public class TaskRecordDao {
 
     private static Logger logger = LoggerFactory.getLogger(TaskRecordDao.class.getName());
 
+
+
     /**
      * 加载配置文件
      */
@@ -133,7 +136,7 @@ public class TaskRecordDao {
      * @param filterMap
      * @return
      */
-    public static int countTaskRecord(Map<String, String> filterMap){
+    public static int countTaskRecord(Map<String, String> filterMap, String table){
 
         int count = 0;
         Connection conn = null;
@@ -142,7 +145,7 @@ public class TaskRecordDao {
             if(conn == null){
                 return count;
             }
-            String sql = "select count(1) as count from eamp_hive_log_hd";
+            String sql = String.format("select count(1) as count from %s", table);
             sql += getWhereString(filterMap);
             PreparedStatement pstmt;
             pstmt = conn.prepareStatement(sql);
@@ -170,9 +173,9 @@ public class TaskRecordDao {
      * @param filterMap
      * @return
      */
-    public static List<TaskRecord> queryAllTaskRecord(Map<String,String> filterMap ) {
+    public static List<TaskRecord> queryAllTaskRecord(Map<String,String> filterMap , String table) {
 
-        String sql = "select * from eamp_hive_log_hd ";
+        String sql = String.format("select * from  %s", table);
         sql += getWhereString(filterMap);
 
         int offset = Integer.parseInt(filterMap.get("offset"));
@@ -201,8 +204,8 @@ public class TaskRecordDao {
         taskRecord.setProcId(resultSet.getInt("PROC_ID"));
         taskRecord.setProcName(resultSet.getString("PROC_NAME"));
         taskRecord.setProcDate(resultSet.getString("PROC_DATE"));
-        taskRecord.setStartDate(resultSet.getDate("STARTDATE"));
-        taskRecord.setEndDate(resultSet.getDate("ENDDATE"));
+        taskRecord.setStartTime(DateUtils.stringToDate(resultSet.getString("STARTDATE")));
+        taskRecord.setEndTime(DateUtils.stringToDate(resultSet.getString("ENDDATE")));
         taskRecord.setResult(resultSet.getString("RESULT"));
         taskRecord.setDuration(resultSet.getInt("DURATION"));
         taskRecord.setNote(resultSet.getString("NOTE"));

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

@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.mapper;
+
+import cn.escheduler.common.enums.UserType;
+import cn.escheduler.dao.model.AccessToken;
+import cn.escheduler.dao.model.User;
+import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.EnumOrdinalTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+public interface AccessTokenMapper {
+
+    /**
+     * insert accessToken
+     * @param accessToken
+     * @return
+     */
+    @InsertProvider(type = AccessTokenMapperProvider.class, method = "insert")
+    @Options(useGeneratedKeys = true,keyProperty = "accessToken.id")
+    @SelectKey(statement = "SELECT LAST_INSERT_ID()", keyProperty = "accessToken.id", before = false, resultType = int.class)
+    int insert(@Param("accessToken") AccessToken accessToken);
+
+
+    /**
+     * delete accessToken
+     * @param accessTokenId
+     * @return
+     */
+    @DeleteProvider(type = AccessTokenMapperProvider.class, method = "delete")
+    int delete(@Param("accessTokenId") int accessTokenId);
+
+
+    /**
+     * update accessToken
+     *
+     * @param accessToken
+     * @return
+     */
+    @UpdateProvider(type = AccessTokenMapperProvider.class, method = "update")
+    int update(@Param("accessToken") AccessToken accessToken);
+
+
+    /**
+     * query access token list paging
+     * @param searchVal
+     * @param offset
+     * @param pageSize
+     * @return
+     */
+    @Results(value = {@Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "userId", column = "user_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "token", column = "token", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "userName", column = "user_name", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "expireTime", column = "expire_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
+            @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
+            @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE)
+    })
+    @SelectProvider(type = AccessTokenMapperProvider.class, method = "queryAccessTokenPaging")
+    List<AccessToken> queryAccessTokenPaging(@Param("searchVal") String searchVal,
+                                             @Param("offset") Integer offset,
+                                             @Param("pageSize") Integer pageSize);
+
+    /**
+     * count access token by search value
+     * @param searchVal
+     * @return
+     */
+    @SelectProvider(type = AccessTokenMapperProvider.class, method = "countAccessTokenPaging")
+    Integer countAccessTokenPaging(@Param("searchVal") String searchVal);
+}

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

@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.mapper;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.jdbc.SQL;
+
+import java.util.Map;
+
+/**
+ * access token mapper provider
+ *
+ */
+public class AccessTokenMapperProvider {
+
+    private static final String TABLE_NAME = "t_escheduler_access_token";
+
+    /**
+     * insert accessToken
+     *
+     * @param parameter
+     * @return
+     */
+    public String insert(Map<String, Object> parameter) {
+        return new SQL() {
+            {
+                INSERT_INTO(TABLE_NAME);
+                VALUES("`user_id`", "#{accessToken.userId}");
+                VALUES("`token`", "#{accessToken.token}");
+                VALUES("`expire_time`", "#{accessToken.expireTime}");;
+                VALUES("`create_time`", "#{accessToken.createTime}");
+                VALUES("`update_time`", "#{accessToken.updateTime}");
+            }
+        }.toString();
+    }
+
+    /**
+     * delete accessToken
+     *
+     * @param parameter
+     * @return
+     */
+    public String delete(Map<String, Object> parameter) {
+        return new SQL() {
+            {
+                DELETE_FROM(TABLE_NAME);
+
+                WHERE("`id`=#{accessTokenId}");
+            }
+        }.toString();
+    }
+
+    /**
+     * update accessToken
+     *
+     * @param parameter
+     * @return
+     */
+    public String update(Map<String, Object> parameter) {
+        return new SQL() {
+            {
+                UPDATE(TABLE_NAME);
+
+                SET("`user_id`=#{accessToken.userId}");
+                SET("`token`=#{accessToken.token}");
+                SET("`expire_time`=#{accessToken.expireTime}");
+                SET("`update_time`=#{accessToken.updateTime}");
+
+                WHERE("`id`=#{user.id}");
+            }
+        }.toString();
+    }
+
+
+    /**
+     * count user number by search value
+     * @param parameter
+     * @return
+     */
+    public String countAccessTokenPaging(Map<String, Object> parameter) {
+        return new SQL() {{
+            SELECT("count(0)");
+            FROM(TABLE_NAME + " t,t_escheduler_user u");
+            Object searchVal = parameter.get("searchVal");
+            WHERE("u.id = t.user_id");
+            if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){
+                WHERE(" u.user_name like concat('%', #{searchVal}, '%')");
+            }
+        }}.toString();
+    }
+
+    /**
+     * query user list paging
+     * @param parameter
+     * @return
+     */
+    public String queryAccessTokenPaging(Map<String, Object> parameter) {
+        return new SQL() {
+            {
+                SELECT("t.*,u.user_name");
+                FROM(TABLE_NAME + " t,t_escheduler_user u");
+                Object searchVal = parameter.get("searchVal");
+                WHERE("u.id = t.user_id");
+                if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){
+                    WHERE(" u.user_name like concat('%', #{searchVal}, '%') ");
+                }
+                ORDER_BY(" t.update_time desc limit #{offset},#{pageSize} ");
+            }
+        }.toString();
+
+    }
+
+
+
+
+}

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

@@ -222,4 +222,33 @@ public interface UserMapper {
     })
     @SelectProvider(type = UserMapperProvider.class, method = "queryTenantCodeByUserId")
     User queryTenantCodeByUserId(@Param("userId") int userId);
+
+
+    /**
+     * query user queue by process instance id
+     * @param processInstanceId
+     * @return
+     */
+    @SelectProvider(type = UserMapperProvider.class, method = "queryQueueByProcessInstanceId")
+    String queryQueueByProcessInstanceId(@Param("processInstanceId") int processInstanceId);
+
+
+    /**
+     * query user by token
+     * @param token
+     * @return
+     */
+    @Results(value = {
+            @Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "userName", column = "user_name", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "userPassword", column = "user_password", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "email", column = "email", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "phone", column = "phone", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "userType", column = "user_type", typeHandler = EnumOrdinalTypeHandler.class, javaType = UserType.class, jdbcType = JdbcType.TINYINT),
+            @Result(property = "tenantId", column = "tenant_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
+            @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE)
+    })
+    @SelectProvider(type = UserMapperProvider.class, method = "queryUserByToken")
+    User queryUserByToken(@Param("token") String token);
 }

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

@@ -47,6 +47,7 @@ public class UserMapperProvider {
                 VALUES("`phone`", "#{user.phone}");
                 VALUES("`user_type`", EnumFieldUtil.genFieldStr("user.userType", UserType.class));
                 VALUES("`tenant_id`", "#{user.tenantId}");
+                VALUES("`queue`", "#{user.queue}");
                 VALUES("`create_time`", "#{user.createTime}");
                 VALUES("`update_time`", "#{user.updateTime}");
             }
@@ -86,6 +87,7 @@ public class UserMapperProvider {
                 SET("`phone`=#{user.phone}");
                 SET("`user_type`="+EnumFieldUtil.genFieldStr("user.userType", UserType.class));
                 SET("`tenant_id`=#{user.tenantId}");
+                SET("`queue`=#{user.queue}");
                 SET("`create_time`=#{user.createTime}");
                 SET("`update_time`=#{user.updateTime}");
 
@@ -247,4 +249,36 @@ public class UserMapperProvider {
         }.toString();
     }
 
+
+    /**
+     * query tenant code by user id
+     * @param parameter
+     * @return
+     */
+    public String queryQueueByProcessInstanceId(Map<String, Object> parameter) {
+        return new SQL() {
+            {
+                SELECT("queue");
+                FROM(TABLE_NAME + " u,t_escheduler_process_instance p");
+                WHERE("u.id = p.executor_id and p.id=#{processInstanceId}");
+            }
+        }.toString();
+    }
+
+
+    /**
+     * query user by id
+     * @param parameter
+     * @return
+     */
+    public String queryUserByToken(Map<String, Object> parameter) {
+        return new SQL() {
+            {
+                SELECT("u.*");
+                FROM(TABLE_NAME + " u ,t_escheduler_access_token t");
+                WHERE(" u.id = t.user_id and token=#{token}");
+            }
+        }.toString();
+    }
+
 }

escheduler-dao/src/main/java/cn/escheduler/dao/model/AccessToken.java

@@ -0,0 +1,126 @@
+package cn.escheduler.dao.model;
+
+import java.util.Date;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class AccessToken {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * user id
+     */
+    private int userId;
+
+    /**
+     * user name
+     */
+    private String userName;
+
+    /**
+     * user token
+     */
+    private String token;
+
+    /**
+     * token expire time
+     */
+    private Date expireTime;
+
+    /**
+     * create time
+     */
+    private Date createTime;
+
+    /**
+     * update time
+     */
+    private Date updateTime;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    @Override
+    public String toString() {
+        return "AccessToken{" +
+                "id=" + id +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                ", token='" + token + '\'' +
+                ", expireTime=" + expireTime +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}

escheduler-dao/src/main/java/cn/escheduler/dao/model/TaskRecord.java

@@ -46,12 +46,12 @@ public class TaskRecord {
     /**
      * start date
      */
-    private Date startDate;
+    private Date startTime;
 
     /**
      * end date
      */
-    private Date endDate;
+    private Date endTime;
 
     /**
      * result
@@ -136,20 +136,20 @@ public class TaskRecord {
         this.procDate = procDate;
     }
 
-    public Date getStartDate() {
-        return startDate;
+    public Date getStartTime() {
+        return startTime;
     }
 
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
     }
 
-    public Date getEndDate() {
-        return endDate;
+    public Date getEndTime() {
+        return endTime;
     }
 
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
     }
 
     public String getResult() {
@@ -238,8 +238,8 @@ public class TaskRecord {
                 +" proc id:" + procId
                 + " proc name:" + procName
                 + " proc date: " + procDate
-                + " start date:" + startDate
-                + " end date:" + endDate
+                + " start date:" + startTime
+                + " end date:" + endTime
                 + " result : " + result
                 + " duration : " + duration
                 + " note : " + note

escheduler-dao/src/main/java/cn/escheduler/dao/model/User.java

@@ -79,6 +79,12 @@ public class  User {
      * alert group
      */
     private String alertGroup;
+
+    /**
+     * user specified queue
+     */
+    private String queue;
+
     /**
      * create time
      */
@@ -194,23 +200,12 @@ public class  User {
         this.tenantCode = tenantCode;
     }
 
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", userName='" + userName + '\'' +
-                ", userPassword='" + userPassword + '\'' +
-                ", email='" + email + '\'' +
-                ", phone='" + phone + '\'' +
-                ", userType=" + userType +
-                ", tenantId=" + tenantId +
-                ", tenantCode='" + tenantCode + '\'' +
-                ", tenantName='" + tenantName + '\'' +
-                ", queueName='" + queueName + '\'' +
-                ", alertGroup='" + alertGroup + '\'' +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                '}';
+    public String getQueue() {
+        return queue;
+    }
+
+    public void setQueue(String queue) {
+        this.queue = queue;
     }
 
     @Override
@@ -237,4 +232,24 @@ public class  User {
         result = 31 * result + userName.hashCode();
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", userName='" + userName + '\'' +
+                ", userPassword='" + userPassword + '\'' +
+                ", email='" + email + '\'' +
+                ", phone='" + phone + '\'' +
+                ", userType=" + userType +
+                ", tenantId=" + tenantId +
+                ", tenantCode='" + tenantCode + '\'' +
+                ", tenantName='" + tenantName + '\'' +
+                ", queueName='" + queueName + '\'' +
+                ", alertGroup='" + alertGroup + '\'' +
+                ", queue='" + queue + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/EschedulerManager.java

@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.upgrade;
+
+import cn.escheduler.common.utils.SchemaUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * upgrade manager
+ */
+public class EschedulerManager {
+    private static final Logger logger = LoggerFactory.getLogger(EschedulerManager.class);
+    UpgradeDao upgradeDao = UpgradeDao.getInstance();
+
+    public void initEscheduler() {
+        this.initEschedulerSchema();
+    }
+
+    public void initEschedulerSchema() {
+
+        logger.info("Start initializing the ark manager mysql table structure");
+        upgradeDao.initEschedulerSchema();
+    }
+
+
+    /**
+     * upgrade escheduler
+     */
+    public void upgradeEscheduler() throws Exception{
+
+        // Gets a list of all upgrades
+        List<String> schemaList = SchemaUtils.getAllSchemaList();
+        if(schemaList == null || schemaList.size() == 0) {
+            logger.info("There is no schema to upgrade!");
+        }else {
+
+            String version = "";
+            // The target version of the upgrade
+            String schemaVersion = "";
+            for(String schemaDir : schemaList) {
+                // Gets the version of the current system
+                if (upgradeDao.isExistsTable("t_escheduler_version")) {
+                    version = upgradeDao.getCurrentVersion();
+                }else {
+                    version = "1.0.0";
+                }
+
+                schemaVersion = schemaDir.split("_")[0];
+                if(SchemaUtils.isAGreatVersion(schemaVersion , version)) {
+
+                    logger.info("upgrade escheduler metadata version from " + version + " to " + schemaVersion);
+
+
+                    logger.info("Begin upgrading escheduler's mysql table structure");
+                    upgradeDao.upgradeEscheduler(schemaDir);
+
+                }
+
+            }
+        }
+
+        // Assign the value of the version field in the version table to the version of the product
+        upgradeDao.updateVersion(SchemaUtils.getSoftVersion());
+    }
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java

@@ -0,0 +1,299 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.upgrade;
+
+import cn.escheduler.common.utils.MysqlUtil;
+import cn.escheduler.common.utils.ScriptRunner;
+import cn.escheduler.dao.AbstractBaseDao;
+import cn.escheduler.dao.datasource.ConnectionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class UpgradeDao extends AbstractBaseDao {
+
+    public static final Logger logger = LoggerFactory.getLogger(UpgradeDao.class);
+    private static final String T_VERSION_NAME = "t_escheduler_version";
+
+    @Override
+    protected void init() {
+
+    }
+
+    private static class UpgradeDaoHolder {
+        private static final UpgradeDao INSTANCE = new UpgradeDao();
+    }
+
+    private UpgradeDao() {
+    }
+
+    public static final UpgradeDao getInstance() {
+        return UpgradeDaoHolder.INSTANCE;
+    }
+
+
+
+    public void initEschedulerSchema() {
+
+        // Execute the escheduler DDL, it cannot be rolled back
+        runInitEschedulerDDL();
+
+        // Execute the escheduler DML, it can be rolled back
+        runInitEschedulerDML();
+
+    }
+
+    private void runInitEschedulerDML() {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            conn.setAutoCommit(false);
+            // 执行escheduler_dml.sql脚本，导入escheduler相关的数据
+            // Execute the ark_manager_dml.sql script to import the data related to escheduler
+
+            ScriptRunner initScriptRunner = new ScriptRunner(conn, false, true);
+            Reader initSqlReader = new FileReader(new File("sql/create/release-1.0.0_schema/mysql/escheduler_dml.sql"));
+            initScriptRunner.runScript(initSqlReader);
+
+            conn.commit();
+        } catch (IOException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, null, conn);
+
+        }
+
+    }
+
+    private void runInitEschedulerDDL() {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            // Execute the escheduler_ddl.sql script to create the table structure of escheduler
+            ScriptRunner initScriptRunner = new ScriptRunner(conn, true, true);
+            Reader initSqlReader = new FileReader(new File("sql/create/release-1.0.0_schema/mysql/escheduler_ddl.sql"));
+            initScriptRunner.runScript(initSqlReader);
+
+        } catch (IOException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, null, conn);
+
+        }
+
+    }
+
+
+    public boolean isExistsTable(String tableName) {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            ResultSet rs = conn.getMetaData().getTables(null, null, tableName, null);
+            if (rs.next()) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, null, conn);
+
+        }
+
+    }
+
+
+    public String getCurrentVersion() {
+        String sql = String.format("select version from %s",T_VERSION_NAME);
+        Connection conn = null;
+        ResultSet rs = null;
+        PreparedStatement pstmt = null;
+        String version = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            pstmt = conn.prepareStatement(sql);
+            rs = pstmt.executeQuery();
+
+            if (rs.next()) {
+                version = rs.getString(1);
+            }
+
+            return version;
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql: " + sql, e);
+        } finally {
+            MysqlUtil.realeaseResource(rs, pstmt, conn);
+
+        }
+    }
+
+
+    public void upgradeEscheduler(String schemaDir) {
+
+        upgradeEschedulerDDL(schemaDir);
+
+        upgradeEschedulerDML(schemaDir);
+
+    }
+
+    private void upgradeEschedulerDML(String schemaDir) {
+        String schemaVersion = schemaDir.split("_")[0];
+        String mysqlSQLFilePath = "sql/upgrade/" + schemaDir + "/mysql/escheduler_dml.sql";
+        Connection conn = null;
+        PreparedStatement pstmt = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            conn.setAutoCommit(false);
+            // Execute the upgraded escheduler dml
+            ScriptRunner scriptRunner = new ScriptRunner(conn, false, true);
+            Reader sqlReader = new FileReader(new File(mysqlSQLFilePath));
+            scriptRunner.runScript(sqlReader);
+            if (isExistsTable(T_VERSION_NAME)) {
+                // Change version in the version table to the new version
+                String upgradeSQL = String.format("update %s set version = ?",T_VERSION_NAME);
+                pstmt = conn.prepareStatement(upgradeSQL);
+                pstmt.setString(1, schemaVersion);
+                pstmt.executeUpdate();
+            }
+            conn.commit();
+        } catch (FileNotFoundException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql file not found ", e);
+        } catch (IOException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (SQLException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, pstmt, conn);
+        }
+
+    }
+
+    private void upgradeEschedulerDDL(String schemaDir) {
+        String mysqlSQLFilePath = "sql/upgrade/" + schemaDir + "/mysql/escheduler_ddl.sql";
+        Connection conn = null;
+        PreparedStatement pstmt = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            String dbName = conn.getCatalog();
+            logger.info(dbName);
+            conn.setAutoCommit(true);
+            // Execute the escheduler ddl.sql for the upgrade
+            ScriptRunner scriptRunner = new ScriptRunner(conn, true, true);
+            Reader sqlReader = new FileReader(new File(mysqlSQLFilePath));
+            scriptRunner.runScript(sqlReader);
+
+        } catch (FileNotFoundException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql file not found ", e);
+        } catch (IOException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (SQLException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, pstmt, conn);
+        }
+
+    }
+
+
+
+    public void updateVersion(String version) {
+        // Change version in the version table to the new version
+        String upgradeSQL = String.format("update %s set version = ?",T_VERSION_NAME);
+        PreparedStatement pstmt = null;
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            pstmt = conn.prepareStatement(upgradeSQL);
+            pstmt.setString(1, version);
+            pstmt.executeUpdate();
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql: " + upgradeSQL, e);
+        } finally {
+            MysqlUtil.realeaseResource(null, pstmt, conn);
+        }
+
+    }
+
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/CreateEscheduler.java

@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.upgrade.shell;
+
+import cn.escheduler.dao.upgrade.EschedulerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * init escheduler
+ *
+ */
+public class CreateEscheduler {
+
+	private static final Logger logger = LoggerFactory.getLogger(CreateEscheduler.class);
+
+	public static void main(String[] args) {
+		Thread.currentThread().setName("manager-CreateEscheduler");
+		EschedulerManager eschedulerManager = new EschedulerManager();
+		eschedulerManager.initEscheduler();
+		logger.info("init escheduler finished");
+		try {
+			eschedulerManager.upgradeEscheduler();
+			logger.info("upgrade escheduler finished");
+		} catch (Exception e) {
+			logger.error("upgrade escheduler failed",e);
+		}
+
+	}
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/InitEscheduler.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.upgrade.shell;
+
+import cn.escheduler.dao.upgrade.EschedulerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * init escheduler
+ *
+ */
+public class InitEscheduler {
+
+	private static final Logger logger = LoggerFactory.getLogger(InitEscheduler.class);
+
+	public static void main(String[] args) {
+		Thread.currentThread().setName("manager-InitEscheduler");
+		EschedulerManager eschedulerManager = new EschedulerManager();
+		eschedulerManager.initEscheduler();
+		logger.info("init escheduler finished");
+		
+	}
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java

@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.upgrade.shell;
+
+import cn.escheduler.dao.upgrade.EschedulerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * upgrade escheduler database
+ */
+public class UpgradeEscheduler {
+	private static final Logger logger = LoggerFactory.getLogger(UpgradeEscheduler.class);
+
+	public static void main(String[] args) {
+		Thread.currentThread().setName("manager-UpgradeEscheduler");
+		
+		EschedulerManager eschedulerManager = new EschedulerManager();
+		try {
+			eschedulerManager.upgradeEscheduler();
+			logger.info("upgrade escheduler finished");
+		} catch (Exception e) {
+			logger.error(e.getMessage(),e);
+			logger.info("Upgrade escheduler failed");
+			throw new RuntimeException(e);
+		}
+
+		
+	}
+	
+	
+	
+}

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java

@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.mapper;
+
+import cn.escheduler.common.utils.EncryptionUtils;
+import cn.escheduler.dao.datasource.ConnectionFactory;
+import cn.escheduler.dao.model.AccessToken;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Date;
+import java.util.List;
+
+
+
+public class AccessTokenMapperTest {
+
+
+    AccessTokenMapper accessTokenMapper;
+
+    @Before
+    public void before(){
+        accessTokenMapper = ConnectionFactory.getSqlSession().getMapper(AccessTokenMapper.class);
+    }
+
+    @Test
+    public void testInsert(){
+        AccessToken accessToken = new AccessToken();
+        accessToken.setUserId(10);
+        accessToken.setExpireTime(new Date());
+        accessToken.setToken("ssssssssssssssssssssssssss");
+        accessToken.setCreateTime(new Date());
+        accessToken.setUpdateTime(new Date());
+        accessTokenMapper.insert(accessToken);
+    }
+
+    @Test
+    public void testListPaging(){
+        Integer count = accessTokenMapper.countAccessTokenPaging("");
+        Assert.assertEquals(count, (Integer) 5);
+
+        List<AccessToken> accessTokenList = accessTokenMapper.queryAccessTokenPaging("", 0, 2);
+        Assert.assertEquals(accessTokenList.size(), 5);
+    }
+
+
+}

escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java

@@ -60,4 +60,16 @@ public class UserMapperTest {
 
     }
 
+    @Test
+    public void queryQueueByProcessInstanceId(){
+        String queue = userMapper.queryQueueByProcessInstanceId(41388);
+        Assert.assertEquals(queue, "ait");
+    }
+
+    @Test
+    public void testQueryUserByToken(){
+        User user = userMapper.queryUserByToken("ad9e8fccfc11bd18bb45aa994568b8ef");
+        Assert.assertEquals(user.getUserName(), "qiaozhanwei");
+    }
+
 }

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

@@ -36,6 +36,7 @@ import cn.escheduler.server.worker.task.AbstractTask;
 import cn.escheduler.server.worker.task.TaskManager;
 import cn.escheduler.server.worker.task.TaskProps;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,12 +155,18 @@ public class TaskScheduleThread implements Callable<Boolean> {
             taskProps.setTenantCode(taskInstance.getProcessInstance().getTenantCode());
 
             ProcessInstance processInstance = processDao.findProcessInstanceByTaskId(taskInstance.getId());
+            String queue = processDao.queryQueueByProcessInstanceId(processInstance.getId());
+
             taskProps.setScheduleTime(processInstance.getScheduleTime());
             taskProps.setNodeName(taskInstance.getName());
             taskProps.setTaskInstId(taskInstance.getId());
             taskProps.setEnvFile(CommonUtils.getSystemEnvPath());
             // set queue
-            taskProps.setQueue(taskInstance.getProcessInstance().getQueue());
+            if (StringUtils.isEmpty(queue)){
+                taskProps.setQueue(taskInstance.getProcessInstance().getQueue());
+            }else {
+                taskProps.setQueue(queue);
+            }
             taskProps.setTaskStartTime(taskInstance.getStartTime());
             taskProps.setDefinedParams(allParamMap);
 
@@ -188,7 +195,7 @@ public class TaskScheduleThread implements Callable<Boolean> {
             task.handle();
 
 
-            logger.info("task : {} exit status code : {}",taskProps.getTaskAppId(),task.getExitStatusCode());
+            logger.info("task : {} exit status code : {}", taskProps.getTaskAppId(),task.getExitStatusCode());
 
             if (task.getExitStatusCode() == Constants.EXIT_CODE_SUCCESS){
                 status = ExecutionStatus.SUCCESS;

escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java

@@ -22,8 +22,11 @@ import cn.escheduler.common.enums.DbType;
 import cn.escheduler.common.enums.Direct;
 import cn.escheduler.common.enums.TaskTimeoutStrategy;
 import cn.escheduler.common.job.db.BaseDataSource;
+import cn.escheduler.common.job.db.ClickHouseDataSource;
 import cn.escheduler.common.job.db.MySQLDataSource;
+import cn.escheduler.common.job.db.OracleDataSource;
 import cn.escheduler.common.job.db.PostgreDataSource;
+import cn.escheduler.common.job.db.SQLServerDataSource;
 import cn.escheduler.common.process.Property;
 import cn.escheduler.common.task.AbstractParameters;
 import cn.escheduler.common.task.procedure.ProcedureParameters;
@@ -111,6 +114,17 @@ public class ProcedureTask extends AbstractTask {
                     }else if (DbType.POSTGRESQL.name().equals(dataSource.getType().name())){
                         baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(),PostgreDataSource.class);
                         Class.forName(Constants.JDBC_POSTGRESQL_CLASS_NAME);
+                    }else if (DbType.CLICKHOUSE.name().equals(dataSource.getType().name())){
+                        // NOTE: currently, ClickHouse don't support procedure or UDF yet,
+                        //  but still load JDBC driver to keep source code sync with other DB
+                        baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(),ClickHouseDataSource.class);
+                        Class.forName(Constants.JDBC_CLICKHOUSE_CLASS_NAME);
+                    }else if (DbType.ORACLE.name().equals(dataSource.getType().name())){
+                        baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(), OracleDataSource.class);
+                        Class.forName(Constants.JDBC_ORACLE_CLASS_NAME);
+                    }else if (DbType.SQLSERVER.name().equals(dataSource.getType().name())){
+                        baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(), SQLServerDataSource.class);
+                        Class.forName(Constants.JDBC_SQLSERVER_CLASS_NAME);
                     }
 
                     // get jdbc connection

escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java

@@ -120,6 +120,15 @@ public class SqlTask extends AbstractTask {
                     }else if (DbType.SPARK.name().equals(dataSource.getType().name())){
                         baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(),SparkDataSource.class);
                         Class.forName(Constants.JDBC_SPARK_CLASS_NAME);
+                    }else if (DbType.CLICKHOUSE.name().equals(dataSource.getType().name())){
+                        baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(),ClickHouseDataSource.class);
+                        Class.forName(Constants.JDBC_CLICKHOUSE_CLASS_NAME);
+                    }else if (DbType.ORACLE.name().equals(dataSource.getType().name())){
+                        baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(),OracleDataSource.class);
+                        Class.forName(Constants.JDBC_ORACLE_CLASS_NAME);
+                    }else if (DbType.SQLSERVER.name().equals(dataSource.getType().name())){
+                        baseDataSource = JSONObject.parseObject(dataSource.getConnectionParams(),SQLServerDataSource.class);
+                        Class.forName(Constants.JDBC_SQLSERVER_CLASS_NAME);
                     }
 
                     Map<Integer,Property> sqlParamMap =  new HashMap<Integer,Property>();

escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java

@@ -52,21 +52,63 @@ public class SqlExecutorTest {
 
     @Test
     public void test() throws Exception {
+        String nodeName = "mysql sql test";
+        String taskAppId = "51_11282_263978";
+        String tenantCode = "hdfs";
+        int taskInstId = 263978;
+        sharedTestSqlTask(nodeName, taskAppId, tenantCode, taskInstId);
+    }
+
+    @Test
+    public void testClickhouse() throws Exception {
+        String nodeName = "ClickHouse sql test";
+        String taskAppId = "1_11_20";
+        String tenantCode = "default";
+        int taskInstId = 20;
+        sharedTestSqlTask(nodeName, taskAppId, tenantCode, taskInstId);
+    }
+
+    @Test
+    public void testOracle() throws Exception {
+        String nodeName = "oracle sql test";
+        String taskAppId = "2_13_25";
+        String tenantCode = "demo";
+        int taskInstId = 25;
+        sharedTestSqlTask(nodeName, taskAppId, tenantCode, taskInstId);
+    }
+
+    @Test
+    public void testSQLServer() throws Exception {
+        String nodeName = "SQL Server sql test";
+        String taskAppId = "3_14_27";
+        String tenantCode = "demo";
+        int taskInstId = 27;
+        sharedTestSqlTask(nodeName, taskAppId, tenantCode, taskInstId);
+    }
 
+    /**
+     * Basic test template for SQLTasks, mainly test different types of DBMS types
+     * @param nodeName node name for selected task
+     * @param taskAppId task app id
+     * @param tenantCode tenant code
+     * @param taskInstId task instance id
+     * @throws Exception
+     */
+    private void sharedTestSqlTask(String nodeName, String taskAppId, String tenantCode, int taskInstId) throws Exception {
         TaskProps taskProps = new TaskProps();
         taskProps.setTaskDir("");
         // processDefineId_processInstanceId_taskInstanceId
-        taskProps.setTaskAppId("51_11282_263978");
+        taskProps.setTaskAppId(taskAppId);
         // set tenant -> task execute linux user
-        taskProps.setTenantCode("hdfs");
+        taskProps.setTenantCode(tenantCode);
         taskProps.setTaskStartTime(new Date());
         taskProps.setTaskTimeout(360000);
-        taskProps.setTaskInstId(263978);
-        taskProps.setNodeName("mysql sql test");
+        taskProps.setTaskInstId(taskInstId);
+        taskProps.setNodeName(nodeName);
 
 
 
-        TaskInstance taskInstance = processDao.findTaskInstanceById(263978);
+        TaskInstance taskInstance = processDao.findTaskInstanceById(taskInstId);
 
         String taskJson = taskInstance.getTaskJson();
         TaskNode taskNode = JSONObject.parseObject(taskJson, TaskNode.class);

escheduler-ui/.env

@@ -1,6 +1,6 @@
 
 # 后端接口地址
-API_BASE = http://192.168.220.154:12345
+API_BASE = http://192.168.220.247:12345
 
 # 本地开发如需ip访问项目把"#"号去掉
 #DEV_HOST = 192.168.xx.xx

escheduler-ui/src/js/conf/home/pages/dag/_source/config.js

@@ -32,31 +32,31 @@ const toolOper = (dagThis) => {
       code: 'pointer',
       icon: '',
       disable: disabled,
-      desc: `${i18n.$t('拖动节点和选中项')}`
+      desc: `${i18n.$t('Drag Nodes and Selected Items')}`
     },
     {
       code: 'line',
       icon: '',
       disable: disabled,
-      desc: `${i18n.$t('选择线条连接')}`
+      desc: `${i18n.$t('Select Line Connection')}`
     },
     {
       code: 'remove',
       icon: '',
       disable: disabled,
-      desc: `${i18n.$t('删除选中的线或节点')}`
+      desc: `${i18n.$t('Delete selected lines or nodes')}`
     },
     {
       code: 'download',
       icon: '',
       disable: !!dagThis.type,
-      desc: `${i18n.$t('下载')}`
+      desc: `${i18n.$t('Download')}`
     },
     {
       code: 'screen',
       icon: '',
       disable: disabled,
-      desc: `${i18n.$t('全屏')}`
+      desc: `${i18n.$t('Full Screen')}`
     }
   ]
 }
@@ -70,17 +70,17 @@ const toolOper = (dagThis) => {
 let publishStatus = [
   {
     id: 0,
-    desc: `${i18n.$t('未发布')}`,
+    desc: `${i18n.$t('Unpublished')}`,
     code: 'NOT_RELEASE'
   },
   {
     id: 1,
-    desc: `${i18n.$t('上线')}`,
+    desc: `${i18n.$t('online')}`,
     code: 'ONLINE'
   },
   {
     id: 2,
-    desc: `${i18n.$t('下线')}`,
+    desc: `${i18n.$t('offline')}`,
     code: 'OFFLINE'
   }
 ]
@@ -92,47 +92,47 @@ let publishStatus = [
  */
 let runningType = [
   {
-    desc: `${i18n.$t('启动工作流')}`,
+    desc: `${i18n.$t('Start Process')}`,
     code: 'START_PROCESS'
   },
   {
-    desc: `${i18n.$t('从当前节点开始执行')}`,
+    desc: `${i18n.$t('Execute from the current node')}`,
     code: 'START_CURRENT_TASK_PROCESS'
   },
   {
-    desc: `${i18n.$t('恢复被容错的工作流')}`,
+    desc: `${i18n.$t('Recover tolerance fault process')}`,
     code: 'RECOVER_TOLERANCE_FAULT_PROCESS'
   },
   {
-    desc: `${i18n.$t('恢复暂停流程')}`,
+    desc: `${i18n.$t('Resume the suspension process')}`,
     code: 'RECOVER_SUSPENDED_PROCESS'
   },
   {
-    desc: `${i18n.$t('从失败节点开始执行')}`,
+    desc: `${i18n.$t('Execute from the failed nodes')}`,
     code: 'START_FAILURE_TASK_PROCESS'
   },
   {
-    desc: `${i18n.$t('补数')}`,
+    desc: `${i18n.$t('Complement Data')}`,
     code: 'COMPLEMENT_DATA'
   },
   {
-    desc: `${i18n.$t('调度执行')}`,
+    desc: `${i18n.$t('Scheduling execution')}`,
     code: 'SCHEDULER'
   },
   {
-    desc: `${i18n.$t('重跑')}`,
+    desc: `${i18n.$t('Rerun')}`,
     code: 'REPEAT_RUNNING'
   },
   {
-    desc: `${i18n.$t('暂停')}`,
+    desc: `${i18n.$t('Pause')}`,
     code: 'PAUSE'
   },
   {
-    desc: `${i18n.$t('停止')}`,
+    desc: `${i18n.$t('Stop')}`,
     code: 'STOP'
   },
   {
-    desc: `${i18n.$t('恢复等待线程')}`,
+    desc: `${i18n.$t('Recovery waiting thread')}`,
     code: 'RECOVER_WAITTING_THREAD'
   }
 ]
@@ -149,63 +149,63 @@ let runningType = [
 let tasksState = {
   'SUBMITTED_SUCCESS': {
     id: 0,
-    desc: `${i18n.$t('提交成功')}`,
+    desc: `${i18n.$t('Submitted successfully')}`,
     color: '#A9A9A9',
     icoUnicode: '',
     isSpin: false
   },
   'RUNNING_EXEUTION': {
     id: 1,
-    desc: `${i18n.$t('正在执行')}`,
+    desc: `${i18n.$t('Executing')}`,
     color: '#0097e0',
     icoUnicode: '',
     isSpin: true
   },
   'READY_PAUSE': {
     id: 2,
-    desc: `${i18n.$t('准备暂停')}`,
+    desc: `${i18n.$t('Ready to pause')}`,
     color: '#07b1a3',
     icoUnicode: '',
     isSpin: false
   },
   'PAUSE': {
     id: 3,
-    desc: `${i18n.$t('暂停')}`,
+    desc: `${i18n.$t('Pause')}`,
     color: '#057c72',
     icoUnicode: '',
     isSpin: false
   },
   'READY_STOP': {
     id: 4,
-    desc: `${i18n.$t('准备停止')}`,
+    desc: `${i18n.$t('Ready to stop')}`,
     color: '#FE0402',
     icoUnicode: '',
     isSpin: false
   },
   'STOP': {
     id: 5,
-    desc: `${i18n.$t('停止')}`,
+    desc: `${i18n.$t('Stop')}`,
     color: '#e90101',
     icoUnicode: '',
     isSpin: false
   },
   'FAILURE': {
     id: 6,
-    desc: `${i18n.$t('失败')}`,
+    desc: `${i18n.$t('failed')}`,
     color: '#000000',
     icoUnicode: '',
     isSpin: false
   },
   'SUCCESS': {
     id: 7,
-    desc: `${i18n.$t('成功')}`,
+    desc: `${i18n.$t('success')}`,
     color: '#33cc00',
     icoUnicode: '',
     isSpin: false
   },
   'NEED_FAULT_TOLERANCE': {
     id: 8,
-    desc: `${i18n.$t('需要容错')}`,
+    desc: `${i18n.$t('Need fault tolerance')}`,
     color: '#FF8C00',
     icoUnicode: '',
     isSpin: false
@@ -219,14 +219,14 @@ let tasksState = {
   },
   'WAITTING_THREAD': {
     id: 10,
-    desc: `${i18n.$t('等待线程')}`,
+    desc: `${i18n.$t('Waiting for thread')}`,
     color: '#912eed',
     icoUnicode: '',
     isSpin: false
   },
   'WAITTING_DEPEND': {
     id: 11,
-    desc: `${i18n.$t('等待依赖')}`,
+    desc: `${i18n.$t('Waiting for dependence')}`,
     color: '#5101be',
     icoUnicode: '',
     isSpin: false

escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss

@@ -386,10 +386,11 @@ svg path:hover {
   .name-p {
     position: absolute;
     left: 50%;
-    bottom: -24px;
+    top: 58px;
     width: 200px;
     text-align: center;
     margin-left: -100px;
+    word-break:break-all;
   }
   .ban-p {
     position: absolute;

escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="clearfix dag-model" >
     <div class="toolbar">
-      <div class="title"><span>{{$t('工具栏')}}</span></div>
+      <div class="title"><span>{{$t('Toolbar')}}</span></div>
       <div class="toolbar-btn">
         <div class="bar-box roundedRect jtk-draggable jtk-droppable jtk-endpoint-anchor jtk-connected"
              :class="v === dagBarId ? 'active' : ''"
@@ -20,7 +20,7 @@
           <x-button
                   style="vertical-align: middle;"
                   data-toggle="tooltip"
-                  :title="$t('查看变量')"
+                  :title="$t('View variables')"
                   data-container="body"
                   type="primary"
                   size="xsmall"
@@ -42,7 +42,7 @@
           </div>
           <x-button
                   data-toggle="tooltip"
-                  :title="$t('刷新DAG状态')"
+                  :title="$t('Refresh DAG status')"
                   data-container="body"
                   style="vertical-align: middle;"
                   icon="fa fa-refresh"
@@ -59,7 +59,7 @@
                   size="xsmall"
                   icon="fa fa-reply"
                   @click="_rtNodesDag" >
-            {{$t('返回上一节点')}}
+            {{$t('Return_1')}}
           </x-button>
           <x-button
                   style="vertical-align: middle;"
@@ -70,7 +70,7 @@
                   @click="_saveChart"
                   icon="fa fa-save"
                   :disabled="isDetails">
-            {{spinnerLoading ? 'Loading...' : $t('保存')}}
+            {{spinnerLoading ? 'Loading...' : $t('Save')}}
           </x-button>
         </div>
       </div>
@@ -152,7 +152,7 @@
             let idArr = allNodesId()
             const titleTpl = (item, desc) => {
               let $item = _.filter(taskList, v => v.name === item.name)[0]
-              return `<div style="text-align: left">${i18n.$t('名称')}：${$item.name}</br>${i18n.$t('状态')}：${desc}</br>${i18n.$t('类型')}：${$item.taskType}</br>${i18n.$t('host')}：${$item.host || '-'}</br>${i18n.$t('重试次数')}：${$item.retryTimes}</br>${i18n.$t('提交时间')}：${formatDate($item.submitTime)}</br>${i18n.$t('开始时间')}：${formatDate($item.startTime)}</br>${i18n.$t('结束时间')}：${$item.endTime ? formatDate($item.endTime) : '-'}</br></div>`
+              return `<div style="text-align: left">${i18n.$t('Name')}：${$item.name}</br>${i18n.$t('State')}：${desc}</br>${i18n.$t('type')}：${$item.taskType}</br>${i18n.$t('host')}：${$item.host || '-'}</br>${i18n.$t('Retry Count')}：${$item.retryTimes}</br>${i18n.$t('Submit Time')}：${formatDate($item.submitTime)}</br>${i18n.$t('Start Time')}：${formatDate($item.startTime)}</br>${i18n.$t('End Time')}：${$item.endTime ? formatDate($item.endTime) : '-'}</br></div>`
             }
             data.forEach(v1 => {
               idArr.forEach(v2 => {
@@ -232,7 +232,7 @@
           Dag.saveStore().then(res => {
             if (this.urlParam.id) {
               /**
-               * 编辑
+               * Edit
                * @param saveInstanceEditDAGChart => Process instance editing
                * @param saveEditDAGChart => Process definition editing
                */
@@ -300,7 +300,7 @@
       _saveChart () {
         // Verify node
         if (!this.tasks.length) {
-          this.$message.warning(`${i18n.$t('未创建节点保存失败')}`)
+          this.$message.warning(`${i18n.$t('Failed to create node to save')}`)
           return
         }
 
@@ -350,7 +350,7 @@
         this._getTaskState(false).then(res => {
           setTimeout(() => {
             this.isRefresh = false
-            this.$message.success(`${i18n.$t('刷新状态成功')}`)
+            this.$message.success(`${i18n.$t('Refresh status succeeded')}`)
           }, 2200)
         })
       },

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue

@@ -1,6 +1,6 @@
 <template>
   <x-select
-          style="width: 170px;"
+          style="width: 157px;"
           :disabled="isDetails"
           @on-change="_onChange"
           v-model="value">
@@ -12,7 +12,7 @@
               slot-scope="{ selectedModel }"
               maxlength="4"
               @on-blur="_onBlur"
-              :placeholder="$t('请选择')"
+              :placeholder="$t('Please choose')"
               :value="selectedModel === null ? '0' : selectedModel.value"
               style="width: 100%;"
               @on-click-icon.stop="_ckIcon">
@@ -81,7 +81,7 @@
         if (val === '0') return true
 
         if (!(/(^[0-9]*[1-9][0-9]*$)/.test(val))) {
-          this.$message.warning(`${i18n.$t('请输入正整数')}`)
+          this.$message.warning(`${i18n.$t('Please enter a positive integer')}`)
           // init
           this._ckIcon()
           return false

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue

@@ -2,7 +2,7 @@
   <div class="timeout-alarm-model">
     <div class="clearfix list">
       <div class="text-box">
-        <span>{{$t('任务超时告警')}}</span>
+        <span>{{$t('Timeout alarm')}}</span>
       </div>
       <div class="cont-box">
         <label class="label-box">
@@ -14,14 +14,14 @@
     </div>
     <div class="clearfix list" v-if="enable">
       <div class="text-box">
-        <span>{{$t('超时策略')}}</span>
+        <span>{{$t('Timeout strategy')}}</span>
       </div>
       <div class="cont-box">
         <label class="label-box">
           <div style="padding-top: 6px;">
             <x-checkbox-group v-model="strategy">
-              <x-checkbox label="WARN" :disabled="isDetails">{{$t('超时告警')}}</x-checkbox>
-              <x-checkbox label="FAILED" :disabled="isDetails">{{$t('超时失败')}}</x-checkbox>
+              <x-checkbox label="WARN" :disabled="isDetails">{{$t('Timeout alarm')}}</x-checkbox>
+              <x-checkbox label="FAILED" :disabled="isDetails">{{$t('Timeout failure')}}</x-checkbox>
             </x-checkbox-group>
           </div>
         </label>
@@ -29,12 +29,12 @@
     </div>
     <div class="clearfix list" v-if="enable">
       <div class="text-box">
-        <span>{{$t('超时时长')}}</span>
+        <span>{{$t('Timeout period')}}</span>
       </div>
       <div class="cont-box">
         <label class="label-box">
           <x-input v-model="interval" style="width: 128px;" :disabled="isDetails">
-            <span slot="append">{{$t('分')}}</span>
+            <span slot="append">{{$t('Minute')}}</span>
           </x-input>
         </label>
       </div>
@@ -71,12 +71,12 @@
       _verification () {
         // Verification timeout policy
         if (this.enable && !this.strategy.length) {
-          this.$message.warning(`${this.$t('超时策略必须选一个')}`)
+          this.$message.warning(`${this.$t('Timeout strategy must be selected')}`)
           return false
         }
         // Verify timeout duration Non 0 positive integer
         if (this.enable && !parseInt(this.interval) && !_.isInteger(this.interval)) {
-          this.$message.warning(`${this.$t('超时时长必须为正整数')}`)
+          this.$message.warning(`${this.$t('Timeout must be a positive integer')}`)
           return false
         }
         this.$emit('on-timeout', {

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="form-model-model" v-clickoutside="_handleClose">
     <div class="title-box">
-      <span class="name">{{$t('当前节点设置')}}</span>
+      <span class="name">{{$t('Current node settings')}}</span>
       <span class="go-subtask">
         <!-- Component can't pop up box to do component processing -->
         <m-log :item="backfillItem">
-          <template slot="history"><a href="javascript:" @click="_seeHistory" ><i class="iconfont">&#xe6ee;</i><em>{{$t('查看历史')}}</em></a></template>
-          <template slot="log"><a href="javascript:"><i class="iconfont">&#xe691;</i><em>{{$t('查看日志')}}</em></a></template>
+          <template slot="history"><a href="javascript:" @click="_seeHistory" ><i class="iconfont">&#xe6ee;</i><em>{{$t('View history')}}</em></a></template>
+          <template slot="log"><a href="javascript:"><i class="iconfont">&#xe691;</i><em>{{$t('View log')}}</em></a></template>
         </m-log>
-        <a href="javascript:" @click="_goSubProcess" v-if="_isGoSubProcess"><i class="iconfont">&#xe600;</i><em>{{$t('进入该子节点')}}</em></a>
+        <a href="javascript:" @click="_goSubProcess" v-if="_isGoSubProcess"><i class="iconfont">&#xe600;</i><em>{{$t('Enter this child node')}}</em></a>
       </span>
     </div>
     <div class="content-box" v-if="isContentBox">
@@ -16,14 +16,14 @@
 
         <!-- Node name -->
         <div class="clearfix list">
-          <div class="text-box"><span>{{$t('节点名称')}}</span></div>
+          <div class="text-box"><span>{{$t('Node name')}}</span></div>
           <div class="cont-box">
             <label class="label-box">
               <x-input
                       type="text"
                       v-model="name"
                       :disabled="isDetails"
-                      :placeholder="$t('请输入name(必填)')"
+                      :placeholder="$t('Please enter name(required)')"
                       maxlength="100"
                       @on-blur="_verifName()"
                       autocomplete="off">
@@ -34,12 +34,12 @@
 
         <!-- Running sign -->
         <div class="clearfix list">
-          <div class="text-box"><span>{{$t('运行标志')}}</span></div>
+          <div class="text-box"><span>{{$t('Run flag')}}</span></div>
           <div class="cont-box">
             <label class="label-box">
               <x-radio-group v-model="runFlag" >
-                <x-radio :label="'NORMAL'" :disabled="isDetails">{{$t('正常')}}</x-radio>
-                <x-radio :label="'FORBIDDEN'" :disabled="isDetails">{{$t('禁止执行')}}</x-radio>
+                <x-radio :label="'NORMAL'" :disabled="isDetails">{{$t('Normal')}}</x-radio>
+                <x-radio :label="'FORBIDDEN'" :disabled="isDetails">{{$t('Prohibition execution')}}</x-radio>
               </x-radio-group>
             </label>
           </div>
@@ -48,7 +48,7 @@
         <!-- desc -->
         <div class="clearfix list">
           <div class="text-box">
-            <span>{{$t('描述')}}</span>
+            <span>{{$t('Description')}}</span>
           </div>
           <div class="cont-box">
 
@@ -59,7 +59,7 @@
                       type="textarea"
                       :disabled="isDetails"
                       v-model="desc"
-                      :placeholder="$t('请输入desc')"
+                      :placeholder="$t('Please enter description')"
                       autocomplete="off">
               </x-input>
             </label>
@@ -69,7 +69,7 @@
         <!-- Task priority -->
         <div class="clearfix list">
           <div class="text-box">
-            <span>{{$t('任务优先级')}}</span>
+            <span>{{$t('Task priority')}}</span>
           </div>
           <div class="cont-box">
             <label class="label-box">
@@ -81,16 +81,16 @@
         <!-- Number of failed retries -->
         <div class="clearfix list" v-if="taskType !== 'SUB_PROCESS'">
           <div class="text-box">
-            <span>{{$t('失败重试次数')}}</span>
+            <span>{{$t('Number of failed retries')}}</span>
           </div>
           <div class="cont-box">
             <m-select-input v-model="maxRetryTimes" :list="[0,1,2,3,4]">
             </m-select-input>
-            <span>({{$t('次')}})</span>
-            <span class="text-b">{{$t('失败重试间隔')}}</span>
+            <span>({{$t('Times')}})</span>
+            <span class="text-b">{{$t('Failed retry interval')}}</span>
             <m-select-input v-model="retryInterval" :list="[1,10,30,60,120]">
             </m-select-input>
-            <span>({{$t('分')}})</span>
+            <span>({{$t('Minute')}})</span>
           </div>
         </div>
 
@@ -163,8 +163,8 @@
     </div>
     <div class="bottom-box">
       <div class="submit" style="background: #fff;">
-        <x-button type="text" @click="close()"> {{$t('取消')}} </x-button>
-        <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="ok()" :disabled="isDetails" v-ps="['GENERAL_USER']">{{spinnerLoading ? 'Loading...' : $t('确认添加')}} </x-button>
+        <x-button type="text" @click="close()"> {{$t('Cancel')}} </x-button>
+        <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="ok()" :disabled="isDetails" v-ps="['GENERAL_USER']">{{spinnerLoading ? 'Loading...' : $t('Confirm add')}} </x-button>
       </div>
     </div>
   </div>
@@ -178,7 +178,7 @@
   import mShell from './tasks/shell'
   import mSpark from './tasks/spark'
   import mPython from './tasks/python'
-  import { isNameExDag,rtBantpl } from './../plugIn/util'
+  import { isNameExDag, rtBantpl } from './../plugIn/util'
   import JSP from './../plugIn/jsPlumbHandle'
   import mProcedure from './tasks/procedure'
   import mDependent from './tasks/dependent'
@@ -255,7 +255,7 @@
        */
       _seeHistory () {
         this.self.$router.push({
-          name: 'task-instance-list',
+          name: 'task-instance',
           query: {
             processInstanceId: this.self.$route.params.id,
             taskName: this.backfillItem.name
@@ -269,13 +269,13 @@
        */
       _goSubProcess () {
         if (_.isEmpty(this.backfillItem)) {
-          this.$message.warning(`${i18n.$t('新创建子工作流还未执行，不能进入子工作流')}`)
+          this.$message.warning(`${i18n.$t('The newly created sub-Process has not yet been executed and cannot enter the sub-Process')}`)
           return
         }
         if (this.router.history.current.name === 'projects-instance-details') {
           let stateId = $(`#${this.id}`).attr('data-state-id') || null
           if (!stateId) {
-            this.$message.warning(`${i18n.$t('该任务还未执行，不能进入子工作流')}`)
+            this.$message.warning(`${i18n.$t('The task has not been executed and cannot enter the sub-Process')}`)
             return
           }
           this.store.dispatch('dag/getSubProcessId', { taskId: stateId }).then(res => {
@@ -304,7 +304,7 @@
        */
       _verifName () {
         if (!_.trim(this.name)) {
-          this.$message.warning(`${i18n.$t('请输入名称(必填)')}`)
+          this.$message.warning(`${i18n.$t('Please enter name (required)')}`)
           return false
         }
         if (this.name === this.backfillItem.name) {
@@ -312,7 +312,7 @@
         }
         // Name repeat depends on dom backfill dependent store
         if (isNameExDag(this.name, _.isEmpty(this.backfillItem) ? 'dom' : 'backfill')) {
-          this.$message.warning(`${i18n.$t('名称已存在请重新输入')}`)
+          this.$message.warning(`${i18n.$t('Name already exists')}`)
           return false
         }
         return true
@@ -353,6 +353,9 @@
           },
           fromThis: this
         })
+
+        // set run flag
+        this._setRunFlag()
       },
       /**
        * Sub-workflow selected node echo name
@@ -360,6 +363,16 @@
       _onSetProcessName (name) {
         this.name = name
       },
+      /**
+       *  set run flag
+       */
+      _setRunFlag () {
+        let dom = $(`#${this.id}`).find('.ban-p')
+        dom.html('')
+        if (this.runFlag === 'FORBIDDEN') {
+          dom.append(rtBantpl())
+        }
+      },
       /**
        * Submit verification
        */
@@ -384,13 +397,7 @@
       }
     },
     watch: {
-      runFlag(val){
-        let dom = $(`#${this.id}`).find('.ban-p')
-        dom.html('')
-        if (val === 'FORBIDDEN') {
-          dom.append(rtBantpl())
-        }
-      }
+
     },
     created () {
       // Unbind copy and paste events
@@ -521,10 +528,10 @@
       position: relative;
       margin-bottom: 10px;
       .text-box {
-        width: 110px;
+        width: 112px;
         float: left;
         text-align: right;
-        margin-right: 10px;
+        margin-right: 8px;
         >span {
           font-size: 14px;
           color: #777;

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue

@@ -10,18 +10,18 @@
       <div v-show="isLog || source === 'list'" class="log-pop">
         <div class="log-box" >
           <div class="title">
-            <span>{{$t('查看日志')}}</span>
+            <span>{{$t('View log')}}</span>
             <div class="full-screen">
-              <a href="javascript:" @click="_downloadLog" data-container="body" data-toggle="tooltip" :title="$t('下载日志')">
+              <a href="javascript:" @click="_downloadLog" data-container="body" data-toggle="tooltip" :title="$t('Download Log')">
                 <i class="iconfont" style="font-size: 20px">&#xe610;</i>
               </a>
-              <a href="javascript:" class="refresh-log" :class="loading ? 'active' :''" @click="!loading && _refreshLog()" data-container="body" data-toggle="tooltip" :title="$t('刷新日志')">
+              <a href="javascript:" class="refresh-log" :class="loading ? 'active' :''" @click="!loading && _refreshLog()" data-container="body" data-toggle="tooltip" :title="$t('Refresh Log')">
                 <i class="fa iconfont">&#xe602;</i>
               </a>
-              <a href="javascript:" @click="_screenOpen" v-show="!isScreen" data-container="body" data-toggle="tooltip" :title="$t('进入全屏')">
+              <a href="javascript:" @click="_screenOpen" v-show="!isScreen" data-container="body" data-toggle="tooltip" :title="$t('Enter full screen')">
                 <i class="iconfont">&#xe6e0;</i>
               </a>
-              <a href="javascript:" @click="_screenClose" v-show="isScreen" data-container="body" data-toggle="tooltip" :title="$t('取消全屏')">
+              <a href="javascript:" @click="_screenClose" v-show="isScreen" data-container="body" data-toggle="tooltip" :title="$t('Cancel full screen')">
                 <i class="iconfont">&#xe660;</i>
               </a>
             </div>
@@ -32,7 +32,7 @@
             </div>
           </div>
           <div class="operation">
-            <x-button type="primary" shape="circle" @click="close"> {{$t('关闭')}} </x-button>
+            <x-button type="primary" shape="circle" @click="close"> {{$t('Close')}} </x-button>
           </div>
         </div>
       </div>
@@ -88,13 +88,13 @@
           setTimeout(() => {
             this.loading = false
             if (res.data) {
-              this.$message.success(`${i18n.$t('更新日志成功')}`)
+              this.$message.success(`${i18n.$t('Update log success')}`)
             } else {
-              this.$message.warning(`${i18n.$t('暂无更多日志')}`)
+              this.$message.warning(`${i18n.$t('No more logs')}`)
             }
           }, 1500)
           // Handling text field size
-          handerTextareaSize().html('').text(res.data || `${i18n.$t('暂无日志')}`)
+          handerTextareaSize().html('').text(res.data || `${i18n.$t('No log')}`)
         }).catch(e => {
           this.$message.error(e.msg || '')
           this.loading = false
@@ -108,15 +108,15 @@
           if (!res.data) {
             this.isData = false
             setTimeout(() => {
-              this.$message.warning(`${i18n.$t('暂无更多日志')}`)
+              this.$message.warning(`${i18n.$t('No more logs')}`)
             }, 1000)
             // Handling text field size
-            handerTextareaSize().html('').text(content || `${i18n.$t('暂无日志')}`)
+            handerTextareaSize().html('').text(content || `${i18n.$t('No log')}`)
           } else {
             this.isData = true
             content = res.data
             // Handling text field size
-            handerTextareaSize().html('').text(content || `${i18n.$t('暂无日志')}`)
+            handerTextareaSize().html('').text(content || `${i18n.$t('No log')}`)
 
             setTimeout(() => {
               $('#textarea').scrollTop(2)
@@ -189,7 +189,7 @@
           if (($this.scrollTop() + $this.height()) === $this.height()) {
             if (self.loadingIndex > 0) {
               self.$message.loading({
-                content: `${i18n.$t('正在努力请求日志中...')}`,
+                content: `${i18n.$t('Loading Log...')}`,
                 duration: 0,
                 closable: false
               })
@@ -201,7 +201,7 @@
             // No data is not requested
             if (self.isData) {
               self.$message.loading({
-                content: `${i18n.$t('正在努力请求日志中...')}`,
+                content: `${i18n.$t('Loading Log...')}`,
                 duration: 0,
                 closable: false
               })
@@ -226,7 +226,7 @@
       // Source is a task instance
       if (this.source === 'list') {
         this.$message.loading({
-          content: `${i18n.$t('正在努力请求日志中...')}`,
+          content: `${i18n.$t('Loading Log...')}`,
           duration: 0,
           closable: false
         })

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js

@@ -7,19 +7,19 @@ import i18n from '@/module/i18n'
 const cycleList = [
   {
     value: 'month',
-    label: `${i18n.$t('月')}`
+    label: `${i18n.$t('month')}`
   },
   {
     value: 'week',
-    label: `${i18n.$t('周')}`
+    label: `${i18n.$t('week')}`
   },
   {
     value: 'day',
-    label: `${i18n.$t('日')}`
+    label: `${i18n.$t('day')}`
   },
   {
     value: 'hour',
-    label: `${i18n.$t('时')}`
+    label: `${i18n.$t('hour')}`
   }
 ]
 
@@ -30,81 +30,81 @@ const dateValueList = {
   'hour': [
     {
       value: 'last1Hour',
-      label: `${i18n.$t('前1小时')}`
+      label: `${i18n.$t('Last1Hour')}`
     },
     {
       value: 'last2Hours',
-      label: `${i18n.$t('前2小时')}`
+      label: `${i18n.$t('Last2Hours')}`
     },
     {
       value: 'last3Hours',
-      label: `${i18n.$t('前3小时')}`
+      label: `${i18n.$t('Last3Hours')}`
     }
   ],
   'day': [
     {
       value: 'last1Days',
-      label: `${i18n.$t('昨天')}`
+      label: `${i18n.$t('Last1Days')}`
     },
     {
       value: 'last2Days',
-      label: `${i18n.$t('前两天')}`
+      label: `${i18n.$t('Last2Days')}`
     },
     {
       value: 'last3Days',
-      label: `${i18n.$t('前三天')}`
+      label: `${i18n.$t('Last3Days')}`
     },
     {
       value: 'last7Days',
-      label: `${i18n.$t('前七天')}`
+      label: `${i18n.$t('Last7Days')}`
     }
   ],
   'week': [
     {
       value: 'lastWeek',
-      label: `${i18n.$t('上周')}`
+      label: `${i18n.$t('LastWeek')}`
     },
     {
       value: 'lastMonday',
-      label: `${i18n.$t('上周一')}`
+      label: `${i18n.$t('LastMonday')}`
     },
     {
       value: 'lastTuesday',
-      label: `${i18n.$t('上周二')}`
+      label: `${i18n.$t('LastTuesday')}`
     },
     {
       value: 'lastWednesday',
-      label: `${i18n.$t('上周三')}`
+      label: `${i18n.$t('LastWednesday')}`
     },
     {
       value: 'lastThursday',
-      label: `${i18n.$t('上周四')}`
+      label: `${i18n.$t('LastThursday')}`
     },
     {
       value: 'lastFriday',
-      label: `${i18n.$t('上周五')}`
+      label: `${i18n.$t('LastFriday')}`
     },
     {
       value: 'lastSaturday',
-      label: `${i18n.$t('上周六')}`
+      label: `${i18n.$t('LastSaturday')}`
     },
     {
       value: 'lastSunday',
-      label: `${i18n.$t('上周日')}`
+      label: `${i18n.$t('LastSunday')}`
     }
   ],
   'month': [
     {
       value: 'lastMonth',
-      label: `${i18n.$t('上月')}`
+      label: `${i18n.$t('LastMonth')}`
     },
     {
       value: 'lastMonthBegin',
-      label: `${i18n.$t('上月初')}`
+      label: `${i18n.$t('LastMonthBegin')}`
     },
     {
       value: 'lastMonthEnd',
-      label: `${i18n.$t('上月末')}`
+      label: `${i18n.$t('LastMonthEnd')}`
     }
   ]
 }
@@ -182,11 +182,11 @@ const typeList = [
 const sqlTypeList = [
   {
     id: 0,
-    code: `${i18n.$t('查询')}`
+    code: `${i18n.$t('Query')}`
   },
   {
     id: 1,
-    code: `${i18n.$t('非查询')}`
+    code: `${i18n.$t('Non Query')}`
   }
 ]
 

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue

@@ -12,7 +12,7 @@
                 :label="city.code">
         </x-option>
       </x-select>
-      <x-select :placeholder="$t('请选择数据源')"
+      <x-select :placeholder="$t('Please select the datasource')"
                 v-model="datasource"
                 style="width: 288px;"
                 :disabled="isDetails">
@@ -56,7 +56,7 @@
        */
       _verifDatasource () {
         if (!this.datasource) {
-          this.$message.warning(`${i18n.$t('请选择数据源')}`)
+          this.$message.warning(`${i18n.$t('Please select the datasource')}`)
           return false
         }
         this.$emit('on-dsData', {

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue

@@ -19,17 +19,17 @@
       </x-select>
       <template v-if="isInstance">
         <span class="instance-state">
-          <i class="iconfont" :class="'icon-' + el.state" v-if="el.state === 'SUCCESS'" data-toggle="tooltip" data-container="body" :title="$t('成功')">&#xe607;</i>
-          <i class="iconfont" :class="'icon-' + el.state" v-if="el.state === 'WAITING'" data-toggle="tooltip" data-container="body" :title="$t('等待')">&#xe62a;</i>
-          <i class="iconfont" :class="'icon-' + el.state" v-if="el.state === 'FAILED'" data-toggle="tooltip" data-container="body" :title="$t('失败')">&#xe626;</i>
+          <i class="iconfont" :class="'icon-' + el.state" v-if="el.state === 'SUCCESS'" data-toggle="tooltip" data-container="body" :title="$t('success')">&#xe607;</i>
+          <i class="iconfont" :class="'icon-' + el.state" v-if="el.state === 'WAITING'" data-toggle="tooltip" data-container="body" :title="$t('waiting')">&#xe62a;</i>
+          <i class="iconfont" :class="'icon-' + el.state" v-if="el.state === 'FAILED'" data-toggle="tooltip" data-container="body" :title="$t('failed')">&#xe626;</i>
         </span>
       </template>
       <span class="operation">
         <a href="javascript:" class="delete" @click="!isDetails && _remove($index)">
-          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" data-container="body" :title="$t('删除')" >&#xe611;</i>
+          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" data-container="body" :title="$t('delete')" >&#xe611;</i>
         </a>
         <a href="javascript:" class="add" @click="!isDetails && _add()" v-if="$index === (dependItemList.length - 1)">
-          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" data-container="body" :title="$t('添加')">&#xe636;</i>
+          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" data-container="body" :title="$t('Add')">&#xe636;</i>
         </a>
       </span>
     </div>

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue

@@ -8,7 +8,7 @@
               :disabled="isDetails"
               type="text"
               v-model="localParamsList[$index].prop"
-              :placeholder="$t('prop(必填)')"
+              :placeholder="$t('prop(required)')"
               maxlength="64"
               @on-blur="_verifProp()"
               style="width: 164px;">
@@ -41,25 +41,25 @@
               :disabled="isDetails"
               type="text"
               v-model="localParamsList[$index].value"
-              :placeholder="$t('value(选填)')"
+              :placeholder="$t('value(optional)')"
               maxlength="64"
               @on-blur="_handleValue()"
               style="width: 150px;position: relative;margin-bottom: -2px;">
       </x-input>
       <span class="lt-add">
         <a href="javascript:" style="color:red;" @click="!isDetails && _removeUdp($index)" >
-          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('删除')" >&#xe611;</i>
+          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('delete')" >&#xe611;</i>
         </a>
       </span>
       <span class="add" v-if="$index === (localParamsList.length - 1)">
         <a href="javascript:" @click="!isDetails && _addUdp()" >
-          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('添加')">&#xe636;</i>
+          <i class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')">&#xe636;</i>
         </a>
       </span>
     </div>
     <span class="add" v-if="!localParamsList.length">
       <a href="javascript:" @click="!isDetails && _addUdp()" >
-        <i class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('添加')">&#xe636;</i>
+        <i class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')">&#xe636;</i>
       </a>
     </span>
   </div>
@@ -149,14 +149,14 @@
         })
         if (!flag) {
           if (!type) {
-            this.$message.warning(`${i18n.$t('prop不能为空')}`)
+            this.$message.warning(`${i18n.$t('prop is empty')}`)
           }
           return false
         }
         let newArr = _.cloneDeep(_.uniqWith(arr, _.isEqual))
         if (newArr.length !== arr.length) {
           if (!type) {
-            this.$message.warning(`${i18n.$t('prop中有重复')}`)
+            this.$message.warning(`${i18n.$t('prop is repeat')}`)
           }
           return false
         }

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue

@@ -4,7 +4,7 @@
               v-model="value"
               filterable
               :disabled="isDetails"
-              :placeholder="$t('请选择资源')"
+              :placeholder="$t('Please select resources')"
               style="width: 100%;">
       <x-option
               v-for="city in resList"

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="dependence-model">
     <m-list-box>
-      <div slot="text">{{$t('添加依赖')}}</div>
+      <div slot="text">{{$t('Add dependency')}}</div>
       <div slot="content">
         <div class="dep-opt">
           <a href="javascript:"
              @click="!isDetails && _addDep()"
              class="add-dep">
-            <i v-if="!isLoading" class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('添加')">
+            <i v-if="!isLoading" class="iconfont" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')">
               &#xe636;
             </i>
-            <i v-if="isLoading" class="iconfont fa fa-spin" data-toggle="tooltip" :title="$t('添加')">
+            <i v-if="isLoading" class="iconfont fa fa-spin" data-toggle="tooltip" :title="$t('Add')">
               &#xe6af;
             </i>
           </a>
@@ -20,20 +20,20 @@
                   class="dep-relation"
                   @click="!isDetails && _setGlobalRelation()"
                   v-if="dependTaskList.length">
-            {{relation === 'AND' ? $t('且') : $t('或')}}
+            {{relation === 'AND' ? $t('and') : $t('or')}}
           </span>
           <div class="dep-list" v-for="(el,$index) in dependTaskList">
             <span class="dep-line-pie"
                   v-if="el.dependItemList.length"
                   @click="!isDetails && _setRelation($index)">
-              {{el.relation === 'AND' ? $t('且') : $t('或')}}
+              {{el.relation === 'AND' ? $t('and') : $t('or')}}
             </span>
             <i class="iconfont dep-delete"
                data-toggle="tooltip"
                data-container="body"
                :class="_isDetails"
                @click="!isDetails && _deleteDep($index)"
-               :title="$t('删除')" >
+               :title="$t('delete')" >
               &#xe611;
             </i>
             <m-depend-item-list

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="spark-model">
     <m-list-box>
-      <div slot="text">{{$t('程序类型')}}</div>
+      <div slot="text">{{$t('Program Type')}}</div>
       <div slot="content">
         <x-select v-model="programType" :disabled="isDetails" style="width: 100px;">
           <x-option
@@ -14,23 +14,23 @@
       </div>
     </m-list-box>
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('主函数的class')}}</div>
+      <div slot="text">{{$t('Main class')}}</div>
       <div slot="content">
         <x-input
                 :disabled="isDetails"
                 type="input"
                 v-model="mainClass"
-                :placeholder="$t('请输入mainClass')"
+                :placeholder="$t('Please enter main class')"
                 autocomplete="off">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('主jar包')}}</div>
+      <div slot="text">{{$t('Main jar package')}}</div>
       <div slot="content">
         <x-select
                 style="width: 100%;"
-                :placeholder="$t('请选择主jar包')"
+                :placeholder="$t('Please enter main jar package')"
                 v-model="mainJar"
                 filterable
                 :disabled="isDetails">
@@ -44,33 +44,33 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('命令行参数')}}</div>
+      <div slot="text">{{$t('Command-line parameters')}}</div>
       <div slot="content">
         <x-input
                 :autosize="{minRows:2}"
                 :disabled="isDetails"
                 type="textarea"
                 v-model="mainArgs"
-                :placeholder="$t('请输入命令行参数')"
+                :placeholder="$t('Please enter Command-line parameters')"
                 autocomplete="off">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('其他参数')}}</div>
+      <div slot="text">{{$t('Other parameters')}}</div>
       <div slot="content">
         <x-input
                 :disabled="isDetails"
                 :autosize="{minRows:2}"
                 type="textarea"
                 v-model="others"
-                :placeholder="$t('请输入其他参数')"
+                :placeholder="$t('Please enter other parameters')"
                 autocomplete="off">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('资源')}}</div>
+      <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
         <m-resources
                 ref="refResources"
@@ -80,7 +80,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('自定义参数')}}</div>
+      <div slot="text">{{$t('Custom Parameters')}}</div>
       <div slot="content">
         <m-local-params
                 ref="refLocalParams"
@@ -145,12 +145,12 @@
        */
       _verification () {
         if (this.programType !== 'PYTHON' && !this.mainClass) {
-          this.$message.warning(`${i18n.$t('请填写主函数的class')}`)
+          this.$message.warning(`${i18n.$t('Please enter main class')}`)
           return false
         }
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('请选择主jar包')}`)
+          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
           return false
         }
 

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue

@@ -1,30 +1,30 @@
 <template>
   <div class="procedure-model">
     <m-list-box>
-      <div slot="text">{{$t('数据源')}}</div>
+      <div slot="text">{{$t('Datasource')}}</div>
       <div slot="content">
         <m-datasource
                 ref="refDs"
                 @on-dsData="_onDsData"
-                :supportType="['MYSQL','POSTGRESQL']"
+                :supportType="['MYSQL','POSTGRESQL','CLICKHOUSE', 'ORACLE', 'SQLSERVER']"
                 :data="{ type:type,datasource:datasource }">
         </m-datasource>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('方法')}}</div>
+      <div slot="text">{{$t('methods')}}</div>
       <div slot="content">
         <x-input
                 type="input"
                 :disabled="isDetails"
                 v-model="method"
-                :placeholder="$t('请输入method(选填)')"
+                :placeholder="$t('Please enter method(optional)')"
                 autocomplete="off">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('自定义参数')}}</div>
+      <div slot="text">{{$t('Custom Parameters')}}</div>
       <div slot="content">
         <m-local-params
                 ref="refLocalParams"
@@ -85,7 +85,7 @@
 
         // Verification function
         if (!this.method) {
-          this.$message.warning(`${i18n.$t('请输入方法')}`)
+          this.$message.warning(`${i18n.$t('Please enter method')}`)
           return false
         }
 

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="shell-model">
     <m-list-box>
-      <div slot="text">{{$t('脚本')}}</div>
+      <div slot="text">{{$t('Script')}}</div>
       <div slot="content">
         <div class="from-mirror">
           <textarea id="code-python-mirror" name="code-python-mirror" style="opacity: 0;">
@@ -10,7 +10,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('资源')}}</div>
+      <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
         <m-resources
                 ref="refResources"
@@ -21,7 +21,7 @@
     </m-list-box>
 
     <m-list-box>
-      <div slot="text">{{$t('自定义参数')}}</div>
+      <div slot="text">{{$t('Custom Parameters')}}</div>
       <div slot="content">
         <m-local-params
                 ref="refLocalParams"
@@ -79,7 +79,7 @@
       _verification () {
         // rawScript 验证
         if (!editor.getValue()) {
-          this.$message.warning(`${i18n.$t('请输入rawScript(必填)')}`)
+          this.$message.warning(`${i18n.$t('Please enter script(required)')}`)
           return false
         }
 

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="shell-model">
     <m-list-box>
-      <div slot="text">{{$t('脚本')}}</div>
+      <div slot="text">{{$t('Script')}}</div>
       <div slot="content">
         <div class="from-mirror">
           <textarea
@@ -13,7 +13,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('资源')}}</div>
+      <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
         <m-resources
                 ref="refResources"
@@ -23,7 +23,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('自定义参数')}}</div>
+      <div slot="text">{{$t('Custom Parameters')}}</div>
       <div slot="content">
         <m-local-params
                 ref="refLocalParams"
@@ -81,7 +81,7 @@
       _verification () {
         // rawScript verification
         if (!editor.getValue()) {
-          this.$message.warning(`${i18n.$t('请输入rawScript(必填)')}`)
+          this.$message.warning(`${i18n.$t('Please enter script(required)')}`)
           return false
         }
 

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="spark-model">
     <m-list-box>
-      <div slot="text">{{$t('程序类型')}}</div>
+      <div slot="text">{{$t('Program Type')}}</div>
       <div slot="content">
         <x-select
                 style="width: 130px;"
@@ -17,23 +17,23 @@
       </div>
     </m-list-box>
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('主函数的class')}}</div>
+      <div slot="text">{{$t('Main class')}}</div>
       <div slot="content">
         <x-input
                 :disabled="isDetails"
                 type="input"
                 v-model="mainClass"
-                :placeholder="$t('请输入mainClass')"
+                :placeholder="$t('Please enter main class')"
                 autocomplete="off">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('主jar包')}}</div>
+      <div slot="text">{{$t('Main jar package')}}</div>
       <div slot="content">
         <x-select
                 style="width: 100%;"
-                :placeholder="$t('请选择主jar包')"
+                :placeholder="$t('Please enter main jar package')"
                 v-model="mainJar"
                 filterable
                 :disabled="isDetails">
@@ -47,7 +47,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('部署方式')}}</div>
+      <div slot="text">{{$t('Deploy Mode')}}</div>
       <div slot="content">
         <x-radio-group v-model="deployMode">
           <x-radio :label="'cluster'" :disabled="isDetails"></x-radio>
@@ -58,61 +58,61 @@
     </m-list-box>
     <div class="list-box-4p">
       <div class="clearfix list">
-        <span class="sp1">{{$t('Driver内核数')}}</span>
+        <span class="sp1">{{$t('Driver core number')}}</span>
         <span class="sp2">
           <x-input
                   :disabled="isDetails"
                   type="input"
                   v-model="driverCores"
-                  :placeholder="$t('请输入Driver内核数')"
+                  :placeholder="$t('Please enter driver core number')"
                   style="width: 200px;"
                   autocomplete="off">
         </x-input>
         </span>
-        <span class="sp1 sp3">{{$t('Driver内存数')}}</span>
+        <span class="sp1 sp3">{{$t('Driver memory use')}}</span>
         <span class="sp2">
           <x-input
                   :disabled="isDetails"
                   type="input"
                   v-model="driverMemory"
-                  :placeholder="$t('请输入Driver内存数')"
+                  :placeholder="$t('Please enter driver memory use')"
                   style="width: 186px;"
                   autocomplete="off">
         </x-input>
         </span>
       </div>
       <div class="clearfix list">
-        <span class="sp1">{{$t('Executor数量')}}</span>
+        <span class="sp1">{{$t('Number of Executors')}}</span>
         <span class="sp2">
           <x-input
                   :disabled="isDetails"
                   type="input"
                   v-model="numExecutors"
-                  :placeholder="$t('请输入Executor数量')"
+                  :placeholder="$t('Please enter the number of Executor')"
                   style="width: 200px;"
                   autocomplete="off">
         </x-input>
         </span>
-        <span class="sp1 sp3">{{$t('Executor内存数')}}</span>
+        <span class="sp1 sp3">{{$t('Executor memory')}}</span>
         <span class="sp2">
           <x-input
                   :disabled="isDetails"
                   type="input"
                   v-model="executorMemory"
-                  :placeholder="$t('请输入Executor内存数')"
+                  :placeholder="$t('Please enter the Executor memory')"
                   style="width: 186px;"
                   autocomplete="off">
         </x-input>
         </span>
       </div>
       <div class="clearfix list">
-        <span class="sp1">{{$t('Executor内核数')}}</span>
+        <span class="sp1">{{$t('Executor core number')}}</span>
         <span class="sp2">
           <x-input
                   :disabled="isDetails"
                   type="input"
                   v-model="executorCores"
-                  :placeholder="$t('请输入Executor内核数')"
+                  :placeholder="$t('Please enter Executor core number')"
                   style="width: 200px;"
                   autocomplete="off">
           </x-input>
@@ -120,32 +120,32 @@
       </div>
     </div>
     <m-list-box>
-      <div slot="text">{{$t('命令行参数')}}</div>
+      <div slot="text">{{$t('Command-line parameters')}}</div>
       <div slot="content">
         <x-input
                 :autosize="{minRows:2}"
                 :disabled="isDetails"
                 type="textarea"
                 v-model="mainArgs"
-                :placeholder="$t('请输入命令行参数')"
+                :placeholder="$t('Please enter Command-line parameters')"
                 autocomplete="off">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('其他参数')}}</div>
+      <div slot="text">{{$t('Other parameters')}}</div>
       <div slot="content">
         <x-input
                 :disabled="isDetails"
                 :autosize="{minRows:2}"
                 type="textarea"
                 v-model="others"
-                :placeholder="$t('请输入其他参数')">
+                :placeholder="$t('Please enter other parameters')">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('资源')}}</div>
+      <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
         <m-resources
                 ref="refResources"
@@ -155,7 +155,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('自定义参数')}}</div>
+      <div slot="text">{{$t('Custom Parameters')}}</div>
       <div slot="content">
         <m-local-params
                 ref="refLocalParams"
@@ -233,47 +233,47 @@
        */
       _verification () {
         if (this.programType !== 'PYTHON' && !this.mainClass) {
-          this.$message.warning(`${i18n.$t('请填写主函数的class')}`)
+          this.$message.warning(`${i18n.$t('Please enter main class')}`)
           return false
         }
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('请选择主jar包')}`)
+          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
           return false
         }
 
         if (!this.numExecutors) {
-          this.$message.warning(`${i18n.$t('请填写Executor数量')}`)
+          this.$message.warning(`${i18n.$t('Please enter the number of Executor')}`)
           return false
         }
 
         if (!Number.isInteger(parseInt(this.numExecutors))) {
-          this.$message.warning(`${i18n.$t('Executor数量为正整数')}`)
+          this.$message.warning(`${i18n.$t('The number of Executors should be a positive integer')}`)
           return false
         }
 
         if (!this.executorMemory) {
-          this.$message.warning(`${i18n.$t('请填写Executor内存数')}`)
+          this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`)
           return false
         }
 
         if (!this.executorMemory) {
-          this.$message.warning(`${i18n.$t('请填写Executor内存数')}`)
+          this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`)
           return false
         }
 
         if (!_.isNumber(parseInt(this.executorMemory))) {
-          this.$message.warning(`${i18n.$t('内存数为数字')}`)
+          this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
           return false
         }
 
         if (!this.executorCores) {
-          this.$message.warning(`${i18n.$t('请填写Executor内核数')}`)
+          this.$message.warning(`${i18n.$t('Please enter ExecutorPlease enter Executor core number')}`)
           return false
         }
 
         if (!Number.isInteger(parseInt(this.executorCores))) {
-          this.$message.warning(`${i18n.$t('内核数为正整数')}`)
+          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
           return false
         }
 

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="sql-model">
     <m-list-box>
-      <div slot="text">{{$t('数据源')}}</div>
+      <div slot="text">{{$t('Datasource')}}</div>
       <div slot="content">
         <m-datasource
                 ref="refDs"
@@ -11,7 +11,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('sql类型')}}</div>
+      <div slot="text">{{$t('SQL Type')}}</div>
       <div slot="content">
         <div style="display: inline-block;">
           <m-sql-type
@@ -21,26 +21,26 @@
         </div>
         <div v-if="!sqlType" style="display: inline-block;padding-left: 10px;margin-top: 2px;">
           <x-checkbox-group v-model="showType">
-            <x-checkbox :label="'TABLE'" :disabled="isDetails">{{$t('表格')}}</x-checkbox>
-            <x-checkbox :label="'ATTACHMENT'" :disabled="isDetails">{{$t('附件')}}</x-checkbox>
+            <x-checkbox :label="'TABLE'" :disabled="isDetails">{{$t('Table')}}</x-checkbox>
+            <x-checkbox :label="'ATTACHMENT'" :disabled="isDetails">{{$t('Attachment')}}</x-checkbox>
           </x-checkbox-group>
         </div>
       </div>
     </m-list-box>
     <m-list-box v-show="type === 'HIVE'">
-      <div slot="text">{{$t('sql参数')}}</div>
+      <div slot="text">{{$t('SQL Parameter')}}</div>
       <div slot="content">
         <x-input
                 :disabled="isDetails"
                 type="input"
                 v-model="connParams"
-                :placeholder="$t('请输入格式为') + ' key1=value1;key2=value2...'"
+                :placeholder="$t('Please enter format') + ' key1=value1;key2=value2...'"
                 autocomplete="off">
         </x-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('sql语句')}}</div>
+      <div slot="text">{{$t('SQL Statement')}}</div>
       <div slot="content">
         <div class="from-mirror">
           <textarea
@@ -52,7 +52,7 @@
       </div>
     </m-list-box>
     <m-list-box v-if="type === 'HIVE'">
-      <div slot="text">{{$t('UDF函数')}}</div>
+      <div slot="text">{{$t('UDF Function')}}</div>
       <div slot="content">
         <m-udfs
                 ref="refUdfs"
@@ -63,7 +63,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('自定义参数')}}</div>
+      <div slot="text">{{$t('Custom Parameters')}}</div>
       <div slot="content">
         <m-local-params
                 ref="refLocalParams"
@@ -146,7 +146,7 @@
        */
       _verification () {
         if (!editor.getValue()) {
-          this.$message.warning(`${i18n.$t('请输入sql语句(必填)')}`)
+          this.$message.warning(`${i18n.$t('Please enter a SQL Statement(required)')}`)
           return false
         }
 

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue

@@ -2,7 +2,7 @@
   <div class="sub_process-model">
     <div class="clearfix list">
       <div class="text-box">
-        <span>{{$t('子节点')}}</span>
+        <span>{{$t('Child Node')}}</span>
       </div>
       <div class="cont-box">
         <div class="label-box">
@@ -49,7 +49,7 @@
        */
       _verification () {
         if (!this.wdiCurr) {
-          this.$message.warning(`${i18n.$t('请选择子工作流')}`)
+          this.$message.warning(`${i18n.$t('Please select a sub-Process')}`)
           return false
         }
         this.$emit('on-params', {

escheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/jumpAffirm.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="affirm-model">
-    <m-popup :ok-text="$t('确认保存')"
-            :nameText="$t('是否保存DAG图')"
+    <m-popup :ok-text="$t('Save')"
+            :nameText="$t('Whether to save the DAG graph')"
             @close="_close"
             @ok="_ok">
     </m-popup>

escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

@@ -193,7 +193,7 @@ JSP.prototype.jsonHandle = function ({ largeJson, locations }) {
       targetarr: locations[v.id]['targetarr'],
       isAttachment: this.config.isAttachment,
       taskType: v.type,
-      runFlag:v.runFlag
+      runFlag: v.runFlag
     }))
 
     // contextmenu event
@@ -264,10 +264,10 @@ JSP.prototype.tasksContextmenu = function (event) {
     let isTwo = store.state.dag.isDetails
 
     let html = [
-      `<a href="javascript:" id="startRunning" class="${isOne ? '' : 'disbled'}"><i class="iconfont">&#xe60b;</i><span>${i18n.$t('开始运行')}</span></a>`,
-      `<a href="javascript:" id="editNodes" class="${isTwo ? 'disbled' : ''}"><i class="iconfont">&#xe601;</i><span>${i18n.$t('编辑节点')}</span></a>`,
-      `<a href="javascript:" id="copyNodes" class="${isTwo ? 'disbled' : ''}"><i class="iconfont">&#xe61e;</i><span>${i18n.$t('复制节点')}</span></a>`,
-      `<a href="javascript:" id="removeNodes" class="${isTwo ? 'disbled' : ''}"><i class="iconfont">&#xe611;</i><span>${i18n.$t('删除节点')}</span></a>`
+      `<a href="javascript:" id="startRunning" class="${isOne ? '' : 'disbled'}"><i class="iconfont">&#xe60b;</i><span>${i18n.$t('Start')}</span></a>`,
+      `<a href="javascript:" id="editNodes" class="${isTwo ? 'disbled' : ''}"><i class="iconfont">&#xe601;</i><span>${i18n.$t('Edit')}</span></a>`,
+      `<a href="javascript:" id="copyNodes" class="${isTwo ? 'disbled' : ''}"><i class="iconfont">&#xe61e;</i><span>${i18n.$t('Copy')}</span></a>`,
+      `<a href="javascript:" id="removeNodes" class="${isTwo ? 'disbled' : ''}"><i class="iconfont">&#xe611;</i><span>${i18n.$t('Delete')}</span></a>`
     ]
 
     let operationHtml = () => {

escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js

@@ -38,26 +38,26 @@ const saveTargetarr = (valId, domId) => {
 }
 
 const rtBantpl = () => {
-  return `<i class="iconfont" data-toggle="tooltip" data-html="true" data-container="body" data-placement="left" title="${i18n.$t('禁止执行')}">&#xe63e;</i>`
+  return `<i class="iconfont" data-toggle="tooltip" data-html="true" data-container="body" data-placement="left" title="${i18n.$t('Prohibition execution')}">&#xe63e;</i>`
 }
 
 /**
  * return node html
  */
-const rtTasksTpl = ({ id, name, x, y, targetarr, isAttachment, taskType,runFlag }) => {
+const rtTasksTpl = ({ id, name, x, y, targetarr, isAttachment, taskType, runFlag }) => {
   let tpl = ``
   tpl += `<div class="w jtk-draggable jtk-droppable jtk-endpoint-anchor jtk-connected ${isAttachment ? 'jtk-ep' : ''}" data-targetarr="${targetarr || ''}" data-tasks-type="${taskType}" id="${id}" style="left: ${x}px; top: ${y}px;">`
   tpl += `<div>`
-    tpl += `<div class="state-p"></div>`
-    tpl += `<div class="icos icos-${taskType}"></div>`
-    tpl += `<span class="name-p">${name}</span>`
+  tpl += `<div class="state-p"></div>`
+  tpl += `<div class="icos icos-${taskType}"></div>`
+  tpl += `<span class="name-p">${name}</span>`
   tpl += `</div>`
   tpl += `<div class="ep"></div>`
-    tpl += `<div class="ban-p">`
-    if (runFlag === 'FORBIDDEN') {
-      tpl += rtBantpl()
-    }
-    tpl += `</div>`
+  tpl += `<div class="ban-p">`
+  if (runFlag === 'FORBIDDEN') {
+    tpl += rtBantpl()
+  }
+  tpl += `</div>`
   tpl += `</div>`
 
   return tpl

escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@@ -2,14 +2,14 @@
   <div class="udp-model">
     <div class="scrollbar contpi-boxt">
       <div class="title">
-        <span>{{$t('设置DAG图名称')}}</span>
+        <span>{{$t('Set the DAG diagram name')}}</span>
       </div>
       <div>
         <x-input
                 type="text"
                 v-model="name"
                 :disabled="router.history.current.name === 'projects-instance-details'"
-                :placeholder="$t('请输入name(必填)')">
+                :placeholder="$t('Please enter name(required)')">
         </x-input>
       </div>
       <template v-if="router.history.current.name !== 'projects-instance-details'">
@@ -18,13 +18,13 @@
                   type="textarea"
                   v-model="desc"
                   :autosize="{minRows:2}"
-                  :placeholder="$t('请输入desc(选填)')"
+                  :placeholder="$t('Please enter description(optional)')"
                   autocomplete="off">
           </x-input>
         </div>
       </template>
       <div class="title" style="padding-top: 6px;">
-        <span>{{$t('设置全局')}}</span>
+        <span>{{$t('Set global')}}</span>
       </div>
       <div class="content">
         <div>
@@ -41,11 +41,11 @@
       <div class="submit">
         <template v-if="router.history.current.name === 'projects-instance-details'">
           <div class="lint-pt">
-            <x-checkbox v-model="syncDefine">{{$t('是否更新流程定义')}}</x-checkbox>
+            <x-checkbox v-model="syncDefine">{{$t('Whether to update the process definition')}}</x-checkbox>
           </div>
         </template>
-        <x-button type="text" @click="close()"> {{$t('取消')}} </x-button>
-        <x-button type="primary" shape="circle" @click="ok()" v-ps="['GENERAL_USER']" >{{$t('添加')}}</x-button>
+        <x-button type="text" @click="close()"> {{$t('Cancel')}} </x-button>
+        <x-button type="primary" shape="circle" @click="ok()" v-ps="['GENERAL_USER']" >{{$t('Add')}}</x-button>
       </div>
     </div>
   </div>
@@ -86,7 +86,7 @@
        */
       ok () {
         if (!this.name) {
-          this.$message.warning(`${i18n.$t('DAG图名称不能为空')}`)
+          this.$message.warning(`${i18n.$t('DAG graph name cannot be empty')}`)
           return
         }
 

escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="variable-model">
       <div class="list">
-        <div class="name"><i class="fa fa-code"></i><b style="padding-top: 3px;display: inline-block">{{$t('全局参数')}}</b></div>
+        <div class="name"><i class="fa fa-code"></i><b style="padding-top: 3px;display: inline-block">{{$t('Global parameters')}}</b></div>
         <div class="var-cont">
           <x-button size="xsmall" type="ghost" v-for="(item,$index) in list.globalParams"  @click="_copy('gbudp-' + $index)" :data-clipboard-text="item.prop + ' = ' +item.value" :class="'gbudp-' + $index"><b style="color: #2A455B;">{{item.prop}}</b> = {{item.value}}</x-button>
         </div>
       </div>
       <div class="list" style="height: 30px;">
-        <div class="name"><i class="fa fa-code"></i><b style="padding-top: 3px;display: inline-block">{{$t('局部参数')}}</b></div>
+        <div class="name"><i class="fa fa-code"></i><b style="padding-top: 3px;display: inline-block">{{$t('Local parameters')}}</b></div>
         <div class="var-cont">
           &nbsp;
         </div>
@@ -57,13 +57,13 @@
       _copy (className) {
         let clipboard = new Clipboard(`.${className}`)
         clipboard.on('success', e => {
-          this.$message.success(`${i18n.$t('复制成功')}`)
+          this.$message.success(`${i18n.$t('Copy success')}`)
           // Free memory
           clipboard.destroy()
         })
         clipboard.on('error', e => {
           // Copy is not supported
-          this.$message.warning(`${i18n.$t('该浏览器不支持自动复制')}`)
+          this.$message.warning(`${i18n.$t('The browser does not support automatic copying')}`)
           // Free memory
           clipboard.destroy()
         })

escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue

@@ -1,100 +1,103 @@
 <template>
   <div class="datasource-popup-model">
     <div class="top-p">
-      <span>{{item ? `${$t('编辑')}` : `${$t('创建')}`}}{{`${$t('数据源')}`}}</span>
+      <span>{{item ? `${$t('Edit')}` : `${$t('Create')}`}}{{`${$t('Datasource')}`}}</span>
     </div>
     <div class="content-p">
       <div class="create-datasource-model">
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('数据源')}}</template>
+          <template slot="name"><b>*</b>{{$t('Datasource')}}</template>
           <template slot="content">
             <x-radio-group v-model="type" size="small">
               <x-radio :label="'MYSQL'">MYSQL</x-radio>
               <x-radio :label="'POSTGRESQL'">POSTGRESQL</x-radio>
               <x-radio :label="'HIVE'">HIVE</x-radio>
               <x-radio :label="'SPARK'">SPARK</x-radio>
+              <x-radio :label="'CLICKHOUSE'">CLICKHOUSE</x-radio>
+              <x-radio :label="'ORACLE'">ORACLE</x-radio>
+              <x-radio :label="'SQLSERVER'">SQLSERVER</x-radio>
             </x-radio-group>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('数据源名称')}}</template>
+          <template slot="name"><b>*</b>{{$t('Datasource Name')}}</template>
           <template slot="content">
             <x-input
                     type="input"
                     v-model="name"
-                    :placeholder="$t('请输入数据源名称')"
+                    :placeholder="$t('Please enter datasource name')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name">{{$t('描述')}}</template>
+          <template slot="name">{{$t('Description')}}</template>
           <template slot="content">
             <x-input
                     type="textarea"
                     v-model="note"
-                    :placeholder="$t('请输入描述')"
+                    :placeholder="$t('Please enter description')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('IP主机名')}}</template>
+          <template slot="name"><b>*</b>{{$t('IP')}}</template>
           <template slot="content">
             <x-input
                     type="input"
                     v-model="host"
-                    :placeholder="$t('请输入IP主机名')"
+                    :placeholder="$t('Please enter IP')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('端口')}}</template>
+          <template slot="name"><b>*</b>{{$t('Port')}}</template>
           <template slot="content">
             <x-input
                     type="input"
                     v-model="port"
-                    :placeholder="$t('请输入端口')"
+                    :placeholder="$t('Please enter port')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('用户名')}}</template>
+          <template slot="name"><b>*</b>{{$t('User Name')}}</template>
           <template slot="content">
             <x-input
                     type="input"
                     v-model="userName"
-                    :placeholder="$t('请输入用户名')"
+                    :placeholder="$t('Please enter user name')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name">{{$t('密码')}}</template>
+          <template slot="name">{{$t('Password')}}</template>
           <template slot="content">
             <x-input
                     type="password"
                     v-model="password"
-                    :placeholder="$t('请输入密码')"
+                    :placeholder="$t('Please enter your password')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('数据库名')}}</template>
+          <template slot="name"><b>*</b>{{$t('Database Name')}}</template>
           <template slot="content">
             <x-input
                     type="input"
                     v-model="database"
-                    :placeholder="$t('请输入数据库名')"
+                    :placeholder="$t('Please enter database name')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name">{{$t('jdbc连接参数')}}</template>
+          <template slot="name">{{$t('jdbc connect parameters')}}</template>
           <template slot="content">
             <x-input
                     type="textarea"
@@ -108,9 +111,9 @@
       </div>
     </div>
     <div class="bottom-p">
-      <x-button type="text" @click="_close()"> {{$t('取消')}} </x-button>
-      <x-button type="success" shape="circle" @click="_testConnect()" :loading="testLoading">{{testLoading ? 'Loading...' : $t('测试连接')}}</x-button>
-      <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="_ok()">{{spinnerLoading ? 'Loading...' :item ? `${$t('确认编辑')}` : `${$t('确认提交')}`}} </x-button>
+      <x-button type="text" @click="_close()"> {{$t('Cancel')}} </x-button>
+      <x-button type="success" shape="circle" @click="_testConnect()" :loading="testLoading">{{testLoading ? 'Loading...' : $t('Test Connect')}}</x-button>
+      <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="_ok()">{{spinnerLoading ? 'Loading...' :item ? `${$t('Edit')}` : `${$t('Submit')}`}} </x-button>
     </div>
   </div>
 </template>
@@ -155,7 +158,7 @@
     },
     methods: {
       _rtOtherPlaceholder () {
-        return `${i18n.$t('请输入格式为')} {"key1":"value1","key2":"value2"...} ${i18n.$t('连接参数')}`
+        return `${i18n.$t('Please enter format')} {"key1":"value1","key2":"value2"...} ${i18n.$t('connection parameter')}`
       },
       /**
        * submit
@@ -228,29 +231,29 @@
        */
       _verification () {
         if (!this.name) {
-          this.$message.warning(`${i18n.$t('请输入资源名称')}`)
+          this.$message.warning(`${i18n.$t('Please enter resource name')}`)
           return false
         }
         if (!this.host) {
-          this.$message.warning(`${i18n.$t('请输入IP/主机名')}`)
+          this.$message.warning(`${i18n.$t('Please enter IP/hostname')}`)
           return false
         }
         if (!this.port) {
-          this.$message.warning(`${i18n.$t('请输入端口')}`)
+          this.$message.warning(`${i18n.$t('Please enter port')}`)
           return false
         }
         if (!this.userName) {
-          this.$message.warning(`${i18n.$t('请输入用户名')}`)
+          this.$message.warning(`${i18n.$t('Please enter user name')}`)
           return false
         }
 
         if (!this.database) {
-          this.$message.warning(`${i18n.$t('请输入数据库名')}`)
+          this.$message.warning(`${i18n.$t('Please enter database name')}`)
           return false
         }
         if (this.other) {
           if (!isJson(this.other)) {
-            this.$message.warning(`${i18n.$t('jdbc连接参数不是一个正确的JSON格式')}`)
+            this.$message.warning(`${i18n.$t('jdbc connection parameters is not a correct JSON format')}`)
             return false
           }
         }
@@ -330,8 +333,16 @@
       padding: 0 20px;
     }
     .content-p {
-      min-width: 500px;
+      min-width: 820px;
       min-height: 100px;
+      .list-box-f {
+        .text {
+          width: 166px;
+        }
+        .cont {
+          width: calc(100% - 186px);
+        }
+      }
     }
   }
 </style>

escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue

@@ -4,28 +4,28 @@
       <table class="fixed">
         <tr>
           <th>
-            <span>{{$t('编号')}}</span>
+            <span>{{$t('#')}}</span>
           </th>
           <th>
-            <span>{{$t('数据源名称')}}</span>
+            <span>{{$t('Datasource Name')}}</span>
           </th>
           <th width="120">
-            <span>{{$t('数据源类型')}}</span>
+            <span>{{$t('Datasource Type')}}</span>
           </th>
           <th width="100">
-            <span>{{$t('数据源参数')}}</span>
+            <span>{{$t('Datasource Parameter')}}</span>
           </th>
           <th>
-            <span>{{$t('描述')}}</span>
+            <span>{{$t('Description')}}</span>
           </th>
           <th width="150">
-            <span>{{$t('创建时间')}}</span>
+            <span>{{$t('Create Time')}}</span>
           </th>
           <th width="150">
-            <span>{{$t('更新时间')}}</span>
+            <span>{{$t('Update Time')}}</span>
           </th>
           <th width="80">
-            <span>{{$t('操作')}}</span>
+            <span>{{$t('Operation')}}</span>
           </th>
         </tr>
         <tr v-for="(item, $index) in list" :key="$index">
@@ -43,7 +43,7 @@
           <td>
             <m-tooltips-JSON :JSON="JSON.parse(item.connectionParams)" :id="item.id">
               <span slot="reference">
-                <a href="javascript:" class="links" style="font-size: 12px;">{{$t('点击查看')}}</a>
+                <a href="javascript:" class="links" style="font-size: 12px;">{{$t('Click to view')}}</a>
               </span>
             </m-tooltips-JSON>
           </td>
@@ -57,7 +57,7 @@
                     size="xsmall"
                     data-toggle="tooltip"
                     v-ps="['GENERAL_USER']"
-                    :title="$t('编辑')"
+                    :title="$t('Edit')"
                     icon="iconfont icon-bianjixiugai"
                     @click="_edit(item)">
             </x-button>
@@ -65,10 +65,10 @@
                     :ref="'poptip-delete-' + $index"
                     placement="bottom-end"
                     width="90">
-              <p>{{$t('确定删除吗?')}}</p>
+              <p>{{$t('Delete?')}}</p>
               <div style="text-align: right; margin: 0;padding-top: 4px;">
-                <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('取消')}}</x-button>
-                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('确定')}}</x-button>
+                <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
+                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
               </div>
               <template slot="reference">
                 <x-button
@@ -77,7 +77,7 @@
                         size="xsmall"
                         icon="iconfont icon-shanchu"
                         data-toggle="tooltip"
-                        :title="$t('删除')"
+                        :title="$t('delete')"
                         v-ps="['GENERAL_USER']">
                 </x-button>
               </template>

escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue

@@ -1,17 +1,17 @@
 <template>
-  <m-list-construction :title="$t('数据源中心')">
+  <m-list-construction :title="$t('Datasource')">
     <template slot="conditions">
       <m-conditions @on-conditions="_onConditions">
         <template slot="button-group">
-          <x-button type="ghost" size="small" @click="_create('')" v-ps="['GENERAL_USER']">{{$t('创建数据源')}}</x-button>
+          <x-button type="ghost" size="small" @click="_create('')" v-ps="['GENERAL_USER']">{{$t('Create Datasource')}}</x-button>
         </template>
       </m-conditions>
     </template>
     <template slot="content">
       <template v-if="datasourcesList.length">
-        <m-list :datasources-list="datasourcesList" :page-no="pageNo" :page-size="pageSize"></m-list>
+        <m-list :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
         <div class="page-box">
-          <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
         </div>
       </template>
       <template v-if="!datasourcesList.length">
@@ -23,11 +23,13 @@
   </m-list-construction>
 </template>
 <script>
+  import _ from 'lodash'
   import { mapActions } from 'vuex'
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
   import mNoData from '@/module/components/noData/noData'
   import mCreateDataSource from './_source/createDataSource'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
 
@@ -37,18 +39,21 @@
       return {
         // loading
         isLoading: true,
-        // Number of pages per page
-        pageSize: 10,
-        // Number of pages
-        pageNo: 1,
         // Total number of articles
         total: 20,
-        // Search value
-        searchVal: '',
         // data sources(List)
-        datasourcesList: []
+        datasourcesList: [],
+        searchParams: {
+          // Number of pages per page
+          pageSize: 10,
+          // Number of pages
+          pageNo: 1,
+          // Search value
+          searchVal: ''
+        }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {},
     methods: {
       ...mapActions('datasource', ['getDatasourcesListP']),
@@ -67,7 +72,7 @@
             return h(mCreateDataSource, {
               on: {
                 onUpdate () {
-                  self._getDatasourcesListP('false')
+                  self._debounceGET('false')
                   modal.remove()
                 },
                 close () {
@@ -85,27 +90,22 @@
        * page
        */
       _page (val) {
-        this.pageNo = val
-        this._getDatasourcesListP()
+        this.searchParams.pageNo = val
       },
       /**
        * conditions event
        */
       _onConditions (o) {
-        this.searchVal = o.searchVal
-        this.pageNo = 1
-        this._getDatasourcesListP('false')
+        this.searchParams = _.assign(this.searchParams, o)
+        this.searchParams.pageNo = 1
       },
       /**
        * get data(List)
        */
-      _getDatasourcesListP (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getDatasourcesListP({
-          pageSize: this.pageSize,
-          pageNo: this.pageNo,
-          searchVal: this.searchVal
-        }).then(res => {
+        this.getDatasourcesListP(this.searchParams).then(res => {
+          this.datasourcesList = []
           this.datasourcesList = res.totalList
           this.total = res.total
           this.isLoading = false
@@ -114,9 +114,14 @@
         })
       }
     },
-    watch: {},
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
     created () {
-      this._getDatasourcesListP()
     },
     mounted () {
     },

escheduler-ui/src/js/conf/home/pages/home/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <m-list-construction :title="$t('首页')">
+  <m-list-construction :title="$t('Home')">
     <template slot="content">
       <m-project-chart :id="0"></m-project-chart>
     </template>

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js

@@ -23,43 +23,43 @@ import i18n from '@/module/i18n'
 let stateType = [
   {
     code: '',
-    label: `${i18n.$t('无')}`
+    label: `${i18n.$t('none')}`
   }, {
     code: 'SUBMITTED_SUCCESS',
-    label: `${i18n.$t('提交成功')}`
+    label: `${i18n.$t('Submitted successfully')}`
   }, {
     code: 'RUNNING_EXEUTION',
-    label: `${i18n.$t('正在运行')}`
+    label: `${i18n.$t('Running')}`
   }, {
     code: 'READY_PAUSE',
-    label: `${i18n.$t('准备暂停')}`
+    label: `${i18n.$t('Ready to pause')}`
   }, {
     code: 'PAUSE',
-    label: `${i18n.$t('暂停')}`
+    label: `${i18n.$t('Pause')}`
   }, {
     code: 'READY_STOP',
-    label: `${i18n.$t('准备停止')}`
+    label: `${i18n.$t('Ready to stop')}`
   }, {
     code: 'STOP',
-    label: `${i18n.$t('停止')}`
+    label: `${i18n.$t('Stop')}`
   }, {
     code: 'FAILURE',
-    label: `${i18n.$t('失败')}`
+    label: `${i18n.$t('failed')}`
   }, {
     code: 'SUCCESS',
-    label: `${i18n.$t('成功')}`
+    label: `${i18n.$t('success')}`
   }, {
     code: 'NEED_FAULT_TOLERANCE',
-    label: `${i18n.$t('需要容错')}`
+    label: `${i18n.$t('Need fault tolerance')}`
   }, {
     code: 'KILL',
     label: `${i18n.$t('kill')}`
   }, {
     code: 'WAITTING_THREAD',
-    label: `${i18n.$t('等待线程')}`
+    label: `${i18n.$t('Waiting for thread')}`
   }, {
     code: 'WAITTING_DEPEND',
-    label: `${i18n.$t('等待依赖完成')}`
+    label: `${i18n.$t('Waiting for dependency to complete')}`
   }
 ]
 

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue

@@ -11,9 +11,9 @@
                 type="daterange"
                 format="YYYY-MM-DD HH:mm:ss"
                 placement="bottom-end"
-                v-model="datepicker"
+                :value="[searchParams.startDate,searchParams.endDate]"
                 :panelNum="2">
-          <x-input slot="input" readonly slot-scope="{value}" :value="value" style="width: 310px;" size="small" :placeholder="$t('按选择日期区间')">
+          <x-input slot="input" readonly slot-scope="{value}" :value="value" style="width: 310px;" size="small" :placeholder="$t('Select date range')">
             <i slot="suffix"
                @click.stop="_dateEmpty()"
                class="ans-icon-fail-solid"
@@ -24,8 +24,8 @@
         </x-datepicker>
       </div>
       <div class="list">
-        <x-select style="width: 160px;" @on-change="_onChangeState" :value="stateType" >
-          <x-input slot="trigger" readonly :value="selectedModel ? selectedModel.label : ''" slot-scope="{ selectedModel }" style="width: 160px;" size="small" :placeholder="$t('按状态')" suffix-icon="ans-icon-arrow-down">
+        <x-select style="width: 160px;" @on-change="_onChangeState" :value="searchParams.stateType" >
+          <x-input slot="trigger" readonly :value="selectedModel ? selectedModel.label : ''" slot-scope="{ selectedModel }" style="width: 160px;" size="small" :placeholder="$t('State')" suffix-icon="ans-icon-arrow-down">
           </x-input>
           <x-option
                   v-for="city in stateTypeList"
@@ -36,10 +36,10 @@
         </x-select>
       </div>
       <div class="list">
-        <x-input v-model="host" style="width: 140px;" size="small" :placeholder="$t('host')"></x-input>
+        <x-input v-model="searchParams.host" style="width: 140px;" size="small" :placeholder="$t('host')"></x-input>
       </div>
       <div class="list">
-        <x-input v-model="searchVal" style="width: 200px;" size="small" :placeholder="$t('按名称')"></x-input>
+        <x-input v-model="searchParams.searchVal" style="width: 200px;" size="small" :placeholder="$t('name')"></x-input>
       </div>
     </template>
   </m-conditions>
@@ -47,91 +47,60 @@
 <script>
   import _ from 'lodash'
   import { stateType } from './common'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import mConditions from '@/module/components/conditions/conditions'
   export default {
-    name: 'conditions',
+    name: 'instance-conditions',
     data () {
       return {
         // state(list)
         stateTypeList: stateType,
-        // state
-        stateType: '',
-        // start date
-        startDate: '',
-        // end date
-        endDate: '',
-        // search value
-        searchVal: '',
-        // host
-        host: '',
-        // datepicker plugin
-        datepicker: []
+        searchParams: {
+          // state
+          stateType: '',
+          // start date
+          startDate: '',
+          // end date
+          endDate: '',
+          // search value
+          searchVal: '',
+          // host
+          host: ''
+        }
       }
     },
     props: {},
     methods: {
       _ckQuery () {
-        setUrlParams({ pageNo: 1 })
-        this.$emit('on-query', {
-          startDate: this.startDate || '',
-          endDate: this.endDate || '',
-          stateType: this.stateType || '',
-          host: _.trim(this.host) || '',
-          searchVal: _.trim(this.searchVal) || ''
-        })
+        this.$emit('on-query', this.searchParams)
       },
       /**
        * change times
        */
       _onChangeStartStop (val) {
-        this.startDate = val[0]
-        this.endDate = val[1]
-        // set url params
-        setUrlParams({
-          startDate: this.startDate,
-          endDate: this.endDate
-        })
+        this.searchParams.startDate = val[0]
+        this.searchParams.endDate = val[1]
       },
       /**
        * change state
        */
       _onChangeState (val) {
-        this.stateType = val.value
-        // set url params
-        setUrlParams({
-          stateType: this.stateType
-        })
+        this.searchParams.stateType = val.value
       },
       /**
        * empty date
        */
       _dateEmpty () {
-        this.startDate = ''
-        this.endDate = ''
+        this.searchParams.startDate = ''
+        this.searchParams.endDate = ''
         this.$refs.datepicker.empty()
-        // set url params
-        setUrlParams({
-          startDate: '',
-          endDate: ''
-        })
       }
     },
     watch: {
-      searchVal (val) {
-        setUrlParams({
-          searchVal: _.trim(val)
-        })
-      }
     },
     created () {
-      let query = this.$route.query
-      if (!_.isEmpty(query)) {
-        this.searchVal = query.searchVal
-        this.startDate = query.startDate
-        this.endDate = query.endDate
-        this.stateType = query.stateType
-        this.datepicker = (!this.startDate && !this.endDate) ? [] : [this.startDate, this.endDate]
+      // Routing parameter merging
+      if (!_.isEmpty(this.$route.query)) {
+        this.searchParams = _.assign(this.searchParams, this.$route.query)
       }
     },
     mounted () {

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue

@@ -0,0 +1,141 @@
+<template>
+  <m-conditions>
+    <template slot="search-group">
+      <div class="list">
+        <x-button type="ghost" size="small" @click="_ckQuery" icon="fa fa-search"></x-button>
+      </div>
+      <div class="list">
+        <x-datepicker
+                :value="[searchParams.startDate,searchParams.endDate]"
+                ref="datepicker"
+                @on-change="_onChangeStartStop"
+                type="daterange"
+                format="YYYY-MM-DD HH:mm:ss"
+                placement="bottom-end"
+                :panelNum="2">
+          <x-input slot="input" readonly slot-scope="{value}" :value="value" style="width: 310px;" size="small" :placeholder="$t('Select date range')">
+            <i slot="suffix"
+               @click.stop="_dateEmpty()"
+               class="ans-icon-fail-solid"
+               v-show="value"
+               style="font-size: 13px;cursor: pointer;margin-top: 1px;">
+            </i>
+          </x-input>
+        </x-datepicker>
+      </div>
+      <div class="list">
+        <x-input v-model="searchParams.destTable" style="width: 120px;" size="small" :placeholder="$t('Target Table')"></x-input>
+      </div>
+      <div class="list">
+        <x-input v-model="searchParams.sourceTable" style="width: 120px;" size="small" :placeholder="$t('Source Table')"></x-input>
+      </div>
+      <div class="list">
+        <x-select style="width: 90px;" @on-change="_onChangeState" :value="searchParams.state">
+          <x-input slot="trigger" readonly :value="selectedModel ? selectedModel.label : ''" slot-scope="{ selectedModel }" style="width: 90px;" size="small" :placeholder="$t('State')" suffix-icon="ans-icon-arrow-down"></x-input>
+          <x-option
+                  v-for="city in stateList"
+                  :key="city.label"
+                  :value="city.code"
+                  :label="city.label">
+          </x-option>
+        </x-select>
+      </div>
+      <div class="list">
+        <x-datepicker
+                v-model="searchParams.taskDate"
+                @on-change="_onChangeDate"
+                format="YYYY-MM-DD"
+                :panelNum="1">
+          <x-input slot="input" readonly slot-scope="{value}" style="width: 130px;" :value="value" size="small" :placeholder="$t('Date')"></x-input>
+        </x-datepicker>
+      </div>
+      <div class="list">
+        <x-input v-model="searchParams.taskName" style="width: 130px;" size="small" :placeholder="$t('Task Name')"></x-input>
+      </div>
+    </template>
+  </m-conditions>
+</template>
+<script>
+  import _ from 'lodash'
+  import mConditions from '@/module/components/conditions/conditions'
+  export default {
+    name: 'conditions',
+    data () {
+      return {
+        stateList: [
+          {
+            label: `${this.$t('none')}`,
+            code: ``
+          },
+          {
+            label: `${this.$t('success')}`,
+            code: `成功`
+          },
+          {
+            label: `${this.$t('waiting')}`,
+            code: `等待`
+          },
+          {
+            label: `${this.$t('execution')}`,
+            code: `执行中`
+          },
+          {
+            label: `${this.$t('finish')}`,
+            code: `完成`
+          }, {
+            label: `${this.$t('failed')}`,
+            code: `失败`
+          }
+        ],
+        searchParams: {
+          taskName: '',
+          state: '',
+          sourceTable: '',
+          destTable: '',
+          taskDate: '',
+          startDate: '',
+          endDate: ''
+        }
+      }
+    },
+    props: {},
+    methods: {
+      _ckQuery () {
+        this.$emit('on-query', this.searchParams)
+      },
+      /**
+       * change times
+       */
+      _onChangeStartStop (val) {
+        this.searchParams.startDate = val[0]
+        this.searchParams.endDate = val[1]
+      },
+      /**
+       * change state
+       */
+      _onChangeState (val) {
+        this.searchParams.state = val.value
+      },
+      /**
+       * empty date
+       */
+      _dateEmpty () {
+        this.searchParams.startDate = ''
+        this.searchParams.endDate = ''
+        this.$refs.datepicker.empty()
+      },
+      _onChangeDate (val) {
+        this.searchParams.taskDate = val.replace(/-/g, '')
+      }
+    },
+    created () {
+      // Routing parameter merging
+      if (!_.isEmpty(this.$route.query)) {
+        this.searchParams = _.assign(this.searchParams, this.$route.query)
+      }
+    },
+    mounted () {
+    },
+    components: { mConditions }
+  }
+</script>

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue

@@ -4,37 +4,37 @@
       <table class="fixed">
         <tr>
           <th>
-            <span>{{$t('编号')}}</span>
+            <span>{{$t('#')}}</span>
           </th>
           <th>
-            <span>{{$t('任务名称')}}</span>
+            <span>{{$t('Task Name')}}</span>
           </th>
           <th width="66">
-            <span>{{$t('任务日期')}}</span>
+            <span>{{$t('Task Date')}}</span>
           </th>
           <th width="150">
-            <span>{{$t('开始时间')}}</span>
+            <span>{{$t('Start Time')}}</span>
           </th>
           <th width="150">
-            <span>{{$t('结束时间')}}</span>
+            <span>{{$t('End Time')}}</span>
           </th>
           <th width="134">
-            <span>{{$t('运行时长')}}({{$t('秒')}})</span>
+            <span>{{$t('Duration')}}(s)</span>
           </th>
           <th>
-            <span>{{$t('源表')}}</span>
+            <span>{{$t('Source Table')}}</span>
           </th>
           <th width="100">
-            <span>{{$t('记录数')}}</span>
+            <span>{{$t('Record Number')}}</span>
           </th>
           <th>
-            <span>{{$t('目标表')}}</span>
+            <span>{{$t('Target Table')}}</span>
           </th>
           <th width="100">
-            <span>{{$t('记录数')}}</span>
+            <span>{{$t('Record Number')}}</span>
           </th>
           <th width="88">
-            <span>{{$t('状态')}}</span>
+            <span>{{$t('State')}}</span>
           </th>
         </tr>
         <tr v-for="(item, $index) in list" :key="item.id">
@@ -45,8 +45,14 @@
             <span class="ellipsis"  data-toggle="tooltip" data-container="body" :title="_rtTooltip(item.procName)" data-html="true">{{item.procName}}</span>
           </td>
           <td><span>{{item.procDate}}</span></td>
-          <td><span>{{item.startTime | formatDate}}</span></td>
-          <td><span>{{item.endTime | formatDate}}</span></td>
+          <td>
+            <span v-if="item.startTime">{{item.startTime | formatDate}}</span>
+            <span v-else>-</span>
+          </td>
+          <td>
+            <span v-if="item.endTime">{{item.endTime | formatDate}}</span>
+            <span v-else>-</span>
+          </td>
           <td><span>{{item.duration}}</span></td>
           <td><span class="ellipsis" data-toggle="tooltip" data-container="body" :title="_rtTooltip(item.sourceTab)" data-html="true">{{item.sourceTab}}</span></td>
           <td>

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="main-layout-box">
+    <m-secondary-menu :type="'projects'"></m-secondary-menu>
+    <m-list-construction :title="config.title">
+      <template slot="conditions">
+        <m-conditions @on-query="_onQuery"></m-conditions>
+      </template>
+      <template slot="content">
+        <template v-if="taskRecordList.length">
+          <m-list :task-record-list="taskRecordList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
+          </m-list>
+          <div class="page-box">
+            <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page"></x-page>
+          </div>
+        </template>
+        <template v-if="!taskRecordList.length">
+          <m-no-data></m-no-data>
+        </template>
+        <m-spin :is-spin="isLoading"></m-spin>
+      </template>
+    </m-list-construction>
+  </div>
+</template>
+<script>
+  import _ from 'lodash'
+  import mList from './_source/list'
+  import store from '@/conf/home/store'
+  import mConditions from './_source/conditions'
+  import mSpin from '@/module/components/spin/spin'
+  import mNoData from '@/module/components/noData/noData'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
+  import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
+  import mListConstruction from '@/module/components/listConstruction/listConstruction'
+
+  export default {
+    name: 'task-record-list',
+    data () {
+      return {
+        store,
+        total: null,
+        taskRecordList: [],
+        isLoading: true,
+        searchParams: {
+          taskName: '',
+          state: '',
+          sourceTable: '',
+          destTable: '',
+          taskDate: '',
+          startDate: '',
+          endDate: '',
+          pageSize: 10,
+          pageNo: 1
+        }
+      }
+    },
+    mixins: [listUrlParamHandle],
+    props: {
+      config: String
+    },
+    methods: {
+      _onQuery (o) {
+        this.searchParams = _.assign(this.searchParams, o)
+        this.searchParams.pageNo = 1
+      },
+      _page (val) {
+        this.searchParams.pageNo = val
+      },
+      /**
+       * get list data
+       */
+      _getList (flag) {
+        this.isLoading = !flag
+        this.store.dispatch(`dag/${this.config.apiFn}`, this.searchParams).then(res => {
+          this.taskRecordList = []
+          this.taskRecordList = res.totalList
+          this.total = res.total
+          this.isLoading = false
+        }).catch(e => {
+          this.isLoading = false
+        })
+      },
+      _onUpdate () {
+        this._debounceGET()
+      }
+    },
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        if (_.isEmpty(a.query)) {
+          this.searchParams.processInstanceId = ''
+        }
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
+    created () {
+    },
+    mounted () {
+    },
+    components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
+  }
+</script>

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue

@@ -30,7 +30,7 @@
                   :style="{width:emailWidth + 'px'}"
                   type="text"
                   v-model="email"
-                  :placeholder="$t('请输入邮箱')"
+                  :placeholder="$t('Please enter email')"
                   @keydown.tab="_emailTab"
                   @keyup.delete="_emailDelete"
                   @keyup.enter="_emailEnter"
@@ -87,10 +87,10 @@
             this.email = ''
             this._handlerEmailWitch()
           } else {
-            this.$message.warning(`${i18n.$t('邮箱已存在！收件人和抄送人不能重复')}`)
+            this.$message.warning(`${i18n.$t('Mailbox already exists! Recipients and copyers cannot repeat')}`)
           }
         } else {
-          this.$message.warning(`${i18n.$t('邮箱输入不合法')}`)
+          this.$message.warning(`${i18n.$t('Mailbox input is illegal')}`)
         }
       },
       /**
@@ -191,7 +191,7 @@
 
         // Non-existing data
         if (_.filter(_.cloneDeep(this.repeatData).concat(_.cloneDeep(this.activeList)), v => v === item).length) {
-          this.$message.warning(`${i18n.$t('邮箱已存在！收件人和抄送人不能重复')}`)
+          this.$message.warning(`${i18n.$t('Mailbox already exists! Recipients and copyers cannot repeat')}`)
           return
         }
         // Width initialization

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

@@ -4,28 +4,28 @@
       <table class="fixed">
         <tr>
           <th>
-            <span>{{$t('编号')}}</span>
+            <span>{{$t('#')}}</span>
           </th>
           <th>
-            <span>{{$t('工作流名称')}}</span>
+            <span>{{$t('Process Name')}}</span>
           </th>
           <th width="50">
-            <span>{{$t('状态')}}</span>
+            <span>{{$t('State')}}</span>
           </th>
           <th width="140">
-            <span>{{$t('创建时间')}}</span>
+            <span>{{$t('Create Time')}}</span>
           </th>
           <th width="140">
-            <span>{{$t('更新时间')}}</span>
+            <span>{{$t('Update Time')}}</span>
           </th>
           <th>
-            <span>{{$t('描述')}}</span>
+            <span>{{$t('Description')}}</span>
           </th>
           <th width="90">
-            <span>{{$t('定时状态')}}</span>
+            <span>{{$t('Timing state')}}</span>
           </th>
           <th width="220">
-            <span>{{$t('操作')}}</span>
+            <span>{{$t('Operation')}}</span>
           </th>
         </tr>
         <tr v-for="(item, $index) in list" :key="item.id">
@@ -49,18 +49,18 @@
           </td>
           <td><span class="ellipsis">{{item.desc}}</span></td>
           <td>
-            <span v-if="item.scheduleReleaseState === 'OFFLINE'">{{$t('下线')}}</span>
-            <span v-if="item.scheduleReleaseState === 'ONLINE'">{{$t('上线')}}</span>
+            <span v-if="item.scheduleReleaseState === 'OFFLINE'">{{$t('offline')}}</span>
+            <span v-if="item.scheduleReleaseState === 'ONLINE'">{{$t('online')}}</span>
             <span v-if="!item.scheduleReleaseState">-</span>
           </td>
           <td>
-            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('编辑')" @click="_edit(item)" :disabled="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-bianji"><!--{{$t('编辑')}}--></x-button>
-            <x-button type="success" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('启动')" @click="_start(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-qidong"><!--{{$t('启动')}}--></x-button>
-            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('定时')" @click="_timing(item)" :disabled="item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null" v-ps="['GENERAL_USER']" icon="iconfont icon-timer"><!--{{$t('定时')}}--></x-button>
-            <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('下线')" @click="_downline(item)" v-if="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu"><!--{{$t('下线')}}--></x-button>
-            <x-button type="warning" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('上线')" @click="_poponline(item)" v-if="item.releaseState === 'OFFLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu-copy"><!--{{$t('上线')}}--></x-button>
-            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('定时管理')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-paibanguanli"><!--{{$t('定时管理')}}--></x-button>
-            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('树形图')" @click="_treeView(item)"  icon="iconfont icon-juxingkaobei"><!--{{$t('树形图')}}--></x-button>
+            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Edit')" @click="_edit(item)" :disabled="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-bianji"><!--{{$t('编辑')}}--></x-button>
+            <x-button type="success" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Start')" @click="_start(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-qidong"><!--{{$t('启动')}}--></x-button>
+            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Timing')" @click="_timing(item)" :disabled="item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null" v-ps="['GENERAL_USER']" icon="iconfont icon-timer"><!--{{$t('定时')}}--></x-button>
+            <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('offline')" @click="_downline(item)" v-if="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu"><!--{{$t('下线')}}--></x-button>
+            <x-button type="warning" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('online')" @click="_poponline(item)" v-if="item.releaseState === 'OFFLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu-copy"><!--{{$t('上线')}}--></x-button>
+            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Cron Manage')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-paibanguanli"><!--{{$t('定时管理')}}--></x-button>
+            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('TreeView')" @click="_treeView(item)"  icon="iconfont icon-juxingkaobei"><!--{{$t('树形图')}}--></x-button>
           </td>
         </tr>
       </table>

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue

@@ -1,34 +1,34 @@
 <template>
   <div class="start-process-model">
     <div class="title-box">
-      <span>{{$t('启动前请先设置参数')}}</span>
+      <span>{{$t('Please set the parameters before starting')}}</span>
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('失败策略')}}
+        {{$t('Failure Strategy')}}
       </div>
       <div class="cont">
         <x-radio-group v-model="failureStrategy" style="margin-top: 7px;">
-          <x-radio :label="'CONTINUE'">{{$t('继续')}}</x-radio>
-          <x-radio :label="'END'">{{$t('结束')}}</x-radio>
+          <x-radio :label="'CONTINUE'">{{$t('Continue')}}</x-radio>
+          <x-radio :label="'END'">{{$t('End')}}</x-radio>
         </x-radio-group>
       </div>
     </div>
     <div class="clearfix list" v-if="sourceType === 'contextmenu'">
       <div class="text">
-        {{$t('节点执行')}}
+        {{$t('Node execution')}}
       </div>
       <div class="cont">
         <x-radio-group v-model="taskDependType">
-          <x-radio :label="'TASK_POST'">{{$t('向后执行')}}</x-radio>
-          <x-radio :label="'TASK_PRE'">{{$t('向前执行')}}</x-radio>
-          <x-radio :label="'TASK_ONLY'">{{$t('仅执行当前节点')}}</x-radio>
+          <x-radio :label="'TASK_POST'">{{$t('Backward execution')}}</x-radio>
+          <x-radio :label="'TASK_PRE'">{{$t('Forward execution')}}</x-radio>
+          <x-radio :label="'TASK_ONLY'">{{$t('Execute only the current node')}}</x-radio>
         </x-radio-group>
       </div>
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('通知策略')}}
+        {{$t('Notification strategy')}}
       </div>
       <div class="cont">
         <x-select style="width: 200px;" v-model="warningType">
@@ -43,7 +43,7 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('流程优先级')}}
+        {{$t('Process priority')}}
       </div>
       <div class="cont">
         <m-priority v-model="processInstancePriority"></m-priority>
@@ -51,14 +51,14 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('通知组')}}
+        {{$t('Notification group')}}
       </div>
       <div class="cont">
         <x-select
                 style="width: 200px;"
                 v-model="warningGroupId"
                 :disabled="!notifyGroupList.length">
-          <x-input slot="trigger" slot-scope="{ selectedModel }" readonly :placeholder="$t('请选择通知组')" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
+          <x-input slot="trigger" slot-scope="{ selectedModel }" readonly :placeholder="$t('Please select a notification group')" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
             <i slot="suffix" class="fa fa-times-circle" style="font-size: 15px;cursor: pointer;" v-show="warningGroupId.id"></i>
             <i slot="suffix" class="ans-icon-arrow-down" style="font-size: 12px;" v-show="!warningGroupId.id"></i>
           </x-input>
@@ -73,7 +73,7 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('收件人')}}
+        {{$t('Recipient')}}
       </div>
       <div class="cont">
         <m-email v-model="receivers" :repeat-data="receiversCc"></m-email>
@@ -81,7 +81,7 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('抄送人')}}
+        {{$t('Cc')}}
       </div>
       <div class="cont">
         <m-email v-model="receiversCc" :repeat-data="receivers"></m-email>
@@ -89,29 +89,29 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('补数')}}
+        {{$t('Complement Data')}}
       </div>
       <div class="cont">
         <div style="padding-top: 6px;">
-          <x-checkbox v-model="execType">{{$t('是否补数')}}</x-checkbox>
+          <x-checkbox v-model="execType">{{$t('Whether it is a complement process?')}}</x-checkbox>
         </div>
       </div>
     </div>
     <template v-if="execType">
       <div class="clearfix list" style="margin:-6px 0 16px 0">
         <div class="text">
-          {{$t('执行方式')}}
+          {{$t('Mode of execution')}}
         </div>
         <div class="cont">
           <x-radio-group v-model="runMode" style="margin-top: 7px;">
-            <x-radio :label="'RUN_MODE_SERIAL'">{{$t('串行执行')}}</x-radio>
-            <x-radio :label="'RUN_MODE_PARALLEL'">{{$t('并行执行')}}</x-radio>
+            <x-radio :label="'RUN_MODE_SERIAL'">{{$t('Serial execution')}}</x-radio>
+            <x-radio :label="'RUN_MODE_PARALLEL'">{{$t('Parallel execution')}}</x-radio>
           </x-radio-group>
         </div>
       </div>
       <div class="clearfix list">
         <div class="text">
-          {{$t('时间')}}
+          {{$t('Date')}}
         </div>
         <div class="cont">
           <x-datepicker
@@ -121,15 +121,15 @@
                   @on-change="_datepicker"
                   :value="scheduleTime"
                   type="daterange"
-                  :placeholder="$t('选择日期区间')"
+                  :placeholder="$t('Select date range')"
                   format="YYYY-MM-DD HH:mm:ss">
           </x-datepicker>
         </div>
       </div>
     </template>
     <div class="submit">
-      <x-button type="text" @click="close()"> {{$t('取消')}} </x-button>
-      <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="ok()" v-ps="['GENERAL_USER']">{{spinnerLoading ? 'Loading...' : $t('启动')}} </x-button>
+      <x-button type="text" @click="close()"> {{$t('Cancel')}} </x-button>
+      <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="ok()" v-ps="['GENERAL_USER']">{{spinnerLoading ? 'Loading...' : $t('Start')}} </x-button>
     </div>
   </div>
 </template>

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="timing-process-model">
     <div class="title-box">
-      <span>{{$t('定时前请先设置参数')}}</span>
+      <span>{{$t('Set parameters before timing')}}</span>
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('起止时间')}}
+        {{$t('Start and stop time')}}
       </div>
       <div class="cont">
         <x-datepicker
@@ -15,14 +15,14 @@
                 @on-change="_datepicker"
                 :value="scheduleTime"
                 type="daterange"
-                :placeholder="$t('选择日期区间')"
+                :placeholder="$t('Select date range')"
                 format="YYYY-MM-DD HH:mm:ss">
         </x-datepicker>
       </div>
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('定时')}}
+        {{$t('Timing')}}
       </div>
       <div class="cont">
         <template>
@@ -45,18 +45,18 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('失败策略')}}
+        {{$t('Failure Strategy')}}
       </div>
       <div class="cont">
         <x-radio-group v-model="failureStrategy" style="margin-top: 7px;">
-          <x-radio :label="'CONTINUE'">{{$t('继续')}}</x-radio>
-          <x-radio :label="'END'">{{$t('结束')}}</x-radio>
+          <x-radio :label="'CONTINUE'">{{$t('Continue')}}</x-radio>
+          <x-radio :label="'END'">{{$t('End')}}</x-radio>
         </x-radio-group>
       </div>
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('通知策略')}}
+        {{$t('Notification strategy')}}
       </div>
       <div class="cont">
         <x-select
@@ -73,7 +73,7 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('流程优先级')}}
+        {{$t('Process priority')}}
       </div>
       <div class="cont">
         <m-priority v-model="processInstancePriority"></m-priority>
@@ -81,14 +81,14 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('通知组')}}
+        {{$t('Notification group')}}
       </div>
       <div class="cont">
         <x-select
                 style="width: 200px;"
                 :disabled="!notifyGroupList.length"
                 v-model="warningGroupId">
-          <x-input slot="trigger" readonly slot-scope="{ selectedModel }" :placeholder="$t('请选择通知组')" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
+          <x-input slot="trigger" readonly slot-scope="{ selectedModel }" :placeholder="$t('Please select a notification group')" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
             <i slot="suffix" class="fa fa-times-circle" style="font-size: 15px;cursor: pointer;" v-show="warningGroupId.id"></i>
             <i slot="suffix" class="ans-icon-arrow-down" style="font-size: 12px;" v-show="!warningGroupId.id"></i>
           </x-input>
@@ -103,7 +103,7 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('收件人')}}
+        {{$t('Recipient')}}
       </div>
       <div class="cont" style="width: 680px;">
         <m-email v-model="receivers" :repeat-data="receiversCc"></m-email>
@@ -111,15 +111,15 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('抄送人')}}
+        {{$t('Cc')}}
       </div>
       <div class="cont" style="width: 680px;">
         <m-email v-model="receiversCc" :repeat-data="receivers"></m-email>
       </div>
     </div>
     <div class="submit">
-      <x-button type="text" @click="close()"> {{$t('取消')}} </x-button>
-      <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="ok()" v-ps="['GENERAL_USER']">{{spinnerLoading ? 'Loading...' : (item.crontab ? $t('编辑') : $t('创建'))}} </x-button>
+      <x-button type="text" @click="close()"> {{$t('Cancel')}} </x-button>
+      <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="ok()" v-ps="['GENERAL_USER']">{{spinnerLoading ? 'Loading...' : (item.crontab ? $t('Edit') : $t('Create'))}} </x-button>
     </div>
   </div>
 </template>
@@ -166,12 +166,12 @@
       },
       _verification () {
         if (!this.scheduleTime) {
-          this.$message.warning(`${i18n.$t('请选择时间')}`)
+          this.$message.warning(`${i18n.$t('Please select time')}`)
           return false
         }
 
         if (!this.crontab) {
-          this.$message.warning(`${i18n.$t('请填写 crontab')}`)
+          this.$message.warning(`${i18n.$t('Please enter crontab')}`)
           return false
         }
         return true
@@ -192,18 +192,21 @@
             receivers: this.receivers.join(',') || '',
             receiversCc: this.receiversCc.join(',') || ''
           }
+          let msg = ''
 
           // edit
           if (this.item.crontab) {
             api = 'dag/updateSchedule'
             searchParams.id = this.item.id
+            msg = `${i18n.$t('Edit')}${i18n.$t('success')},${i18n.$t('Please go online')}`
           } else {
             api = 'dag/createSchedule'
             searchParams.processDefinitionId = this.item.id
+            msg = `${i18n.$t('Create')}${i18n.$t('success')}`
           }
 
           this.store.dispatch(api, searchParams).then(res => {
-            this.$message.success(res.msg)
+            this.$message.success(msg)
             this.$emit('onUpdate')
           }).catch(e => {
             this.$message.error(e.msg || '')

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js

@@ -20,19 +20,19 @@ import i18n from '@/module/i18n'
 let warningTypeList = [
   {
     id: 'NONE',
-    code: `${i18n.$t('都不发')}`
+    code: `${i18n.$t('none_1')}`
   },
   {
     id: 'SUCCESS',
-    code: `${i18n.$t('成功发')}`
+    code: `${i18n.$t('success_1')}`
   },
   {
     id: 'FAILURE',
-    code: `${i18n.$t('失败发')}`
+    code: `${i18n.$t('failure_1')}`
   },
   {
     id: 'ALL',
-    code: `${i18n.$t('成功或失败都发')}`
+    code: `${i18n.$t('All_1')}`
   }
 ]
 

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'projects'"></m-secondary-menu>
-    <m-list-construction :title="$t('工作流定义')">
+    <m-list-construction :title="$t('Process definition')">
       <template slot="conditions">
         <m-conditions @on-conditions="_onConditions">
           <template slot="button-group">
-            <x-button type="ghost" size="small"  v-ps="['GENERAL_USER']" @click="() => this.$router.push({name: 'definition-create'})">{{$t('创建工作流')}}</x-button>
+            <x-button type="ghost" size="small"  v-ps="['GENERAL_USER']" @click="() => this.$router.push({name: 'definition-create'})">{{$t('Create process')}}</x-button>
           </template>
         </m-conditions>
       </template>
@@ -30,8 +30,8 @@
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
   import localStore from '@/module/util/localStorage'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import mNoData from '@/module/components/noData/noData'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -44,15 +44,14 @@
         processListP: [],
         isLoading: true,
         searchParams: {
-          // 分页条数
           pageSize: 10,
-          // 分页
           pageNo: 1,
-          // 查询名称
-          searchVal: ''
+          searchVal: '',
+          userId: ''
         }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {
     },
     methods: {
@@ -62,10 +61,6 @@
        */
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams({
-          pageNo: this.searchParams.pageNo
-        })
-        this._debounceGET()
       },
       /**
        * conditions
@@ -73,23 +68,13 @@
       _onConditions (o) {
         this.searchParams.searchVal = o.searchVal
         this.searchParams.pageNo = 1
-        setUrlParams({
-          pageNo: this.searchParams.pageNo
-        })
-        this._debounceGET()
       },
       /**
        * get data list
        */
-      _getProcessListP (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getProcessListP({
-          pageSize: this.searchParams.pageSize,
-          pageNo: this.searchParams.pageNo,
-          searchVal: this.searchParams.searchVal,
-          userId: this.$route.query.userId || ''
-        }).then(res => {
-          setUrlParams({ pageNo: this.pageNo })
+        this.getProcessListP(this.searchParams).then(res => {
           this.processListP = []
           this.processListP = res.totalList
           this.total = res.total
@@ -100,48 +85,20 @@
       },
       _onUpdate () {
         this._debounceGET('false')
-      },
-      /**
-       * Anti-shake request interface
-       * @desc Prevent function from being called multiple times
-       */
-      _debounceGET: _.debounce(function (flag) {
-        this._getProcessListP(flag)
-      }, 100, {
-        'leading': false,
-        'trailing': true
-      })
+      }
     },
     watch: {
       '$route' (a) {
         // url no params get instance list
-        if (_.isEmpty(a.query)) {
-          this.searchParams.pageNo = 1
-        } else {
-          this.searchParams.pageNo = a.query.pageNo || 1
-        }
-      },
-      'searchParams': {
-        deep: true,
-        handler () {
-          this._debounceGET()
-        }
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
       }
     },
     created () {
       localStore.removeItem('subProcessId')
-
-      // Routing parameter merging
-      if (!_.isEmpty(this.$route.query)) {
-        this.searchParams = _.assign(this.searchParams, this.$route.query)
-      }
     },
     mounted () {
-      this._debounceGET()
     },
     components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
   }
 </script>
 
-<style lang="scss" rel="stylesheet/scss">
-</style>

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'projects'"></m-secondary-menu>
-    <m-list-construction :title="$t('树形图')">
+    <m-list-construction :title="$t('TreeView')">
       <template slot="conditions"></template>
       <template slot="content">
         <div class="tree-view-index-model">
@@ -20,13 +20,13 @@
                     type="primary"
                     size="default"
                     icon="fa fa-reply">
-              返回上一节点
+              {{$t('Return_1')}}
             </x-button>
           </div>
           <div class="tasks-color">
             <div class="toolbar-color-sp">
               <a href="javascript:">
-                <span>节点类型</span>
+                <span>Node Type</span>
               </a>
               <a href="javascript:" v-for="(k,v) in tasksType">
                 <i class="fa fa-circle" :style="{color:k.color}"></i>
@@ -35,7 +35,7 @@
             </div>
             <div class="state-tasks-color-sp">
               <a href="javascript:">
-                <span>任务状态</span>
+                <span>{{$t('Task Status')}}</span>
               </a>
               <a href="javascript:" v-for="(item) in tasksState">
                 <i class="fa fa-square" :style="{color:item.color}"></i>

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue

@@ -9,34 +9,34 @@
           <table>
             <tr>
               <th>
-                <span>{{$t('编号')}}</span>
+                <span>{{$t('#')}}</span>
               </th>
               <th>
-                <span>{{$t('流程名称')}}</span>
+                <span>{{$t('Process Name')}}</span>
               </th>
               <th>
-                <span>{{$t('开始时间')}}</span>
+                <span>{{$t('Start Time')}}</span>
               </th>
               <th>
-                <span>{{$t('结束时间')}}</span>
+                <span>{{$t('End Time')}}</span>
               </th>
               <th>
                 <span>{{$t('crontab')}}</span>
               </th>
               <th>
-                <span>{{$t('失败策略')}}</span>
+                <span>{{$t('Failure Strategy')}}</span>
               </th>
               <th>
-                <span>{{$t('状态')}}</span>
+                <span>{{$t('State')}}</span>
               </th>
               <th>
-                <span>{{$t('创建时间')}}</span>
+                <span>{{$t('Create Time')}}</span>
               </th>
               <th>
-                <span>{{$t('更新时间')}}</span>
+                <span>{{$t('Update Time')}}</span>
               </th>
               <th width="80">
-                <span>{{$t('操作')}}</span>
+                <span>{{$t('Operation')}}</span>
               </th>
             </tr>
             <tr v-for="(item, $index) in list" :key="item.id">
@@ -73,7 +73,7 @@
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('编辑')"
+                        :title="$t('Edit')"
                         @click="_editTiming(item)"
                         icon="iconfont icon-bianji"
                         :disabled="item.releaseState === 'ONLINE'" >
@@ -83,7 +83,7 @@
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('上线')"
+                        :title="$t('online')"
                         @click="_online(item)"
                         icon="iconfont icon-erji-xiaxianjilu-copy"
                         v-if="item.releaseState === 'OFFLINE'">
@@ -93,7 +93,7 @@
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('下线')"
+                        :title="$t('offline')"
                         icon="iconfont icon-erji-xiaxianjilu"
                         @click="_offline(item)"
                         v-if="item.releaseState === 'ONLINE'">

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'projects'"></m-secondary-menu>
-    <m-list-construction :title="$t('定时管理')">
+    <m-list-construction :title="$t('Cron Manage')">
       <template slot="content">
         <m-list></m-list>
       </template>

escheduler-ui/src/js/conf/home/pages/projects/pages/historyTaskRecord/index.vue

@@ -0,0 +1,18 @@
+<template>
+  <m-list :config="config"></m-list>
+</template>
+<script>
+  import mList from '@/conf/home/pages/projects/pages/_source/taskRecordList'
+  export default {
+    name: 'history-task-record',
+    data () {
+      return {
+        config: {
+          title: `${this.$t('History task record')}`,
+          apiFn: 'getHistoryTaskRecordList'
+        }
+      }
+    },
+    components: { mList }
+  }
+</script>

escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue

@@ -9,14 +9,14 @@
                   @on-change="_datepicker"
                   :value="scheduleTime"
                   type="daterange"
-                  :placeholder="$t('选择日期区间')"
+                  :placeholder="$t('Select date range')"
                   format="YYYY-MM-DD HH:mm:ss">
           </x-datepicker>
         </div>
         <div class="row" >
           <div class="col-md-6">
             <div class="chart-title">
-              <span>{{$t('任务状态统计')}}</span>
+              <span>{{$t('Task status statistics')}}</span>
             </div>
             <div class="row">
               <div class="col-md-7">
@@ -26,9 +26,9 @@
                 <div class="table-small-model">
                   <table>
                     <tr>
-                      <th width="40">{{$t('序号')}}</th>
-                      <th>{{$t('数量')}}</th>
-                      <th>{{$t('状态')}}</th>
+                      <th width="40">{{$t('#')}}</th>
+                      <th>{{$t('Number')}}</th>
+                      <th>{{$t('State')}}</th>
                     </tr>
                     <tr v-for="(item,$index) in taskCountDtosList">
                       <td><span>{{$index+1}}</span></td>
@@ -37,7 +37,7 @@
                           <a href="javascript:" @click="id && _goTask(item.key)" :class="id ?'links':''">{{item.value}}</a>
                         </span>
                       </td>
-                      <td><span>{{item.key}}</span></td>
+                      <td><span class="ellipsis" style="width: 98%;" :title="item.key">{{item.key}}</span></td>
                     </tr>
                   </table>
                 </div>
@@ -46,7 +46,7 @@
           </div>
           <div class="col-md-6">
             <div class="chart-title">
-              <span>{{$t('流程状态统计')}}</span>
+              <span>{{$t('Process Status Statistics')}}</span>
             </div>
             <div class="row">
               <div class="col-md-7">
@@ -56,14 +56,14 @@
                 <div class="table-small-model">
                   <table>
                     <tr>
-                      <th width="40">{{$t('序号')}}</th>
-                      <th>{{$t('数量')}}</th>
-                      <th>{{$t('状态')}}</th>
+                      <th width="40">{{$t('#')}}</th>
+                      <th>{{$t('Number')}}</th>
+                      <th>{{$t('State')}}</th>
                     </tr>
                     <tr v-for="(item,$index) in processStateCountList">
                       <td><span>{{$index+1}}</span></td>
                       <td><span><a href="javascript:" @click="id && _goProcess(item.key)" :class="id ?'links':''">{{item.value}}</a></span></td>
-                      <td><span>{{item.key}}</span></td>
+                      <td><span class="ellipsis" style="width: 98%;" :title="item.key">{{item.key}}</span></td>
                     </tr>
                   </table>
                 </div>
@@ -74,7 +74,7 @@
         <div class="row">
           <div class="col-md-12">
             <div class="chart-title" style="margin-bottom: -20px;margin-top: 30px">
-              <span>{{$t('流程定义统计')}}</span>
+              <span>{{$t('Process Definition Statistics')}}</span>
             </div>
             <div>
               <div id="process-definition-bar" style="height:500px"></div>
@@ -93,7 +93,7 @@
   import dayjs from 'dayjs'
   import { mapActions } from 'vuex'
   import { pie, bar } from './chartConfig'
-  import { stateType } from '@/conf/home/pages/projects/pages/instance/pages/list/_source/common'
+  import { stateType } from '@/conf/home/pages/projects/pages/_source/instanceConditions/common'
   import Chart from '~/@analysys/ana-charts'
   import mNoData from '@/module/components/noData/noData'
   import mSpin from '@/module/components/spin/spin'
@@ -122,7 +122,7 @@
       },
       _goTask (name) {
         this.$router.push({
-          name: 'task-instance-list',
+          name: 'task-instance',
           query: {
             stateType: _.find(stateType, ['label', name])['code'],
             startDate: this.scheduleTime[0],
@@ -273,4 +273,12 @@
       }
     }
   }
+  .table-small-model {
+    .ellipsis {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space:  nowrap;
+      display: block;
+    }
+  }
 </style>

escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'projects'"></m-secondary-menu>
-    <m-list-construction :title="$t('项目首页')">
+    <m-list-construction :title="$t('Project Home')">
       <template slot="content">
         <m-project-chart :id="id"></m-project-chart>
       </template>

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue

@@ -3,33 +3,6 @@
 </template>
 <script>
   export default {
-    name: 'process-instance-index',
-    data () {
-      return {
-      }
-    },
-    props: {},
-    methods: {
-    },
-    watch: {
-    },
-    created () {
-    },
-    mounted () {
-
-    },
-    updated () {
-    },
-    beforeDestroy () {
-
-    },
-    destroyed () {
-    },
-    computed: {
-    },
-    components: { }
+    name: 'process-instance-index'
   }
-</script>
-
-<style lang="scss" rel="stylesheet/scss">
-</style>
+</script>

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'projects'"></m-secondary-menu>
-    <m-list-construction :title="$t('甘特图')">
+    <m-list-construction :title="$t('Gantt')">
       <template slot="content">
         <div class="gantt-model">
           <div class="gantt-state">
             <div class="state-tasks-color-sp">
               <a href="javascript:">
-                <span>{{$t('任务状态')}}</span>
+                <span>{{$t('Task Status')}}</span>
               </a>
               <a href="javascript:" v-for="(item) in tasksState">
                 <i class="fa fa-square" :style="{color:item.color}"></i>
@@ -71,7 +71,7 @@
             this.isNodata = true
             return
           }
-          // 甘特图
+          // Gantt
           Gantt.init({
             el: '.gantt',
             tasks: res.tasks

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@@ -4,37 +4,37 @@
       <table class="fixed">
         <tr>
           <th>
-            <span>{{$t('编号')}}</span>
+            <span>{{$t('#')}}</span>
           </th>
           <th>
-            <span>{{$t('工作流名称')}}</span>
+            <span>{{$t('Process Name')}}</span>
           </th>
           <th width="120">
-            <span>{{$t('运行类型')}}</span>
+            <span>{{$t('Run Type')}}</span>
           </th>
           <th width="140">
-            <span>{{$t('开始时间')}}</span>
+            <span>{{$t('Start Time')}}</span>
           </th>
           <th width="140">
-            <span>{{$t('结束时间')}}</span>
+            <span>{{$t('End Time')}}</span>
           </th>
           <th width="90">
-            <span>{{$t('运行时长(s)')}}</span>
+            <span>{{$t('Duration')}}s</span>
           </th>
           <th width="72">
-            <span>{{$t('运行次数')}}</span>
+            <span>{{$t('Run Times')}}</span>
           </th>
           <th width="100">
             <span>{{$t('host')}}</span>
           </th>
           <th width="70">
-            <span>{{$t('容错标识')}}</span>
+            <span>{{$t('fault-tolerant sign')}}</span>
           </th>
           <th width="50">
-            <span>{{$t('状态')}}</span>
+            <span>{{$t('State')}}</span>
           </th>
           <th width="260">
-            <span>{{$t('操作')}}</span>
+            <span>{{$t('Operation')}}</span>
           </th>
         </tr>
         <tr v-for="(item, $index) in list" :key="item.id">
@@ -67,55 +67,55 @@
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('编辑')"
+                        :title="$t('Edit')"
                         @click="_reEdit(item)"
                         v-ps="['GENERAL_USER']"
                         icon="iconfont icon-bianjixiugai"
-                        :disabled="item.state !== 'SUCCESS' && item.state !== 'PAUSE' && item.state !== 'FAILURE' && item.state !== 'STOP'"><!--{{$t('编辑')}}--></x-button>
+                        :disabled="item.state !== 'SUCCESS' && item.state !== 'PAUSE' && item.state !== 'FAILURE' && item.state !== 'STOP'"></x-button>
               <x-button type="info"
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('重跑')"
+                        :title="$t('Rerun')"
                         @click="_reRun(item,$index)"
                         v-ps="['GENERAL_USER']"
                         icon="iconfont icon-shuaxin"
-                        :disabled="item.state !== 'SUCCESS' && item.state !== 'PAUSE' && item.state !== 'FAILURE' && item.state !== 'STOP'"><!--{{$t('重跑')}}--></x-button>
+                        :disabled="item.state !== 'SUCCESS' && item.state !== 'PAUSE' && item.state !== 'FAILURE' && item.state !== 'STOP'"></x-button>
               <x-button type="success"
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('恢复失败')"
+                        :title="$t('Recovery Failed')"
                         @click="_restore(item,$index)"
                         v-ps="['GENERAL_USER']"
                         icon="iconfont icon-cuowuguanbishibai"
-                        :disabled="item.state !== 'FAILURE'"><!--{{$t('恢复失败')}}--></x-button>
+                        :disabled="item.state !== 'FAILURE'"></x-button>
               <x-button type="error"
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('停止')"
+                        :title="$t('Stop')"
                         @click="_stop(item)"
                         v-ps="['GENERAL_USER']"
                         icon="iconfont icon-zanting1"
-                        :disabled="item.state !== 'RUNNING_EXEUTION'"><!--{{$t('停止')}}--></x-button>
+                        :disabled="item.state !== 'RUNNING_EXEUTION'"></x-button>
               <x-button type="warning"
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="item.state === 'PAUSE' ? $t('恢复暂停') : $t('暂停')"
+                        :title="item.state === 'PAUSE' ? $t('Recovery Suspend') : $t('Pause')"
                         @click="_suspend(item,$index)"
                         v-ps="['GENERAL_USER']"
                         :icon="item.state === 'PAUSE' ? 'iconfont icon-ai06' : 'iconfont icon-zanting'"
-                        :disabled="item.state !== 'RUNNING_EXEUTION' && item.state !== 'PAUSE'"><!--{{item.state === 'PAUSE' ? $t('恢复暂停') : $t('暂停')}}--></x-button>
+                        :disabled="item.state !== 'RUNNING_EXEUTION' && item.state !== 'PAUSE'"></x-button>
               <x-poptip
                       :ref="'poptip-delete-' + $index"
                       placement="bottom-end"
                       width="90">
-                <p>{{$t('确定删除吗?')}}</p>
+                <p>{{$t('Delete?')}}</p>
                 <div style="text-align: right; margin: 0;padding-top: 4px;">
-                  <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('取消')}}</x-button>
-                  <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('确定')}}</x-button>
+                  <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
+                  <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
                 </div>
                 <template slot="reference">
                   <x-button
@@ -124,7 +124,7 @@
                           shape="circle"
                           size="xsmall"
                           data-toggle="tooltip"
-                          :title="$t('删除')"
+                          :title="$t('delete')"
                           v-ps="['GENERAL_USER']">
                   </x-button>
                 </template>
@@ -134,15 +134,14 @@
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('甘特图')"
+                        :title="$t('Gantt')"
                         @click="_gantt(item)"
                         icon="iconfont icon-gantt">
-                <!--{{$t('甘特图')}}-->
               </x-button>
 
             </div>
             <div v-show="!item.disabled">
-              <!--编辑-->
+              <!--Edit-->
               <x-button
                       type="info"
                       shape="circle"
@@ -151,7 +150,7 @@
                       disabled="true">
               </x-button>
 
-              <!--重跑-->
+              <!--Rerun-->
               <x-button
                       v-show="buttonType === 'run'"
                       type="info"
@@ -169,7 +168,7 @@
                       disabled="true">
               </x-button>
 
-              <!--恢复失败-->
+              <!--Recovery Failed-->
               <x-button
                       v-show="buttonType === 'store'"
                       type="success"
@@ -187,7 +186,7 @@
                       disabled="true">
               </x-button>
 
-              <!--停止-->
+              <!--Stop-->
               <x-button
                       type="error"
                       shape="circle"
@@ -196,7 +195,7 @@
                       disabled="true">
               </x-button>
 
-              <!--倒计时 => 恢复暂停/暂停-->
+              <!--倒计时 => Recovery Suspend/Pause-->
               <x-button
                       v-show="item.state === 'PAUSE' && buttonType === 'suspend'"
                       type="warning"
@@ -205,7 +204,7 @@
                       disabled="true">
                 {{item.count}}s
               </x-button>
-              <!--恢复暂停-->
+              <!--Recovery Suspend-->
               <x-button
                       v-show="item.state === 'PAUSE' && buttonType !== 'suspend'"
                       type="warning"
@@ -214,7 +213,7 @@
                       icon="iconfont icon-ai06"
                       disabled="true">
               </x-button>
-              <!--暂停-->
+              <!--Pause-->
               <x-button
                       v-show="item.state !== 'PAUSE'"
                       type="warning"
@@ -224,7 +223,7 @@
                       disabled="true">
               </x-button>
 
-              <!--删除-->
+              <!--delete-->
               <x-button
                       type="error"
                       shape="circle"
@@ -233,7 +232,7 @@
                       :disabled="true">
               </x-button>
 
-              <!--甘特图-->
+              <!--Gantt-->
               <x-button
                       type="info"
                       shape="circle"

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="main-layout-box">
     <m-secondary-menu :type="'projects'"></m-secondary-menu>
-    <m-list-construction :title="$t('工作流实例')">
+    <m-list-construction :title="$t('Process Instance')">
       <template slot="conditions">
-        <m-conditions @on-query="_onQuery"></m-conditions>
+        <m-instance-conditions @on-query="_onQuery"></m-instance-conditions>
       </template>
       <template slot="content">
         <template v-if="processInstanceList.length">
@@ -25,13 +25,13 @@
   import _ from 'lodash'
   import { mapActions } from 'vuex'
   import mList from './_source/list'
-  import mConditions from './_source/conditions'
   import mSpin from '@/module/components/spin/spin'
   import localStore from '@/module/util/localStorage'
   import { setUrlParams } from '@/module/util/routerUtil'
   import mNoData from '@/module/components/noData/noData'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
+  import mInstanceConditions from '@/conf/home/pages/projects/pages/_source/instanceConditions'
 
   export default {
     name: 'instance-list-index',
@@ -43,7 +43,7 @@
         total: null,
         // 数据
         processInstanceList: [],
-        // 参数
+        // Parameter
         searchParams: {
           // 搜索关键词
           searchVal: '',
@@ -53,11 +53,11 @@
           pageNo: 1,
           // host
           host: '',
-          // 状态
+          // State
           stateType: '',
-          // 开始时间
+          // Start Time
           startDate: '',
-          // 结束时间
+          // End Time
           endDate: ''
         }
       }
@@ -66,19 +66,20 @@
     methods: {
       ...mapActions('dag', ['getProcessInstance']),
       /**
-       * 查询
+       * Query
        */
       _onQuery (o) {
         this.searchParams = _.assign(this.searchParams, o)
+        setUrlParams(this.searchParams)
+        this._debounceGET()
       },
       /**
        * 分页事件
        */
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams({
-          pageNo: this.searchParams.pageNo
-        })
+        setUrlParams(this.searchParams)
+        this._debounceGET()
       },
       /**
        * 获取list数据
@@ -98,7 +99,7 @@
        * 更新
        */
       _onUpdate () {
-        this._debounceGET('false')
+        this._debounceGET()
       },
       /**
        * 路由变动
@@ -158,7 +159,7 @@
       // 销毁轮循
       clearInterval(this.setIntervalP)
     },
-    components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
+    components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
   }
 </script>
 

escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue

@@ -1,25 +1,25 @@
 <template>
-  <m-popup ref="popup" :ok-text="item ? $t('确认编辑') : $t('确认提交')" :nameText="item ? $t('编辑项目') : $t('创建项目')" @ok="_ok">
+  <m-popup ref="popup" :ok-text="item ? $t('Edit') : $t('Submit')" :nameText="item ? $t('Edit') : $t('Create Project')" @ok="_ok">
     <template slot="content">
       <div class="projects-create-model">
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('项目名称')}}</template>
+          <template slot="name"><b>*</b>{{$t('Project Name')}}</template>
           <template slot="content">
             <x-input
                     type="input"
                     v-model="projectName"
-                    :placeholder="$t('请输入name')"
+                    :placeholder="$t('Please enter name')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name">{{$t('描述')}}</template>
+          <template slot="name">{{$t('Description')}}</template>
           <template slot="content">
             <x-input
                     type="textarea"
                     v-model="desc"
-                    :placeholder="$t('请输入desc')"
+                    :placeholder="$t('Please enter description')"
                     autocomplete="off">
             </x-input>
           </template>
@@ -78,7 +78,7 @@
       },
       _verification () {
         if (!this.projectName) {
-          this.$message.warning(`${i18n.$t('请输入名称')}`)
+          this.$message.warning(`${i18n.$t('Please enter name')}`)
           return false
         }
         return true

escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue

@@ -4,25 +4,25 @@
       <table>
         <tr>
           <th>
-            <span>{{$t('编号')}}</span>
+            <span>{{$t('#')}}</span>
           </th>
           <th>
-            <span>{{$t('项目名称')}}</span>
+            <span>{{$t('Project Name')}}</span>
           </th>
           <th>
-            <span>{{$t('所属用户')}}</span>
+            <span>{{$t('Owned Users')}}</span>
           </th>
           <th>
-            <span>{{$t('描述')}}</span>
+            <span>{{$t('Description')}}</span>
           </th>
           <th>
-            <span>{{$t('创建时间')}}</span>
+            <span>{{$t('Create Time')}}</span>
           </th>
           <th>
-            <span>{{$t('更新时间')}}</span>
+            <span>{{$t('Update Time')}}</span>
           </th>
           <th width="80">
-            <span>{{$t('操作')}}</span>
+            <span>{{$t('Operation')}}</span>
           </th>
         </tr>
         <tr v-for="(item, $index) in list" :key="$index">
@@ -49,7 +49,7 @@
                     shape="circle"
                     size="xsmall"
                     data-toggle="tooltip"
-                    :title="$t('编辑')"
+                    :title="$t('Edit')"
                     @click="_edit(item)"
                     icon="iconfont icon-bianjixiugai"
                     v-ps="['GENERAL_USER']">
@@ -58,10 +58,10 @@
                     :ref="'poptip-' + $index"
                     placement="bottom-end"
                     width="90">
-              <p>{{$t('确定删除吗?')}}</p>
+              <p>{{$t('Delete?')}}</p>
               <div style="text-align: right; margin: 0;padding-top: 4px;">
-                <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('取消')}}</x-button>
-                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('确定')}}</x-button>
+                <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
+                <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
               </div>
               <template slot="reference">
                 <x-button
@@ -69,7 +69,7 @@
                         shape="circle"
                         size="xsmall"
                         data-toggle="tooltip"
-                        :title="$t('删除')"
+                        :title="$t('delete')"
                         icon="iconfont icon-shanchu"
                         v-ps="['GENERAL_USER']">
                 </x-button>

escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue

@@ -1,17 +1,17 @@
 <template>
-  <m-list-construction :title="$t('项目管理')">
+  <m-list-construction :title="$t('Project')">
     <template slot="conditions">
       <m-conditions @on-conditions="_onConditions">
         <template slot="button-group">
-          <x-button type="ghost" size="small" @click="_create('')" v-ps="['GENERAL_USER']">{{$t('创建项目')}}</x-button>
+          <x-button type="ghost" size="small" @click="_create('')" v-ps="['GENERAL_USER']">{{$t('Create Project')}}</x-button>
         </template>
       </m-conditions>
     </template>
     <template slot="content">
       <template v-if="projectsList.length">
-        <m-list :projects-list="projectsList" @on-update="_onUpdate" :page-no="pageNo" :page-size="pageSize"></m-list>
+        <m-list :projects-list="projectsList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
         <div class="page-box">
-          <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
         </div>
       </template>
       <template v-if="!projectsList.length">
@@ -22,26 +22,32 @@
   </m-list-construction>
 </template>
 <script>
+  import _ from 'lodash'
   import { mapActions } from 'vuex'
-  import mListConstruction from '@/module/components/listConstruction/listConstruction'
-  import mConditions from '@/module/components/conditions/conditions'
   import mList from './_source/list'
-  import mCreateProject from './_source/createProject'
   import mSpin from '@/module/components/spin/spin'
+  import mCreateProject from './_source/createProject'
   import mNoData from '@/module/components/noData/noData'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
+  import mConditions from '@/module/components/conditions/conditions'
+  import mListConstruction from '@/module/components/listConstruction/listConstruction'
+
 
   export default {
     name: 'projects-list',
     data () {
       return {
-        pageSize: 10,
-        pageNo: 1,
         total: null,
-        searchVal: '',
         projectsList: [],
-        isLoading: true
+        isLoading: true,
+        searchParams: {
+          pageSize: 10,
+          pageNo: 1,
+          searchVal: ''
+        }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {},
     methods: {
       ...mapActions('projects', ['getProjectsList']),
@@ -49,9 +55,12 @@
        * Inquire
        */
       _onConditions (o) {
-        this.searchVal = o.searchVal
-        this.pageNo = 1
-        this._getProjectsList()
+        this.searchParams = _.assign(this.searchParams, o)
+        this.searchParams.pageNo = 1
+      },
+
+      _page (val) {
+        this.searchParams.pageNo = val
       },
       _create (item) {
         let self = this
@@ -65,7 +74,7 @@
             return h(mCreateProject, {
               on: {
                 onUpdate () {
-                  self._getProjectsList()
+                  self._debounceGET()
                   modal.remove()
                 }
               },
@@ -77,19 +86,12 @@
         })
       },
       _onUpdate () {
-        this._getProjectsList()
+        this._debounceGET()
       },
-      _page (val) {
-        this.pageNo = val
-        this._getProjectsList()
-      },
-      _getProjectsList (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getProjectsList({
-          pageSize: this.pageSize,
-          pageNo: this.pageNo,
-          searchVal: this.searchVal
-        }).then(res => {
+        this.getProjectsList(this.searchParams).then(res => {
+          this.projectsList = []
           this.projectsList = res.totalList
           this.total = res.total
           this.isLoading = false
@@ -98,11 +100,16 @@
         })
       }
     },
-    watch: {},
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
     created () {
     },
     mounted () {
-      this._getProjectsList()
     },
     components: { mListConstruction, mSpin, mConditions, mList, mCreateProject, mNoData }
   }

escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@@ -4,40 +4,40 @@
       <table class="fixed">
         <tr>
           <th>
-            <span>{{$t('编号')}}</span>
+            <span>{{$t('#')}}</span>
           </th>
           <th>
-            <span>{{$t('名称')}}</span>
+            <span>{{$t('Name')}}</span>
           </th>
           <th>
-            <span>{{$t('工作流实例')}}</span>
+            <span>{{$t('Process Instance')}}</span>
           </th>
           <th width="80">
-            <span>{{$t('节点类型')}}</span>
+            <span>{{$t('Node Type')}}</span>
           </th>
           <th width="40">
-            <span>{{$t('状态')}}</span>
+            <span>{{$t('State')}}</span>
           </th>
           <th width="140">
-            <span>{{$t('提交时间')}}</span>
+            <span>{{$t('Submit Time')}}</span>
           </th>
           <th width="140">
-            <span>{{$t('开始时间')}}</span>
+            <span>{{$t('Start Time')}}</span>
           </th>
           <th width="140">
-            <span>{{$t('结束时间')}}</span>
+            <span>{{$t('End Time')}}</span>
           </th>
           <th width="110">
             <span>{{$t('host')}}</span>
           </th>
           <th width="74">
-            <span>{{$t('运行时长')}}(s)</span>
+            <span>{{$t('Duration')}}(s)</span>
           </th>
           <th width="84">
-            <span>{{$t('重试次数')}}</span>
+            <span>{{$t('Retry Count')}}</span>
           </th>
           <th width="50">
-            <span>{{$t('操作')}}</span>
+            <span>{{$t('Operation')}}</span>
           </th>
         </tr>
         <tr v-for="(item, $index) in list" :key="item.id">
@@ -66,7 +66,7 @@
                     shape="circle"
                     size="xsmall"
                     data-toggle="tooltip"
-                    :title="$t('查看日志')"
+                    :title="$t('View log')"
                     icon="iconfont icon-xitongcaozuorizhi"
                     @click="_refreshLog(item)">
             </x-button>