Unverified Commit 89b5ea93 authored by bao liang's avatar bao liang Committed by GitHub
Browse files

Merge pull request #275 from lenboo/branch-1.0.2 

handle %; physical delete;check before delete project
parents 2347773a cd4c9f93

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 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.common.utils.ParameterUtils;

import cn.escheduler.dao.model.User;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -113,6 +114,7 @@ public class AccessTokenController extends BaseController{ 
            if(result.get(Constants.STATUS) != Status.SUCCESS){

                return returnDataListPaging(result);

            }

            searchVal = ParameterUtils.handleEscapes(searchVal);

            result = accessTokenService.queryAccessTokenList(loginUser, searchVal, pageNo, pageSize);

            return returnDataListPaging(result);

        }catch (Exception e){

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

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import cn.escheduler.api.service.AlertGroupService; 
import cn.escheduler.api.utils.Constants;

import cn.escheduler.api.utils.Result;

import cn.escheduler.common.enums.AlertType;

import cn.escheduler.common.utils.ParameterUtils;

import cn.escheduler.dao.model.User;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -109,6 +110,7 @@ public class AlertGroupController extends BaseController{ 
                return returnDataListPaging(result);

            }



            searchVal = ParameterUtils.handleEscapes(searchVal);

            result = alertGroupService.listPaging(loginUser, searchVal, pageNo, pageSize);

            return returnDataListPaging(result);

        }catch (Exception e){

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

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import cn.escheduler.api.service.DataSourceService; 
import cn.escheduler.api.utils.Constants;

import cn.escheduler.api.utils.Result;

import cn.escheduler.common.enums.DbType;

import cn.escheduler.common.utils.ParameterUtils;

import cn.escheduler.dao.model.User;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -182,6 +183,7 @@ public class DataSourceController extends BaseController { 
            if (result.get(Constants.STATUS) != Status.SUCCESS) {

                return returnDataListPaging(result);

            }

            searchVal = ParameterUtils.handleEscapes(searchVal);

            result = dataSourceService.queryDataSourceListPaging(loginUser, searchVal, pageNo, pageSize);

            return returnDataListPaging(result);

        } catch (Exception e) {

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

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import cn.escheduler.api.enums.Status; 
import cn.escheduler.api.service.ProcessDefinitionService;

import cn.escheduler.api.utils.Constants;

import cn.escheduler.api.utils.Result;

import cn.escheduler.common.utils.ParameterUtils;

import cn.escheduler.dao.model.User;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -235,6 +236,7 @@ public class ProcessDefinitionController extends BaseController{ 
            if(result.get(Constants.STATUS) != Status.SUCCESS){

                return returnDataListPaging(result);

            }

            searchVal = ParameterUtils.handleEscapes(searchVal);

            result = processDefinitionService.queryProcessDefinitionListPaging(loginUser, projectName, searchVal, pageNo, pageSize, userId);

            return returnDataListPaging(result);

        }catch (Exception e){

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import cn.escheduler.api.utils.Constants; 
import cn.escheduler.api.utils.Result;

import cn.escheduler.common.enums.ExecutionStatus;

import cn.escheduler.common.enums.Flag;

import cn.escheduler.common.utils.ParameterUtils;

import cn.escheduler.dao.model.User;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -72,6 +73,7 @@ public class ProcessInstanceController extends BaseController{ 
                    "search value:{},state type:{},host:{},start time:{}, end time:{},page number:{}, page size:{}",

                    loginUser.getUserName(), projectName, processDefinitionId, searchVal, stateType,host,

                    startTime, endTime, pageNo, pageSize);

            searchVal = ParameterUtils.handleEscapes(searchVal);

            Map<String, Object> result = processInstanceService.queryProcessInstanceList(

                    loginUser, projectName, processDefinitionId, startTime, endTime, searchVal, stateType, host, pageNo, pageSize);

            return returnDataListPaging(result);