!684 fix: sql补全分号

* fix: sql补全分号

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java

@@ -1,165 +1,180 @@
-package org.dromara.common.redis.utils;
+package org.dromara.common.redis.utils;
-
+
-import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.DateUtil;
-import org.dromara.common.core.utils.SpringUtils;
+import lombok.AccessLevel;
-import org.dromara.common.core.utils.StringUtils;
+import lombok.NoArgsConstructor;
-import lombok.AccessLevel;
+import org.dromara.common.core.utils.SpringUtils;
-import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
-import org.redisson.api.RIdGenerator;
+import org.redisson.api.RIdGenerator;
-import org.redisson.api.RedissonClient;
+import org.redisson.api.RedissonClient;
-
+
-import java.time.Duration;
+import java.time.Duration;
-
+
-/**
+/**
- * 发号器工具类
+ * 发号器工具类
- *
+ *
- * @author 秋辞未寒
+ * @author 秋辞未寒
- * @date 2024-12-10
+ * @date 2024-12-10
- */
+ */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class SequenceUtils {
+public class SequenceUtils {
-
+
-    /**
+    /**
-     * 默认初始值
+     * 默认初始值
-     */
+     */
-    public static final Long DEFAULT_INIT_VALUE = 1L;
+    public static final Long DEFAULT_INIT_VALUE = 1L;
-    /**
+
-     * 默认步长
+    /**
-     */
+     * 默认步长
-    public static final Long DEFAULT_STEP_VALUE = 1L;
+     */
-    /**
+    public static final Long DEFAULT_STEP_VALUE = 1L;
-     * 默认过期时间-天
+
-     */
+    /**
-    public static final Duration DEFAULT_EXPIRE_TIME_DAY = Duration.ofDays(1);
+     * 默认过期时间-天
-    /**
+     */
-     * 默认过期时间-分钟
+    public static final Duration DEFAULT_EXPIRE_TIME_DAY = Duration.ofDays(1);
-     */
+
-    public static final Duration DEFAULT_EXPIRE_TIME_MINUTE = Duration.ofMinutes(1);
+    /**
-
+     * 默认过期时间-分钟
-    /**
+     */
-     * 获取Redisson客户端实例
+    public static final Duration DEFAULT_EXPIRE_TIME_MINUTE = Duration.ofMinutes(1);
-     */
+
-    private static final RedissonClient REDISSON_CLIENT = SpringUtils.getBean(RedissonClient.class);
+    /**
-
+     * 获取Redisson客户端实例
-    /**
+     */
-     * 获取ID生成器
+    private static final RedissonClient REDISSON_CLIENT = SpringUtils.getBean(RedissonClient.class);
-     *
+
-     * @param key        业务key
+    /**
-     * @param expireTime 过期时间
+     * 获取ID生成器
-     * @param initValue  ID初始值
+     *
-     * @param stepValue  ID步长
+     * @param key        业务key
-     * @return ID生成器
+     * @param expireTime 过期时间
-     */
+     * @param initValue  ID初始值
-    private static RIdGenerator getIdGenerator(String key, Duration expireTime, Long initValue, Long stepValue) {
+     * @param stepValue  ID步长
-        if (initValue == null || initValue <= 0) {
+     * @return ID生成器
-            initValue = DEFAULT_INIT_VALUE;
+     */
-        }
+    private static RIdGenerator getIdGenerator(String key, Duration expireTime, Long initValue, Long stepValue) {
-        if (stepValue == null || stepValue <= 0) {
+        if (initValue == null || initValue <= 0) {
-            stepValue = DEFAULT_STEP_VALUE;
+            initValue = DEFAULT_INIT_VALUE;
-        }
+        }
-        RIdGenerator idGenerator = REDISSON_CLIENT.getIdGenerator(key);
+        if (stepValue == null || stepValue <= 0) {
-        // 设置初始值和步长
+            stepValue = DEFAULT_STEP_VALUE;
-        idGenerator.tryInit(initValue, stepValue);
+        }
-        // 设置过期时间
+        RIdGenerator idGenerator = REDISSON_CLIENT.getIdGenerator(key);
-        idGenerator.expire(expireTime);
+        // 设置初始值和步长
-        return idGenerator;
+        idGenerator.tryInit(initValue, stepValue);
-    }
+        // 设置过期时间
-
+        idGenerator.expire(expireTime);
-    /**
+        return idGenerator;
-     * 获取指定业务key的唯一id
+    }
-     *
+
-     * @param key        业务key
+    /**
-     * @param expireTime 过期时间
+     * 获取指定业务key的唯一id
-     * @param initValue  ID初始值
+     *
-     * @param stepValue  ID步长
+     * @param key        业务key
-     * @return 唯一id
+     * @param expireTime 过期时间
-     */
+     * @param initValue  ID初始值
-    public static long nextId(String key, Duration expireTime, Long initValue, Long stepValue) {
+     * @param stepValue  ID步长
-        return getIdGenerator(key, expireTime, initValue, stepValue).nextId();
+     * @return 唯一id
-    }
+     */
-
+    public static long nextId(String key, Duration expireTime, Long initValue, Long stepValue) {
-    /**
+        return getIdGenerator(key, expireTime, initValue, stepValue).nextId();
-     * 获取指定业务key的唯一id字符串
+    }
-     *
+
-     * @param key        业务key
+    /**
-     * @param expireTime 过期时间
+     * 获取指定业务key的唯一id字符串
-     * @param initValue  ID初始值
+     *
-     * @param stepValue  ID步长
+     * @param key        业务key
-     * @return 唯一id
+     * @param expireTime 过期时间
-     */
+     * @param initValue  ID初始值
-    public static String nextIdStr(String key, Duration expireTime, Long initValue, Long stepValue) {
+     * @param stepValue  ID步长
-        return String.valueOf(nextId(key, expireTime, initValue, stepValue));
+     * @return 唯一id
-    }
+     */
-
+    public static String nextIdStr(String key, Duration expireTime, Long initValue, Long stepValue) {
-    /**
+        return String.valueOf(nextId(key, expireTime, initValue, stepValue));
-     * 获取指定业务key的唯一id (ID初始值=1,ID步长=1)
+    }
-     *
+
-     * @param key        业务key
+    /**
-     * @param expireTime 过期时间
+     * 获取指定业务key的唯一id (ID初始值=1,ID步长=1)
-     * @return 唯一id
+     *
-     */
+     * @param key        业务key
-    public static long nextId(String key, Duration expireTime) {
+     * @param expireTime 过期时间
-        return getIdGenerator(key, expireTime, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
+     * @return 唯一id
-    }
+     */
-
+    public static long nextId(String key, Duration expireTime) {
-    /**
+        return getIdGenerator(key, expireTime, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
-     * 获取指定业务key的唯一id字符串 (ID初始值=1,ID步长=1)
+    }
-     *
+
-     * @param key        业务key
+    /**
-     * @param expireTime 过期时间
+     * 获取指定业务key的唯一id字符串 (ID初始值=1,ID步长=1)
-     * @return 唯一id
+     *
-     */
+     * @param key        业务key
-    public static String nextIdStr(String key, Duration expireTime) {
+     * @param expireTime 过期时间
-        return String.valueOf(nextId(key, expireTime));
+     * @return 唯一id
-    }
+     */
-
+    public static String nextIdStr(String key, Duration expireTime) {
-    /**
+        return String.valueOf(nextId(key, expireTime));
-     * 获取 yyyyMMdd 开头的唯一id
+    }
-     *
+
-     * @return 唯一id
+    /**
-     */
+     * 获取指定业务key的唯一id字符串 (ID初始值=1,ID步长=1)，不足位数自动补零
-    public static String nextIdDate() {
+     *
-        return nextIdDate("");
+     * @param key        业务key
-    }
+     * @param expireTime 过期时间
-
+     * @param width      位数，不足左补0
-    /**
+     * @return 补零后的唯一id字符串
-     * 获取 prefix + yyyyMMdd 开头的唯一id
+     */
-     *
+    public static String nextPaddedIdStr(String key, Duration expireTime, Integer width) {
-     * @param prefix 业务前缀
+        return StringUtils.leftPad(nextIdStr(key, expireTime), width, '0');
-     * @return 唯一id
+    }
-     */
+
-    public static String nextIdDate(String prefix) {
+    /**
-        // 前缀+日期 构建 prefixKey
+     * 获取 yyyyMMdd 开头的唯一id
-        String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_FORMATTER));
+     *
-        // 获取下一个id
+     * @return 唯一id
-        long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_DAY, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
+     */
-        // 返回完整id
+    public static String nextIdDate() {
-        return StringUtils.format("{}{}", prefixKey, nextId);
+        return nextIdDate("");
-    }
+    }
-
+
-    /**
+    /**
-     * 获取 yyyyMMddHHmmss 开头的唯一id
+     * 获取 prefix + yyyyMMdd 开头的唯一id
-     *
+     *
-     * @return 唯一id
+     * @param prefix 业务前缀
-     */
+     * @return 唯一id
-    public static String nextIdDateTime() {
+     */
-        return nextIdDateTime("");
+    public static String nextIdDate(String prefix) {
-    }
+        // 前缀+日期 构建 prefixKey
-
+        String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_FORMATTER));
-    /**
+        // 获取下一个id
-     * 获取 prefix + yyyyMMddHHmmss 开头的唯一id
+        long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_DAY, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
-     *
+        // 返回完整id
-     * @param prefix 业务前缀
+        return StringUtils.format("{}{}", prefixKey, nextId);
-     * @return 唯一id
+    }
-     */
+
-    public static String nextIdDateTime(String prefix) {
+    /**
-        // 前缀+日期时间 构建 prefixKey
+     * 获取 yyyyMMddHHmmss 开头的唯一id
-        String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATETIME_FORMATTER));
+     *
-        // 获取下一个id
+     * @return 唯一id
-        long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_MINUTE, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
+     */
-        // 返回完整id
+    public static String nextIdDateTime() {
-        return StringUtils.format("{}{}", prefixKey, nextId);
+        return nextIdDateTime("");
-    }
+    }
-
+
-}
+    /**
+     * 获取 prefix + yyyyMMddHHmmss 开头的唯一id
+     *
+     * @param prefix 业务前缀
+     * @return 唯一id
+     */
+    public static String nextIdDateTime(String prefix) {
+        // 前缀+日期时间 构建 prefixKey
+        String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATETIME_FORMATTER));
+        // 获取下一个id
+        long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_MINUTE, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
+        // 返回完整id
+        return StringUtils.format("{}{}", prefixKey, nextId);
+    }
+
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java

@@ -13,21 +13,11 @@ public interface FlowConstant {
      */
     String INITIATOR = "initiator";
 
-    /**
-     * 流程实例id
-     */
-    String PROCESS_INSTANCE_ID = "processInstanceId";
-
     /**
      * 业务id
      */
     String BUSINESS_ID = "businessId";
 
-    /**
-     * 任务id
-     */
-    String TASK_ID = "taskId";
-
     /**
      * 委托
      */
@@ -63,4 +53,24 @@ public interface FlowConstant {
      */
     Long FLOW_CATEGORY_ID = 100L;
 
+    /**
+     * 是否为申请人提交常量
+     */
+    String SUBMIT = "submit";
+
+    /**
+     * 抄送常量
+     */
+    String FLOW_COPY_LIST = "flowCopyList";
+
+    /**
+     * 消息类型常量
+     */
+    String MESSAGE_TYPE = "messageType";
+
+    /**
+     * 消息通知常量
+     */
+    String MESSAGE_NOTICE = "messageNotice";
+
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java

@@ -10,6 +10,7 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.workflow.domain.TestLeave;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -40,6 +41,7 @@ public class TestLeaveBo extends BaseEntity {
      * 开始时间
      */
     @NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
@@ -47,6 +49,7 @@ public class TestLeaveBo extends BaseEntity {
      * 结束时间
      */
     @NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java

@@ -2,6 +2,7 @@ package org.dromara.workflow.domain.vo;
 
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.workflow.domain.TestLeave;
@@ -41,12 +42,14 @@ public class TestLeaveVo implements Serializable {
      * 开始时间
      */
     @ExcelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     /**
      * 结束时间
      */
     @ExcelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

@@ -1,6 +1,7 @@
 package org.dromara.workflow.listener;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +15,7 @@ import org.dromara.warm.flow.core.listener.GlobalListener;
 import org.dromara.warm.flow.core.listener.ListenerVariable;
 import org.dromara.warm.flow.orm.entity.FlowTask;
 import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
 import org.dromara.workflow.common.enums.TaskStatusEnum;
 import org.dromara.workflow.domain.bo.FlowCopyBo;
 import org.dromara.workflow.handler.FlowProcessEventHandler;
@@ -37,7 +39,7 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class WorkflowGlobalListener implements GlobalListener {
 
-    private final IFlwTaskService taskService;
+    private final IFlwTaskService flwTaskService;
     private final IFlwInstanceService instanceService;
     private final FlowProcessEventHandler flowProcessEventHandler;
     private final IFlwCommonService flwCommonService;
@@ -51,11 +53,19 @@ public class WorkflowGlobalListener implements GlobalListener {
     public void create(ListenerVariable listenerVariable) {
         Instance instance = listenerVariable.getInstance();
         Definition definition = listenerVariable.getDefinition();
+        FlowParams flowParams = listenerVariable.getFlowParams();
+        Map<String, Object> variable = flowParams.getVariable();
         Task task = listenerVariable.getTask();
         if (task != null) {
             // 判断流程状态（发布审批中事件）
             flowProcessEventHandler.processCreateTaskHandler(definition.getFlowCode(), instance, task.getId());
         }
+        Boolean submit = MapUtil.getBool(variable, FlowConstant.SUBMIT);
+        if (submit != null && submit) {
+            flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, instance.getFlowStatus(), variable, true);
+        }
+        variable.remove(FlowConstant.SUBMIT);
+        flowParams.variable(variable);
     }
 
     /**
@@ -126,25 +136,24 @@ public class WorkflowGlobalListener implements GlobalListener {
         if (StringUtils.isNotBlank(status)) {
             flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, params, false);
         }
-
+        Map<String, Object> variable = listenerVariable.getVariable();
         // 只有办理或者退回的时候才执行消息通知和抄送
         if (TaskStatusEnum.PASS.getStatus().equals(flowParams.getHisStatus())
             || TaskStatusEnum.BACK.getStatus().equals(flowParams.getHisStatus())) {
             Task task = listenerVariable.getTask();
-            Map<String, Object> variable = listenerVariable.getVariable();
+            List<FlowCopyBo> flowCopyList = (List<FlowCopyBo>) variable.get(FlowConstant.FLOW_COPY_LIST);
-            List<FlowCopyBo> flowCopyList = (List<FlowCopyBo>) variable.get("flowCopyList");
+            List<String> messageType = (List<String>) variable.get(FlowConstant.MESSAGE_TYPE);
-            List<String> messageType = (List<String>) variable.get("messageType");
+            String notice = (String) variable.get(FlowConstant.MESSAGE_NOTICE);
-            String notice = (String) variable.get("notice");
 
             // 添加抄送人
-            taskService.setCopy(task, flowCopyList);
+            flwTaskService.setCopy(task, flowCopyList);
-            variable.remove("flowCopyList");
+            variable.remove(FlowConstant.FLOW_COPY_LIST);
 
             // 消息通知
             if (CollUtil.isNotEmpty(messageType)) {
                 flwCommonService.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
-                variable.remove("messageType");
+                variable.remove(FlowConstant.MESSAGE_TYPE);
-                variable.remove("notice");
+                variable.remove(FlowConstant.MESSAGE_NOTICE);
             }
         }
     }
@@ -162,7 +171,7 @@ public class WorkflowGlobalListener implements GlobalListener {
             return flowStatus;
         } else {
             Long instanceId = instance.getId();
-            List<FlowTask> flowTasks = taskService.selectByInstId(instanceId);
+            List<FlowTask> flowTasks = flwTaskService.selectByInstId(instanceId);
             if (CollUtil.isEmpty(flowTasks)) {
                 String status = BusinessStatusEnum.FINISH.getStatus();
                 // 更新流程状态为已完成

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java

@@ -248,7 +248,6 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
             BusinessStatusEnum.checkCancelStatus(instance.getFlowStatus());
             FlowParams flowParams = FlowParams.build()
                 .message(message)
-                .skipType(SkipType.PASS.getKey())
                 .flowStatus(BusinessStatusEnum.CANCEL.getStatus())
                 .hisStatus(BusinessStatusEnum.CANCEL.getStatus())
                 .handler(userIdStr)

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -39,12 +39,12 @@ import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
 import org.dromara.warm.flow.orm.mapper.FlowNodeMapper;
 import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
 import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
 import org.dromara.workflow.common.enums.TaskAssigneeType;
 import org.dromara.workflow.common.enums.TaskStatusEnum;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;
 import org.dromara.workflow.domain.vo.FlowTaskVo;
-import org.dromara.workflow.handler.FlowProcessEventHandler;
 import org.dromara.workflow.handler.WorkflowPermissionHandler;
 import org.dromara.workflow.mapper.FlwCategoryMapper;
 import org.dromara.workflow.mapper.FlwTaskMapper;
@@ -81,7 +81,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
     private final FlowTaskMapper flowTaskMapper;
     private final FlowHisTaskMapper flowHisTaskMapper;
     private final IdentifierGenerator identifierGenerator;
-    private final FlowProcessEventHandler flowProcessEventHandler;
     private final UserService userService;
     private final FlwTaskMapper flwTaskMapper;
     private final FlwCategoryMapper flwCategoryMapper;
@@ -157,11 +156,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
             // 获取抄送人
             List<FlowCopyBo> flowCopyList = completeTaskBo.getFlowCopyList();
             // 设置抄送人
-            completeTaskBo.getVariables().put("flowCopyList", flowCopyList);
+            completeTaskBo.getVariables().put(FlowConstant.FLOW_COPY_LIST, flowCopyList);
             // 消息类型
-            completeTaskBo.getVariables().put("messageType", messageType);
+            completeTaskBo.getVariables().put(FlowConstant.MESSAGE_TYPE, messageType);
             // 消息通知
-            completeTaskBo.getVariables().put("notice", notice);
+            completeTaskBo.getVariables().put(FlowConstant.MESSAGE_NOTICE, notice);
 
 
             FlowTask flowTask = flowTaskMapper.selectById(taskId);
@@ -169,11 +168,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
                 throw new ServiceException("流程任务不存在或任务已审批！");
             }
             Instance ins = insService.getById(flowTask.getInstanceId());
-            // 获取流程定义信息
-            Definition definition = defService.getById(flowTask.getDefinitionId());
             // 检查流程状态是否为草稿、已撤销或已退回状态，若是则执行流程提交监听
             if (BusinessStatusEnum.isDraftOrCancelOrBack(ins.getFlowStatus())) {
-                flowProcessEventHandler.processHandler(definition.getFlowCode(), ins, ins.getFlowStatus(), null, true);
+                completeTaskBo.getVariables().put(FlowConstant.SUBMIT, true);
             }
             // 设置弹窗处理人
             Map<String, Object> assigneeMap = setPopAssigneeMap(completeTaskBo.getAssigneeMap(), ins.getVariableMap());

script/docker/nginx/conf/nginx.conf

@@ -106,6 +106,12 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header REMOTE-HOST $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            # sse 与 websocket参数
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_buffering off;
+            proxy_cache off;
             proxy_pass http://snailjob-server/snail-job/;
         }
 

script/sql/oracle/oracle_ry_vue_5.X.sql

@@ -447,6 +447,12 @@ insert into sys_menu values('115',  '代码生成',     '3',   '2', 'gen',
 insert into sys_menu values('121',  '租户管理',     '6',   '1', 'tenant',           'system/tenant/index',          '', 1, 0, 'C', '0', '0', 'system:tenant:list',          'list',          103, 1, sysdate, null, null, '租户管理菜单');
 insert into sys_menu values('122',  '租户套餐管理', '6',   '2', 'tenantPackage',    'system/tenantPackage/index',   '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list',   'form',          103, 1, sysdate, null, null, '租户套餐管理菜单');
 insert into sys_menu values('123',  '客户端管理',   '1',   '11', 'client',           'system/client/index',          '', 1, 0, 'C', '0', '0', 'system:client:list',          'international', 103, 1, sysdate, null, null, '客户端管理菜单');
+insert into sys_menu values('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId(\\d+)', 'tool/gen/editTable', '', 1, 1, 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('130', '分配用户',     '1',   '12', 'role-auth/user/:roleId(\\d+)', 'system/role/authUser', '', 1, 1, 'C', '1', '0', 'system:role:edit',      '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('131', '分配角色',     '1',   '13', 'user-auth/role/:userId(\\d+)', 'system/user/authRole', '', 1, 1, 'C', '1', '0', 'system:user:edit',      '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('132', '字典数据',     '1',   '14', 'dict-data/index/:dictId(\\d+)', 'system/dict/data', '', 1, 1, 'C', '1', '0', 'system:dict:list',         '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('133', '文件配置管理',  '1',   '15', 'oss-config/index',              'system/oss/config', '', 1, 1, 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, sysdate, null, null, '');
+
 -- springboot-admin监控
 insert into sys_menu values('117',  'Admin监控',   '2',    '5', 'Admin',            'monitor/admin/index',         '', 1, 0, 'C', '0', '0', 'monitor:admin:list',          'dashboard',     103, 1, sysdate, null, null, 'Admin监控菜单');
 -- oss菜单

script/sql/oracle/oracle_ry_workflow.sql

@@ -387,6 +387,8 @@ INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category',
 INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, SYSDATE, NULL, NULL, '');
 INSERT INTO sys_menu VALUES ('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, SYSDATE, NULL, NULL, '');
 INSERT INTO sys_menu VALUES ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', '1', '1', 'C', '0', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');
 
 INSERT INTO sys_menu VALUES ('11623', '流程分类查询', '11622', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:query', '#', 103, 1, SYSDATE, NULL, NULL, '');
 INSERT INTO sys_menu VALUES ('11624', '流程分类新增', '11622', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:add', '#', 103, 1, SYSDATE, NULL, NULL, '');

script/sql/postgres/postgres_ry_vue_5.X.sql

@@ -448,6 +448,11 @@ insert into sys_menu values('115',  '代码生成',     '3',   '2', 'gen',
 insert into sys_menu values('121',  '租户管理',     '6',   '1', 'tenant',           'system/tenant/index',          '', '1', '0', 'C', '0', '0', 'system:tenant:list',          'list',          103, 1, now(), null, null, '租户管理菜单');
 insert into sys_menu values('122',  '租户套餐管理', '6',   '2', 'tenantPackage',    'system/tenantPackage/index',   '', '1', '0', 'C', '0', '0', 'system:tenantPackage:list',   'form',          103, 1, now(), null, null, '租户套餐管理菜单');
 insert into sys_menu values('123',  '客户端管理',   '1',   '11', 'client',           'system/client/index',          '', '1', '0', 'C', '0', '0', 'system:client:list',          'international', 103, 1, now(), null, null, '客户端管理菜单');
+insert into sys_menu values('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId(\\d+)', 'tool/gen/editTable', '', '1', '1', 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('130', '分配用户',     '1',   '12', 'role-auth/user/:roleId(\\d+)', 'system/role/authUser', '', '1', '1', 'C', '1', '0', 'system:role:edit',      '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('131', '分配角色',     '1',   '13', 'user-auth/role/:userId(\\d+)', 'system/user/authRole', '', '1', '1', 'C', '1', '0', 'system:user:edit',      '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('132', '字典数据',     '1',   '14', 'dict-data/index/:dictId(\\d+)', 'system/dict/data', '', '1', '1', 'C', '1', '0', 'system:dict:list',         '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('133', '文件配置管理',  '1',   '15', 'oss-config/index',              'system/oss/config', '', '1', '1', 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, now(), null, null, '');
 
 -- springboot-admin监控
 insert into sys_menu values('117',  'Admin监控',   '2',   '5',  'Admin',            'monitor/admin/index',         '', '1', '0', 'C', '0', '0', 'monitor:admin:list',          'dashboard',     103, 1, now(), null, null, 'Admin监控菜单');

script/sql/postgres/postgres_ry_workflow.sql

@@ -370,6 +370,9 @@ INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category',
 INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, now(), NULL, NULL, '');
 INSERT INTO sys_menu VALUES ('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, now(), NULL, NULL, '');
 INSERT INTO sys_menu VALUES ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', '1', '1', 'C', '0', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '');
+
 INSERT INTO sys_menu VALUES ('11623', '流程分类查询', '11622', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:query', '#', 103, 1, now(), NULL, NULL, '');
 INSERT INTO sys_menu VALUES ('11624', '流程分类新增', '11622', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:add', '#', 103, 1, now(), NULL, NULL, '');
 INSERT INTO sys_menu VALUES ('11625', '流程分类修改', '11622', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:edit', '#', 103, 1, now(), NULL, NULL, '');

script/sql/ry_vue_5.X.sql

@@ -282,6 +282,11 @@ insert into sys_menu values('115',  '代码生成',     '3',   '2', 'gen',
 insert into sys_menu values('121',  '租户管理',     '6',   '1', 'tenant',           'system/tenant/index',          '', 1, 0, 'C', '0', '0', 'system:tenant:list',          'list',          103, 1, sysdate(), null, null, '租户管理菜单');
 insert into sys_menu values('122',  '租户套餐管理',  '6',   '2', 'tenantPackage',    'system/tenantPackage/index',   '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list',   'form',          103, 1, sysdate(), null, null, '租户套餐管理菜单');
 insert into sys_menu values('123',  '客户端管理',   '1',   '11', 'client',           'system/client/index',          '', 1, 0, 'C', '0', '0', 'system:client:list',          'international', 103, 1, sysdate(), null, null, '客户端管理菜单');
+insert into sys_menu values('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId(\\d+)', 'tool/gen/editTable', '', 1, 1, 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('130', '分配用户',     '1',   '12', 'role-auth/user/:roleId(\\d+)', 'system/role/authUser', '', 1, 1, 'C', '1', '0', 'system:role:edit',      '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('131', '分配角色',     '1',   '13', 'user-auth/role/:userId(\\d+)', 'system/user/authRole', '', 1, 1, 'C', '1', '0', 'system:user:edit',      '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('132', '字典数据',     '1',   '14', 'dict-data/index/:dictId(\\d+)', 'system/dict/data', '', 1, 1, 'C', '1', '0', 'system:dict:list',         '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('133', '文件配置管理',  '1',   '15', 'oss-config/index',              'system/oss/config', '', 1, 1, 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, sysdate(), null, null, '');
 
 -- springboot-admin监控
 insert into sys_menu values('117',  'Admin监控',   '2',   '5',  'Admin',            'monitor/admin/index',         '', 1, 0, 'C', '0', '0', 'monitor:admin:list',           'dashboard',     103, 1, sysdate(), null, null, 'Admin监控菜单');

script/sql/ry_workflow.sql

@@ -214,6 +214,8 @@ insert into sys_menu values ('11622', '流程分类', '11616', '1', 'category',
 insert into sys_menu values ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, sysdate(), NULL, NULL, '');
 insert into sys_menu values ('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), NULL, NULL, '');
 insert into sys_menu values ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', 1, 1, 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', 1, 1, 'C', '0', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), null, null, '');
 -- 流程分类管理相关按钮
 insert into sys_menu values ('11623', '流程分类查询', '11622', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:query', '#', 103, 1,sysdate(), null, null, '');
 insert into sys_menu values ('11624', '流程分类新增', '11622', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:add', '#', 103, 1,sysdate(), null, null, '');

script/sql/sqlserver/sqlserver_ry_vue_5.X.sql

@@ -1690,6 +1690,17 @@ INSERT sys_menu VALUES (122, N'租户套餐管理', 6, 2, N'tenantPackage', N'sy
 GO
 INSERT sys_menu VALUES (123, N'客户端管理', 1, 11, N'client', N'system/client/index', N'', 1, 0, N'C', N'0', N'0', N'system:client:list', N'international', 103, 1, getdate(), NULL, NULL, N'客户端管理菜单')
 GO
+INSERT sys_menu VALUES (116, N'修改生成配置',  3,   2, N'gen-edit/index/:tableId(\\d+)', N'tool/gen/editTable', N'', 1, 1, N'C', N'1', N'0', N'tool:gen:edit',           N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (130, N'分配用户',     1,   12, N'role-auth/user/:roleId(\\d+)', N'system/role/authUser', N'', 1, 1, N'C', N'1', N'0', N'system:role:edit',      N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (131, N'分配角色',     1,   13, N'user-auth/role/:userId(\\d+)', N'system/user/authRole', N'', 1, 1, N'C', N'1', N'0', N'system:user:edit',      N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (132, N'字典数据',     1,   14, N'dict-data/index/:dictId(\\d+)', N'system/dict/data', N'', 1, 1, N'C', N'1', N'0', N'system:dict:list',         N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (133, N'文件配置管理',  1,   15, N'oss-config/index',              N'system/oss/config', N'', 1, 1, N'C', N'1', N'0', N'system:ossConfig:list',  N'#',                103, 1, getdate(), null, null, N'');
+GO
+
 INSERT sys_menu VALUES (117, N'Admin监控', 2, 5, N'Admin', N'monitor/admin/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:admin:list', N'dashboard', 103, 1, getdate(), NULL, NULL, N'Admin监控菜单');
 GO
 INSERT sys_menu VALUES (118, N'文件管理', 1, 10, N'oss', N'system/oss/index', N'', 1, 0, N'C', '0', N'0', N'system:oss:list', N'upload', 103, 1, getdate(), NULL, NULL, N'文件管理菜单');

script/sql/sqlserver/sqlserver_ry_workflow.sql

@@ -1272,6 +1272,10 @@ INSERT sys_menu VALUES (11630, N'流程监控', 11616, 4, N'monitor', NULL, N'',
 GO
 INSERT sys_menu VALUES (11631, N'待办任务', 11630, 2, N'allTaskWaiting', N'workflow/task/allTaskWaiting', N'', 1, 1, N'C', N'0', N'0', N'', N'waiting', 103, 1, GETDATE(), NULL, NULL, N'');
 GO
+INSERT sys_menu VALUES (11700, N'流程设计', 11616, 5, N'design/index',   N'workflow/processDefinition/design', N'', 1, 1, N'C', N'1', N'0', N'workflow:leave:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11701, N'请假申请', 11616, 6, N'leaveEdit/index', N'workflow/leave/leaveEdit', N'', 1, 1, N'C', N'0', N'0', N'workflow:leave:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
 
 -- 流程分类管理相关按钮
 INSERT sys_menu VALUES (11623, N'流程分类查询', 11622, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:category:query', N'#', 103, 1, GETDATE(), NULL, NULL, N'');

script/sql/update/oracle/update_5.3.1-5.4.0.sql

@@ -8,3 +8,11 @@ COMMENT ON COLUMN flow_his_task.flow_status IS '流程状态（0待提交 1审
 ALTER TABLE sys_social
     MODIFY (access_token VARCHAR2(2000 BYTE))
     MODIFY (refresh_token VARCHAR2(2000 BYTE));
+
+INSERT INTO sys_menu VALUES ('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId(\\d+)', 'tool/gen/editTable', '', 1, 1, 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, sysdate, null, null, '');
+INSERT INTO sys_menu VALUES ('130', '分配用户',     '1',   '12', 'role-auth/user/:roleId(\\d+)', 'system/role/authUser', '', 1, 1, 'C', '1', '0', 'system:role:edit',      '#',               103, 1, sysdate, null, null, '');
+INSERT INTO sys_menu VALUES ('131', '分配角色',     '1',   '13', 'user-auth/role/:userId(\\d+)', 'system/user/authRole', '', 1, 1, 'C', '1', '0', 'system:user:edit',      '#',               103, 1, sysdate, null, null, '');
+INSERT INTO sys_menu VALUES ('132', '字典数据',     '1',   '14', 'dict-data/index/:dictId(\\d+)', 'system/dict/data', '', 1, 1, 'C', '1', '0', 'system:dict:list',         '#',               103, 1, sysdate, null, null, '');
+INSERT INTO sys_menu VALUES ('133', '文件配置管理',  '1',   '15', 'oss-config/index',              'system/oss/config', '', 1, 1, 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, sysdate, null, null, '');
+INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', '1', '1', 'C', '0', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');

script/sql/update/postgres/update_5.3.1-5.4.0.sql

@@ -8,3 +8,11 @@ COMMENT ON COLUMN flow_his_task.flow_status IS '流程状态（0待提交 1审
 ALTER TABLE sys_social
 ALTER COLUMN access_token TYPE varchar(2000),
 ALTER COLUMN refresh_token TYPE varchar(2000);
+
+INSERT INTO sys_menu VALUES ('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId(\\d+)', 'tool/gen/editTable', '', '1', '1', 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, now(), null, null, '');
+INSERT INTO sys_menu VALUES ('130', '分配用户',     '1',   '12', 'role-auth/user/:roleId(\\d+)', 'system/role/authUser', '', '1', '1', 'C', '1', '0', 'system:role:edit',      '#',               103, 1, now(), null, null, '');
+INSERT INTO sys_menu VALUES ('131', '分配角色',     '1',   '13', 'user-auth/role/:userId(\\d+)', 'system/user/authRole', '', '1', '1', 'C', '1', '0', 'system:user:edit',      '#',               103, 1, now(), null, null, '');
+INSERT INTO sys_menu VALUES ('132', '字典数据',     '1',   '14', 'dict-data/index/:dictId(\\d+)', 'system/dict/data', '', '1', '1', 'C', '1', '0', 'system:dict:list',         '#',               103, 1, now(), null, null, '');
+INSERT INTO sys_menu VALUES ('133', '文件配置管理',  '1',   '15', 'oss-config/index',              'system/oss/config', '', '1', '1', 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, now(), null, null, '');
+INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', '1', '1', 'C', '0', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '');

script/sql/update/sqlserver/update_5.3.1-5.4.0.sql

@@ -46,3 +46,18 @@ ALTER TABLE sys_social ALTER COLUMN access_token VARCHAR(2000) NOT NULL
 GO
 ALTER TABLE sys_social ALTER COLUMN refresh_token VARCHAR(2000) NULL
 GO
+
+INSERT sys_menu VALUES (116, N'修改生成配置',  3,   2, N'gen-edit/index/:tableId(\\d+)', N'tool/gen/editTable', N'', 1, 1, N'C', N'1', N'0', N'tool:gen:edit',           N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (130, N'分配用户',     1,   12, N'role-auth/user/:roleId(\\d+)', N'system/role/authUser', N'', 1, 1, N'C', N'1', N'0', N'system:role:edit',      N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (131, N'分配角色',     1,   13, N'user-auth/role/:userId(\\d+)', N'system/user/authRole', N'', 1, 1, N'C', N'1', N'0', N'system:user:edit',      N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (132, N'字典数据',     1,   14, N'dict-data/index/:dictId(\\d+)', N'system/dict/data', N'', 1, 1, N'C', N'1', N'0', N'system:dict:list',         N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (133, N'文件配置管理',  1,   15, N'oss-config/index',              N'system/oss/config', N'', 1, 1, N'C', N'1', N'0', N'system:ossConfig:list',  N'#',                103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (11700, N'流程设计', 11616, 5, N'design/index',   N'workflow/processDefinition/design', N'', 1, 1, N'C', N'1', N'0', N'workflow:leave:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11701, N'请假申请', 11616, 6, N'leaveEdit/index', N'workflow/leave/leaveEdit', N'', 1, 1, N'C', N'0', N'0', N'workflow:leave:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO

script/sql/update/update_5.3.1-5.4.0.sql

@@ -5,9 +5,17 @@ ALTER TABLE `flow_instance`
     MODIFY COLUMN `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）' AFTER `variable`;
 
 ALTER TABLE `flow_his_task`
-    MODIFY COLUMN `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）' AFTER `skip_type`
+    MODIFY COLUMN `flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）' AFTER `skip_type`;
 
 ALTER TABLE `sys_social`
     MODIFY COLUMN `access_token` varchar(2000)  NOT NULL COMMENT '用户的授权令牌' AFTER `avatar`;
 ALTER TABLE `sys_social`
     MODIFY COLUMN `refresh_token` varchar(2000) DEFAULT NULL COMMENT '刷新令牌，部分平台可能没有' AFTER `expire_in`;
+
+insert into sys_menu values('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId(\\d+)', 'tool/gen/editTable', '', 1, 1, 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('130', '分配用户',     '1',   '12', 'role-auth/user/:roleId(\\d+)', 'system/role/authUser', '', 1, 1, 'C', '1', '0', 'system:role:edit',      '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('131', '分配角色',     '1',   '13', 'user-auth/role/:userId(\\d+)', 'system/user/authRole', '', 1, 1, 'C', '1', '0', 'system:user:edit',      '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('132', '字典数据',     '1',   '14', 'dict-data/index/:dictId(\\d+)', 'system/dict/data', '', 1, 1, 'C', '1', '0', 'system:dict:list',         '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('133', '文件配置管理',  '1',   '15', 'oss-config/index',              'system/oss/config', '', 1, 1, 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, sysdate(), null, null, '');
+insert into sys_menu values('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', 1, 1, 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', 1, 1, 'C', '0', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), null, null, '');