DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!4 同步develop分支

Browse Source 
* fix -- 修改获取流程节点信息接口（供前端渲染流程跟踪图着色使用）
* fix -- 修复流程跟踪着色问题
* fix -- 采用ProcessViewer组件显示流程跟踪信息
* fix -- 整合表单设计代码
* fix -- 简易实现用户任务选择用户下拉框内容
* fix -- 修改项目介绍及sql文件
* del -- 移除未使用的文件
* fix -- 修复组件无法显示和修改的问题
* add -- 整合 Rtony/RuoYi-flowable 工作流
* add -- 添加process-designer流程设计插件
* !3 同步ruoyi-vue-plus更新
* !2 登录认证用户信息添加nickName字段（流程任务需要使用到）
This commit is contained in:
KonBAI
2022-01-08 15:42:53 +00:00
parent 5e7e260c22
commit a649962696
543 changed files with 42471 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
script/docker/docker-compose.yml
View File

@@ -102,7 +102,7 @@ services:
ipv4_address: 172.30.0.54
ruoyi-server1:
image: "ruoyi/ruoyi-server:3.4.0"
image: "ruoyi/ruoyi-server:3.5.0"
container_name: ruoyi-server1
environment:
# 时区上海
@@ -117,7 +117,7 @@ services:
ipv4_address: 172.30.0.60
ruoyi-server2:
image: "ruoyi/ruoyi-server:3.4.0"
image: "ruoyi/ruoyi-server:3.5.0"
container_name: ruoyi-server2
environment:
# 时区上海
@@ -132,7 +132,7 @@ services:
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
image: "ruoyi/ruoyi-monitor-admin:3.4.0"
image: "ruoyi/ruoyi-monitor-admin:3.5.0"
container_name: ruoyi-monitor-admin
environment:
# 时区上海
@@ -147,7 +147,7 @@ services:
ipv4_address: 172.30.0.90
ruoyi-xxl-job-admin:
image: "ruoyi/ruoyi-xxl-job-admin:3.4.0"
image: "ruoyi/ruoyi-xxl-job-admin:3.5.0"
container_name: ruoyi-xxl-job-admin
environment:
# 时区上海

16
script/docker/nginx/nginx.conf
View File

@@ -52,6 +52,16 @@ http {
#ssl_prefer_server_ciphers on;
# https配置参考 end
# 演示环境配置 拦截除 GET POST 之外的所有请求
# if ($request_method !~* GET|POST) {
# rewrite ^/(.*)$ /403;
# }
# location = /403 {
# default_type application/json;
# return 200 '{"msg":"演示模式，不允许操作","code":500}';
# }
location / {
root /usr/share/nginx/html;
try_files $uri $uri/ /index.html;
@@ -66,6 +76,9 @@ http {
proxy_pass http://server/;
}
# https 会拦截内链所有的 http 请求 造成功能无法使用
# 解决方案1 将 admin 服务 也配置成 https
# 解决方案2 将菜单配置为外链访问 走独立页面 http 访问
location /admin/ {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
@@ -74,6 +87,9 @@ http {
proxy_pass http://monitor-admin/admin/;
}
# https 会拦截内链所有的 http 请求 造成功能无法使用
# 解决方案1 将 xxljob 服务 也配置成 https
# 解决方案2 将菜单配置为外链访问 走独立页面 http 访问
location /xxl-job-admin/ {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;

3
script/docker/redis/redis.conf
View File

@@ -1,6 +1,9 @@
# redis 密码
# requirepass ruoyi123
# key 监听器配置
# notify-keyspace-events Ex
# 配置持久化文件存储路径
dir /redis/data
# 配置rdb

12
script/sql/ry_20211224.sql → script/sql/ry_20220105.sql
View File

@@ -161,7 +161,7 @@ insert into sys_menu values('1', '系统管理', '0', '1', 'system', n
insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录');
insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录');
insert into sys_menu values('4', 'PLUS官网', '0', '4', 'https://gitee.com/JavaLionLi/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, 'RuoYi-Vue-Plus官网地址');
insert into sys_menu values('5', '流程管理', '0', '4', 'flowable', NULL, NULL, 1, 0, 'M', '0', '0', NULL, 'skill', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('5', '流程管理', '0', '4', 'workflow', NULL, NULL, 1, 0, 'M', '0', '0', NULL, 'skill', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('6', '任务管理', '0', '5', 'task', NULL, NULL, 1, 0, 'M', '0', '0', NULL, 'job', 'admin', sysdate(), 'admin', null, '');
-- 二级菜单
@@ -187,11 +187,11 @@ insert into sys_menu values('118', '文件管理', '1', '10', 'oss', 'system/os
-- xxl-job-admin控制台
insert into sys_menu values('120', '任务调度中心', '2', '5', 'XxlJob', 'monitor/xxljob/index', '', 1, 0, 'C', '0', '0', 'monitor:xxljob:list', 'job', 'admin', sysdate(), '', null, 'Xxl-Job控制台菜单');
-- 流程配置
insert into sys_menu values('121', '流程定义', '5', '1', 'definition', 'flowable/definition/index', '', 1, 0, 'C', '0', '0', NULL, 'example', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('122', '表单配置', '5', '2', 'form', 'flowable/task/form/index', '', 1, 0, 'C', '0', '0', NULL, 'form', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('123', '我的流程', '6', '1', 'process', 'flowable/task/process/index','', 1, 0, 'C', '0', '0', NULL, 'guide', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('124', '待办任务', '6', '2', 'todo', 'flowable/task/todo/index', '', 1, 0, 'C', '0', '0', NULL, 'cascader', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('125', '已办任务', '6', '3', 'finished', 'flowable/task/finished/index', '', 1, 0, 'C', '0', '0', NULL, 'checkbox', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('121', '流程定义', '5', '1', 'definition', 'workflow/definition/index', '', 1, 0, 'C', '0', '0', NULL, 'example', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('122', '表单配置', '5', '2', 'form', 'workflow/task/form/index', '', 1, 0, 'C', '0', '0', NULL, 'form', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('123', '我的流程', '6', '1', 'process', 'workflow/task/process/index','', 1, 0, 'C', '0', '0', NULL, 'guide', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('124', '待办任务', '6', '2', 'todo', 'workflow/task/todo/index', '', 1, 0, 'C', '0', '0', NULL, 'cascader', 'admin', sysdate(), 'admin', null, '');
insert into sys_menu values('125', '已办任务', '6', '3', 'finished', 'workflow/task/finished/index', '', 1, 0, 'C', '0', '0', NULL, 'checkbox', 'admin', sysdate(), 'admin', null, '');
-- 三级菜单
insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 'admin', sysdate(), '', null, '操作日志菜单');