⚡ flowable包名变更为flow

6 years ago · 753c1aa1eb
38 changed files with 88 additions and 89 deletions
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/constant/ProcessConstant.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/constant/ProcessConstant.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.core.constant;
+package org.springblade.flow.core.constant;

 /**
 * 流程常量.
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/entity/BladeFlow.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/entity/BladeFlow.java
@ -14,10 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.core.entity;
+package org.springblade.flow.core.entity;

 import lombok.Data;
-import org.springblade.flowable.core.constant.ProcessConstant;
+import org.springblade.flow.core.constant.ProcessConstant;

 import java.io.Serializable;
 import java.util.Date;
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/entity/FlowEntity.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/entity/FlowEntity.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.core.entity;
+package org.springblade.flow.core.entity;

 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/feign/IFlowClient.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/feign/IFlowClient.java
@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.core.feign;
+package org.springblade.flow.core.feign;

 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.tool.api.R;
-import org.springblade.flowable.core.entity.BladeFlow;
+import org.springblade.flow.core.entity.BladeFlow;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/feign/IFlowClientFallback.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/feign/IFlowClientFallback.java
@ -14,10 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.core.feign;
+package org.springblade.flow.core.feign;

 import org.springblade.core.tool.api.R;
-import org.springblade.flowable.core.entity.BladeFlow;
+import org.springblade.flow.core.entity.BladeFlow;
 import org.springframework.stereotype.Component;

 import java.util.Map;
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/FlowUtil.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/FlowUtil.java
@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.core.utils;
+package org.springblade.flow.core.utils;

 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flowable.core.constant.ProcessConstant;
+import org.springblade.flow.core.constant.ProcessConstant;

 import java.util.HashMap;
 import java.util.Map;
--- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/TaskUtil.java
+++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flowable/core/utils/TaskUtil.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.core.utils;
+package org.springblade.flow.core.utils;

 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.utils.Func;
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/FlowDesignApplication.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/FlowDesignApplication.java
@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable;
+package org.springblade.flow;

 import org.flowable.ui.common.conf.DevelopmentConfiguration;
 import org.flowable.ui.common.rest.idm.remote.RemoteAccountResource;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.flowable.constant.FlowableConstant;
+import org.springblade.flow.constant.FlowableConstant;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/FlowableAutoConfiguration.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/FlowableAutoConfiguration.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.config;
+package org.springblade.flow.config;

 import lombok.AllArgsConstructor;
 import org.flowable.spring.SpringProcessEngineConfiguration;
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/FlowableBeanConfiguration.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/FlowableBeanConfiguration.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.config;
+package org.springblade.flow.config;

 import liquibase.Liquibase;
 import liquibase.database.Database;
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/SqlSessionConfiguration.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/SqlSessionConfiguration.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.config;
+package org.springblade.flow.config;

 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/StaticResourceConfig.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/config/StaticResourceConfig.java
@ -14,10 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.config;
+package org.springblade.flow.config;

 import lombok.AllArgsConstructor;
-import org.springblade.flowable.filter.UserHandlerInterceptor;
+import org.springblade.flow.filter.UserHandlerInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/constant/FlowableConstant.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/constant/FlowableConstant.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.constant;
+package org.springblade.flow.constant;

 /**
 * Flowable常量
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/controller/RemoteAccountController.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/controller/RemoteAccountController.java
@ -1,4 +1,4 @@
-package org.springblade.flowable.controller;
+package org.springblade.flow.controller;

 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
--- a/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/filter/UserHandlerInterceptor.java
+++ b/blade-ops/blade-flow-design/src/main/java/org/springblade/flowable/filter/UserHandlerInterceptor.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.filter;
+package org.springblade.flow.filter;

 import org.flowable.idm.api.User;
 import org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl;
@ -26,7 +26,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import static org.springblade.flowable.constant.FlowableConstant.*;
+import static org.springblade.flow.constant.FlowableConstant.*;

 /**
 * 用户模拟登录
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/FlowApplication.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/FlowApplication.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable;
+package org.springblade.flow;

 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/controller/WorkController.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/controller/WorkController.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.business.controller;
+package org.springblade.flow.business.controller;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@ -25,11 +25,11 @@ import org.flowable.engine.TaskService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.flowable.business.service.FlowBusinessService;
-import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.core.utils.TaskUtil;
-import org.springblade.flowable.engine.entity.FlowProcess;
-import org.springblade.flowable.engine.service.FlowService;
+import org.springblade.flow.business.service.FlowBusinessService;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.flow.engine.entity.FlowProcess;
+import org.springblade.flow.engine.service.FlowService;
 import org.springframework.web.bind.annotation.*;

 /**
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/feign/FlowClient.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/feign/FlowClient.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.business.feign;
+package org.springblade.flow.business.feign;

 import lombok.AllArgsConstructor;
 import org.flowable.engine.IdentityService;
@ -25,9 +25,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.core.feign.IFlowClient;
-import org.springblade.flowable.core.utils.TaskUtil;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.feign.IFlowClient;
+import org.springblade.flow.core.utils.TaskUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/FlowBusinessService.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/FlowBusinessService.java
@ -14,10 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.business.service;
+package org.springblade.flow.business.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.flowable.core.entity.BladeFlow;
+import org.springblade.flow.core.entity.BladeFlow;

 /**
 * 流程业务类
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/impl/FlowBusinessServiceImpl.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/impl/FlowBusinessServiceImpl.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.business.service.impl;
+package org.springblade.flow.business.service.impl;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
@ -30,12 +30,12 @@ import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flowable.business.service.FlowBusinessService;
-import org.springblade.flowable.core.constant.ProcessConstant;
-import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.core.utils.TaskUtil;
-import org.springblade.flowable.engine.constant.FlowConstant;
-import org.springblade.flowable.engine.utils.FlowCache;
+import org.springblade.flow.business.service.FlowBusinessService;
+import org.springblade.flow.core.constant.ProcessConstant;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.flow.engine.constant.FlowConstant;
+import org.springblade.flow.engine.utils.FlowCache;
 import org.springframework.stereotype.Service;

 import java.util.LinkedList;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/config/FlowableConfiguration.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/config/FlowableConfiguration.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.config;
+package org.springblade.flow.engine.config;

 import lombok.AllArgsConstructor;
 import org.flowable.spring.SpringProcessEngineConfiguration;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/constant/FlowConstant.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/constant/FlowConstant.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.constant;
+package org.springblade.flow.engine.constant;

 /**
 * 流程常量.
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowFollowController.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowFollowController.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.controller;
+package org.springblade.flow.engine.controller;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
@ -25,8 +25,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.flowable.engine.entity.FlowExecution;
-import org.springblade.flowable.engine.service.FlowService;
+import org.springblade.flow.engine.entity.FlowExecution;
+import org.springblade.flow.engine.service.FlowService;
 import org.springframework.web.bind.annotation.*;

 /**
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowManagerController.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowManagerController.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.controller;
+package org.springblade.flow.engine.controller;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@ -27,8 +27,8 @@ import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.IntegerPool;
-import org.springblade.flowable.engine.entity.FlowProcess;
-import org.springblade.flowable.engine.service.FlowService;
+import org.springblade.flow.engine.entity.FlowProcess;
+import org.springblade.flow.engine.service.FlowService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.controller;
+package org.springblade.flow.engine.controller;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiImplicitParam;
@ -28,8 +28,8 @@ import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.flowable.engine.entity.FlowModel;
-import org.springblade.flowable.engine.service.FlowService;
+import org.springblade.flow.engine.entity.FlowModel;
+import org.springblade.flow.engine.service.FlowService;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;

--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowProcessController.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowProcessController.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.controller;
+package org.springblade.flow.engine.controller;

 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@ -28,8 +28,8 @@ import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.image.ProcessDiagramGenerator;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.engine.service.FlowService;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.engine.service.FlowService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowExecution.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowExecution.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.entity;
+package org.springblade.flow.engine.entity;

 import lombok.Data;

--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.entity;
+package org.springblade.flow.engine.entity;

 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowProcess.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowProcess.java
@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.entity;
+package org.springblade.flow.engine.entity;

 import lombok.Data;
 import org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntityImpl;
-import org.springblade.flowable.engine.utils.FlowCache;
+import org.springblade.flow.engine.utils.FlowCache;

 import java.io.Serializable;
 import java.util.Date;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java
@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.mapper;
+package org.springblade.flow.engine.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.flowable.engine.entity.FlowModel;
+import org.springblade.flow.engine.entity.FlowModel;

 import java.util.List;

--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.flowable.engine.mapper.FlowMapper">
+<mapper namespace="org.springblade.flow.engine.mapper.FlowMapper">

    <!-- 通用查询映射结果 -->
-    <resultMap id="flowModelResultMap" type="org.springblade.flowable.engine.entity.FlowModel">
+    <resultMap id="flowModelResultMap" type="org.springblade.flow.engine.entity.FlowModel">
        <result column="id" property="id"/>
        <result column="name" property="name"/>
        <result column="model_key" property="modelKey"/>
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java
@ -14,14 +14,14 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.service;
+package org.springblade.flow.engine.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.engine.entity.FlowExecution;
-import org.springblade.flowable.engine.entity.FlowModel;
-import org.springblade.flowable.engine.entity.FlowProcess;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.engine.entity.FlowExecution;
+import org.springblade.flow.engine.entity.FlowModel;
+import org.springblade.flow.engine.entity.FlowProcess;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.InputStream;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.service.impl;
+package org.springblade.flow.engine.service.impl;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -46,15 +46,15 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.core.utils.TaskUtil;
-import org.springblade.flowable.engine.constant.FlowConstant;
-import org.springblade.flowable.engine.entity.FlowExecution;
-import org.springblade.flowable.engine.entity.FlowModel;
-import org.springblade.flowable.engine.entity.FlowProcess;
-import org.springblade.flowable.engine.mapper.FlowMapper;
-import org.springblade.flowable.engine.service.FlowService;
-import org.springblade.flowable.engine.utils.FlowCache;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.flow.engine.constant.FlowConstant;
+import org.springblade.flow.engine.entity.FlowExecution;
+import org.springblade.flow.engine.entity.FlowModel;
+import org.springblade.flow.engine.entity.FlowProcess;
+import org.springblade.flow.engine.mapper.FlowMapper;
+import org.springblade.flow.engine.service.FlowService;
+import org.springblade.flow.engine.utils.FlowCache;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 import org.springframework.stereotype.Service;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/utils/FlowCache.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/engine/utils/FlowCache.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.engine.utils;
+package org.springblade.flow.engine.utils;

 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.repository.ProcessDefinition;
--- a/blade-ops/blade-flow/src/main/java/org/springblade/flowable/launch/FlowableLauncherServiceImpl.java
+++ b/blade-ops/blade-flow/src/main/java/org/springblade/flowable/launch/FlowableLauncherServiceImpl.java
@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
-package org.springblade.flowable.launch;
+package org.springblade.flow.launch;

 import org.springblade.core.auto.service.AutoService;
 import org.springblade.core.launch.constant.NacosConstant;
@ -29,7 +29,7 @@ import java.util.Properties;
 * @author Chill
 */
