diff --git a/orange-demo-flowable/orange-demo-flowable-service/.gitignore b/orange-demo-flowable/orange-demo-flowable-service/.gitignore
deleted file mode 100644
index e3fa94cd..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-/.mvn/*
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/build/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
\ No newline at end of file
diff --git a/orange-demo-flowable/orange-demo-flowable-service/README.md b/orange-demo-flowable/orange-demo-flowable-service/README.md
deleted file mode 100644
index 20274fd0..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-### 服务接口文档
----
-- Knife4j
- - 服务启动后,Knife4j的文档入口地址 [http://localhost:8082/doc.html#/plus](http://localhost:8082/doc.html#/plus)
-- Postman
- - 无需启动服务,即可将当前工程的接口导出成Postman格式。在工程的common/common-tools/模块下,找到ExportApiApp文件,并执行main函数。
-
-### 服务启动环境依赖
----
-
-执行docker-compose up -d 命令启动下面依赖的服务。
-执行docker-compose down 命令停止下面服务。
-
-- Redis
- - 版本:4
- - 端口: 6379
- - 推荐客户端工具 [AnotherRedisDesktopManager](https://github.com/qishibo/AnotherRedisDesktopManager)
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/pom.xml b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/pom.xml
deleted file mode 100644
index 8ed5afeb..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
- com.orangeforms
- DemoFlow
- 1.0.0
-
- 4.0.0
-
- application-webadmin
- 1.0.0
- application
- jar
-
-
-
- com.anji-plus
- spring-boot-starter-captcha
- ${ajcaptcha.version}
-
-
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
-
- spring-boot-starter-logging
- org.springframework.boot
-
-
-
-
-
- com.orangeforms
- common-redis
- 1.0.0
-
-
- com.orangeforms
- common-online-api
- 1.0.0
-
-
- com.orangeforms
- common-flow-online
- 1.0.0
-
-
- com.orangeforms
- common-log
- 1.0.0
-
-
- com.orangeforms
- common-sequence
- 1.0.0
-
-
- com.orangeforms
- common-datafilter
- 1.0.0
-
-
- com.orangeforms
- common-swagger
- 1.0.0
-
-
-
-
-
-
- src/main/resources
-
- **/*.*
-
- false
-
-
- src/main/java
-
- **/*.xml
-
- false
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- ${spring-boot.version}
-
-
-
- repackage
-
-
-
-
-
-
-
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
deleted file mode 100644
index 55b24848..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orangeforms.webadmin;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-/**
- * 应用服务启动类。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@EnableAsync
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@ComponentScan("com.orangeforms")
-public class WebAdminApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(WebAdminApplication.class, args);
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
deleted file mode 100644
index b43e0957..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import io.swagger.annotations.Api;
-import cn.jimmyshi.beanquery.BeanQuery;
-import com.orangeforms.webadmin.app.model.AreaCode;
-import com.orangeforms.webadmin.app.service.AreaCodeService;
-import com.orangeforms.common.core.object.ResponseResult;
-import com.orangeforms.common.core.annotation.MyRequestBody;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.*;
-
-/**
- * 行政区划数据访问接口类。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Api(tags = "行政区划数据访问接口")
-@RestController
-@RequestMapping("/admin/app/areaCode")
-public class AreaCodeController {
-
- @Autowired
- private AreaCodeService areaCodeService;
-
- /**
- * 按照字典的形式返回行政区划列表。
- *
- * @return 字典形式的行政区划列表。
- */
- @GetMapping("/listDict")
- public ResponseResult>> listDict() {
- List resultList = areaCodeService.getAllListFromCache();
- return ResponseResult.success(BeanQuery.select(
- "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
- }
-
- /**
- * 根据上级行政区划Id获取其下级行政区划列表。
- *
- * @param parentId 上级行政区划Id。
- * @return 按照字典的形式返回下级行政区划列表。
- */
- @GetMapping("/listDictByParentId")
- public ResponseResult>> listDictByParentId(@RequestParam(required = false) Long parentId) {
- Collection resultList = areaCodeService.getListByParentId(parentId);
- if (CollectionUtils.isEmpty(resultList)) {
- return ResponseResult.success(new LinkedList<>());
- }
- return ResponseResult.success(BeanQuery.select(
- "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
- }
-
- /**
- * 根据字典Id集合,获取查询后的字典数据。
- *
- * @param dictIds 字典Id集合。
- * @return 字典形式的行政区划列表。
- */
- @PostMapping("/listDictByIds")
- public ResponseResult>> listDictByIds(
- @MyRequestBody(elementType = Long.class) List dictIds) {
- List resultList = areaCodeService.getInList(new HashSet<>(dictIds));
- return ResponseResult.success(BeanQuery.select(
- "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java
deleted file mode 100644
index e40d5469..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.AreaCode;
-
-/**
- * 行政区划数据操作访问接口。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-public interface AreaCodeMapper extends BaseDaoMapper {
-}
\ No newline at end of file
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml
deleted file mode 100644
index 09e629fa..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java
deleted file mode 100644
index 7b280e41..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * 行政区划实体对象。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Data
-@TableName(value = "zz_area_code")
-public class AreaCode {
-
- /**
- * 行政区划主键Id
- */
- @TableId(value = "area_id")
- private Long areaId;
-
- /**
- * 行政区划名称
- */
- @TableField(value = "area_name")
- private String areaName;
-
- /**
- * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
- */
- @TableField(value = "area_level")
- private Integer areaLevel;
-
- /**
- * 父级行政区划Id
- */
- @TableField(value = "parent_id")
- private Long parentId;
-}
\ No newline at end of file
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java
deleted file mode 100644
index 946150d0..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.common.core.base.service.IBaseDictService;
-import com.orangeforms.webadmin.app.model.AreaCode;
-
-import java.util.Collection;
-
-/**
- * 行政区划的Service接口。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-public interface AreaCodeService extends IBaseDictService {
-
- /**
- * 根据上级行政区划Id,获取其下级行政区划列表。
- *
- * @param parentId 上级行政区划Id。
- * @return 下级行政区划列表。
- */
- Collection getListByParentId(Long parentId);
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java
deleted file mode 100644
index 2a0b8a4d..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import com.orangeforms.webadmin.app.service.AreaCodeService;
-import com.orangeforms.webadmin.app.dao.AreaCodeMapper;
-import com.orangeforms.webadmin.app.model.AreaCode;
-import com.orangeforms.common.core.cache.MapTreeDictionaryCache;
-import com.orangeforms.common.core.base.service.BaseDictService;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-import java.util.Collection;
-
-/**
- * 行政区划的Service类。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Service("areaCodeService")
-public class AreaCodeServiceImpl extends BaseDictService implements AreaCodeService {
-
- @Autowired
- private AreaCodeMapper areaCodeMapper;
-
- public AreaCodeServiceImpl() {
- super();
- this.dictionaryCache = MapTreeDictionaryCache.create(AreaCode::getAreaId, AreaCode::getParentId);
- }
-
- @PostConstruct
- public void init() {
- this.reloadCachedData(true);
- }
-
- @Override
- protected BaseDaoMapper mapper() {
- return areaCodeMapper;
- }
-
- /**
- * 根据上级行政区划Id,获取其下级行政区划列表。
- *
- * @param parentId 上级行政区划Id。
- * @return 下级行政区划列表。
- */
- @Override
- public Collection getListByParentId(Long parentId) {
- return ((MapTreeDictionaryCache) dictionaryCache).getListByParentId(parentId);
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/CaptchaCacheServiceRedisImpl.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/CaptchaCacheServiceRedisImpl.java
deleted file mode 100644
index ae23a9f2..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/CaptchaCacheServiceRedisImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.orangeforms.webadmin.app.util;
-
-import com.anji.captcha.service.CaptchaCacheService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * 对于分布式部署的应用,我们建议应用自己实现CaptchaCacheService,比如用Redis,参考service/spring-boot代码示例。
- * 如果应用是单点的,也没有使用redis,那默认使用内存。
- * 内存缓存只适合单节点部署的应用,否则验证码生产与验证在节点之间信息不同步,导致失败。
- *
- * ☆☆☆ SPI: 在resources目录新建META-INF.services文件夹(两层),参考当前服务resources。
- * @author lide1202@hotmail.com
- * @date 2020-05-12
- */
-public class CaptchaCacheServiceRedisImpl implements CaptchaCacheService {
-
- @Override
- public String type() {
- return "redis";
- }
-
- @Autowired
- private StringRedisTemplate stringRedisTemplate;
-
- @Override
- public void set(String key, String value, long expiresInSeconds) {
- stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
- }
-
- @Override
- public boolean exists(String key) {
- return stringRedisTemplate.hasKey(key);
- }
-
- @Override
- public void delete(String key) {
- stringRedisTemplate.delete(key);
- }
-
- @Override
- public String get(String key) {
- return stringRedisTemplate.opsForValue().get(key);
- }
-
- @Override
- public Long increment(String key, long val) {
- return stringRedisTemplate.opsForValue().increment(key,val);
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/FlowIdentityExtHelper.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/FlowIdentityExtHelper.java
deleted file mode 100644
index 187332ee..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/FlowIdentityExtHelper.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.orangeforms.webadmin.app.util;
-
-import cn.hutool.core.collection.CollUtil;
-import com.orangeforms.common.flow.util.BaseFlowIdentityExtHelper;
-import com.orangeforms.common.flow.util.FlowCustomExtFactory;
-import com.orangeforms.webadmin.upms.model.SysDept;
-import com.orangeforms.webadmin.upms.model.SysUser;
-import com.orangeforms.webadmin.upms.model.constant.SysUserStatus;
-import com.orangeforms.webadmin.upms.model.SysDeptPost;
-import com.orangeforms.webadmin.upms.service.SysDeptService;
-import com.orangeforms.webadmin.upms.service.SysUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 为流程提供所需的用户身份相关的等扩展信息的帮助类。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Slf4j
-@Component
-public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
-
- @Autowired
- private SysDeptService sysDeptService;
- @Autowired
- private SysUserService sysUserService;
- @Autowired
- private FlowCustomExtFactory flowCustomExtFactory;
-
- @PostConstruct
- public void doRegister() {
- flowCustomExtFactory.registerFlowIdentityExtHelper(this);
- }
-
- @Override
- public Long getLeaderDeptPostId(Long deptId) {
- List deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId);
- return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
- }
-
- @Override
- public Long getUpLeaderDeptPostId(Long deptId) {
- List deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId);
- return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
- }
-
- @Override
- public Map getDeptPostIdMap(Long deptId, Set postIdSet) {
- Set postIdSet2 = postIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
- List deptPostList = sysDeptService.getSysDeptPostList(deptId, postIdSet2);
- if (CollUtil.isEmpty(deptPostList)) {
- return null;
- }
- Map resultMap = new HashMap<>(deptPostList.size());
- deptPostList.forEach(sysDeptPost ->
- resultMap.put(sysDeptPost.getPostId().toString(), sysDeptPost.getDeptPostId().toString()));
- return resultMap;
- }
-
- @Override
- public Map getUpDeptPostIdMap(Long deptId, Set postIdSet) {
- SysDept sysDept = sysDeptService.getById(deptId);
- if (sysDept == null || sysDept.getParentId() == null) {
- return null;
- }
- return getDeptPostIdMap(sysDept.getParentId(), postIdSet);
- }
-
- @Override
- public Set getUsernameListByRoleIds(Set roleIdSet) {
- Set usernameSet = new HashSet<>();
- Set roleIdSet2 = roleIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
- SysUser filter = new SysUser();
- filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
- for (Long roleId : roleIdSet2) {
- List userList = sysUserService.getSysUserListByRoleId(roleId, filter, null);
- this.extractAndAppendUsernameList(usernameSet, userList);
- }
- return usernameSet;
- }
-
- @Override
- public Set getUsernameListByDeptIds(Set deptIdSet) {
- Set usernameSet = new HashSet<>();
- Set deptIdSet2 = deptIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
- for (Long deptId : deptIdSet2) {
- SysUser filter = new SysUser();
- filter.setDeptId(deptId);
- filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
- List userList = sysUserService.getSysUserList(filter, null);
- this.extractAndAppendUsernameList(usernameSet, userList);
- }
- return usernameSet;
- }
-
- @Override
- public Set getUsernameListByPostIds(Set postIdSet) {
- Set usernameSet = new HashSet<>();
- Set postIdSet2 = postIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
- SysUser filter = new SysUser();
- filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
- for (Long postId : postIdSet2) {
- List userList = sysUserService.getSysUserListByPostId(postId, filter, null);
- this.extractAndAppendUsernameList(usernameSet, userList);
- }
- return usernameSet;
- }
-
- @Override
- public Set getUsernameListByDeptPostIds(Set deptPostIdSet) {
- Set usernameSet = new HashSet<>();
- Set deptPostIdSet2 = deptPostIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
- SysUser filter = new SysUser();
- filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
- for (Long deptPostId : deptPostIdSet2) {
- List userList = sysUserService.getSysUserListByDeptPostId(deptPostId, filter, null);
- this.extractAndAppendUsernameList(usernameSet, userList);
- }
- return usernameSet;
- }
-
- @Override
- public Boolean supprtDataPerm() {
- return true;
- }
-
- @Override
- public Map mapUserShowNameByLoginName(Set loginNameSet) {
- if (CollUtil.isEmpty(loginNameSet)) {
- return new HashMap<>(1);
- }
- Map resultMap = new HashMap<>(loginNameSet.size());
- List userList = sysUserService.getInList("loginName", loginNameSet);
- userList.forEach(user -> resultMap.put(user.getLoginName(), user.getShowName()));
- return resultMap;
- }
-
- private void extractAndAppendUsernameList(Set resultUsernameList, List userList) {
- List usernameList = userList.stream().map(SysUser::getLoginName).collect(Collectors.toList());
- if (CollUtil.isNotEmpty(usernameList)) {
- resultUsernameList.addAll(usernameList);
- }
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
deleted file mode 100644
index 4dce7d89..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.orangeforms.webadmin.app.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 行政区划DomainVO对象。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@ApiModel("行政区划实体对象")
-@Data
-public class AreaCodeVo {
-
- /**
- * 行政区划主键Id
- */
- @ApiModelProperty(value = "行政区划主键Id", required = true)
- private Long areaId;
-
- /**
- * 行政区划名称
- */
- @ApiModelProperty(value = "行政区划名称")
- private String areaName;
-
- /**
- * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
- */
- @ApiModelProperty(value = "行政区划级别")
- private Integer areaLevel;
-
- /**
- * 父级行政区划Id
- */
- @ApiModelProperty(value = "父级行政区划Id")
- private Long parentId;
-}
\ No newline at end of file
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java
deleted file mode 100644
index e872b66c..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.orangeforms.webadmin.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 应用程序自定义的程序属性配置文件。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Data
-@Configuration
-@ConfigurationProperties(prefix = "application")
-public class ApplicationConfig {
-
- /**
- * token的Http Request Header的key
- */
- private String tokenHeaderKey;
- /**
- * token在过期之前,但是已经需要被刷新时,response返回的header信息的key。
- */
- private String refreshedTokenHeaderKey;
- /**
- * token 加密用的密钥,该值的长度最少10个字符(过短会报错)。
- */
- private String tokenSigningKey;
- /**
- * 令牌的过期时间,单位毫秒
- */
- private Long expiration;
- /**
- * 用户密码被重置之后的缺省密码
- */
- private String defaultUserPassword;
- /**
- * 上传文件的基础目录
- */
- private String uploadFileBaseDir;
- /**
- * 授信ip列表,没有填写表示全部信任。多个ip之间逗号分隔,如: http://10.10.10.1:8080,http://10.10.10.2:8080
- */
- private String credentialIpList;
- /**
- * Session的用户权限在Redis中的过期时间(秒)。
- * 缺省值是 one day
- */
- private int sessionExpiredSeconds = 86400;
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceType.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceType.java
deleted file mode 100644
index 3c5d8e9e..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.orangeforms.webadmin.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 表示数据源类型的常量对象。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-public final class DataSourceType {
-
- public static final int MAIN = 0;
-
- private static final Map TYPE_MAP = new HashMap<>(2);
- static {
- TYPE_MAP.put("main", MAIN);
- }
-
- /**
- * 根据名称获取字典类型。
- *
- * @param name 数据源在配置中的名称。
- * @return 返回可用于多数据源切换的数据源类型。
- */
- public static Integer getDataSourceTypeByName(String name) {
- return TYPE_MAP.get(name);
- }
-
- /**
- * 私有构造函数,明确标识该常量类的作用。
- */
- private DataSourceType() {
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java
deleted file mode 100644
index 19f3c659..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.orangeforms.webadmin.config;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-import javax.servlet.Filter;
-import java.nio.charset.StandardCharsets;
-
-/**
- * 这里主要配置Web的各种过滤器和监听器等Servlet容器组件。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Configuration
-public class FilterConfig {
-
- /**
- * 配置Ajax跨域过滤器。
- */
- @Bean
- public CorsFilter corsFilterRegistration(ApplicationConfig applicationConfig) {
- UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
- CorsConfiguration corsConfiguration = new CorsConfiguration();
- if (StringUtils.isNotBlank(applicationConfig.getCredentialIpList())) {
- if ("*".equals(applicationConfig.getCredentialIpList())) {
- corsConfiguration.addAllowedOriginPattern("*");
- } else {
- String[] credentialIpList = StringUtils.split(applicationConfig.getCredentialIpList(), ",");
- if (credentialIpList.length > 0) {
- for (String ip : credentialIpList) {
- corsConfiguration.addAllowedOrigin(ip);
- }
- }
- }
- corsConfiguration.addAllowedHeader("*");
- corsConfiguration.addAllowedMethod("*");
- corsConfiguration.addExposedHeader(applicationConfig.getRefreshedTokenHeaderKey());
- corsConfiguration.setAllowCredentials(true);
- configSource.registerCorsConfiguration("/**", corsConfiguration);
- }
- return new CorsFilter(configSource);
- }
-
- @Bean
- public FilterRegistrationBean characterEncodingFilterRegistration() {
- FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean<>(
- new org.springframework.web.filter.CharacterEncodingFilter());
- filterRegistrationBean.addUrlPatterns("/*");
- filterRegistrationBean.addInitParameter("encoding", StandardCharsets.UTF_8.name());
- // forceEncoding强制response也被编码,另外即使request中已经设置encoding,forceEncoding也会重新设置
- filterRegistrationBean.addInitParameter("forceEncoding", "true");
- filterRegistrationBean.setAsyncSupported(true);
- return filterRegistrationBean;
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java
deleted file mode 100644
index 73aa3d0e..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.orangeforms.webadmin.config;
-
-import com.orangeforms.webadmin.interceptor.AuthenticationInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * 所有的项目拦截器都在这里集中配置
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
-
- @Override
- public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(new AuthenticationInterceptor()).addPathPatterns("/admin/**");
- }
-}
diff --git a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/MultiDataSourceConfig.java b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/MultiDataSourceConfig.java
deleted file mode 100644
index 1e4a46c6..00000000
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/MultiDataSourceConfig.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.orangeforms.webadmin.config;
-
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.orangeforms.common.core.config.DynamicDataSource;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.mybatis.spring.annotation.MapperScan;
-
-import javax.sql.DataSource;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 多数据源配置对象。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Configuration
-@EnableTransactionManagement
-@MapperScan(value = {"com.orangeforms.webadmin.*.dao", "com.orangeforms.common.*.dao"})
-public class MultiDataSourceConfig {
-
- @Bean(initMethod = "init", destroyMethod = "close")
- @ConfigurationProperties(prefix = "spring.datasource.druid.main")
- public DataSource mainDataSource() {
- return DruidDataSourceBuilder.create().build();
- }
-
- @Bean
- @Primary
- public DynamicDataSource dataSource() {
- Map