@AutoService(LauncherService.class)
-public class FlowableLauncherServiceImpl implements LauncherService {
+public class FlowLauncherServiceImpl implements LauncherService {

 	@Override
 	public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java
@ -19,7 +19,7 @@ package org.springblade.desk.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.flowable.core.entity.FlowEntity;
+import org.springblade.flow.core.entity.FlowEntity;

 import java.time.LocalDateTime;

--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/ILeaveService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/ILeaveService.java
@ -18,7 +18,6 @@ package org.springblade.desk.service;

 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.entity.ProcessLeave;
-import org.springblade.flowable.core.entity.BladeFlow;

 /**
 * 服务类
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
@ -27,11 +27,11 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.entity.ProcessLeave;
 import org.springblade.desk.mapper.LeaveMapper;
 import org.springblade.desk.service.ILeaveService;
-import org.springblade.flowable.core.constant.ProcessConstant;
-import org.springblade.flowable.core.entity.BladeFlow;
-import org.springblade.flowable.core.feign.IFlowClient;
-import org.springblade.flowable.core.utils.FlowUtil;
-import org.springblade.flowable.core.utils.TaskUtil;
+import org.springblade.flow.core.constant.ProcessConstant;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.feign.IFlowClient;
+import org.springblade.flow.core.utils.FlowUtil;
+import org.springblade.flow.core.utils.TaskUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;