提交

jy-business/src/main/java/com/jy/business/payment/flow/PaymentRequestsFlow.java

@@ -1,10 +1,10 @@
 package com.jy.business.payment.flow;
 
 import com.jy.business.payment.dao.PaymentRequestsDao;
-import com.warm.flow.core.entity.Instance;
-import com.warm.flow.core.listener.Listener;
-import com.warm.flow.core.listener.ListenerVariable;
 import jakarta.annotation.Resource;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.listener.Listener;
+import org.dromara.warm.flow.core.listener.ListenerVariable;
 import org.springframework.stereotype.Component;
 
 @Component("paymentRequestsFlow")

jy-flow/src/main/java/com/jy/flow/adapter/AbstractWarmFlowAdapter.java

@@ -2,9 +2,9 @@ package com.jy.flow.adapter;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.jy.framework.satoken.LoginContext;
-import com.warm.flow.core.enums.CooperateType;
-import com.warm.flow.core.service.TaskService;
 import jakarta.annotation.Resource;
+import org.dromara.warm.flow.core.enums.CooperateType;
+import org.dromara.warm.flow.core.service.TaskService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

jy-flow/src/main/java/com/jy/flow/adapter/AddSignatureAdapter.java

@@ -2,7 +2,8 @@ package com.jy.flow.adapter;
 
 import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
-import com.warm.flow.core.enums.CooperateType;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -20,13 +21,13 @@ public class AddSignatureAdapter extends AbstractWarmFlowAdapter implements Warm
 
     @Override
     public boolean adapter(WarmFlowInteractiveTypeVo obj) {
-        return super.taskService.addSignature(
-                obj.getTaskId(),
-                LoginContext.getUserId().toString(),
-                permissionList(),
-                obj.getAddHandlers(),
-                this.type(obj.getOperatorType())
-        );
+        FlowParams flowParams = new FlowParams()
+                .handler(LoginContext.getUserId().toString())
+                .permissionFlag(permissionList())
+                .addHandlers(obj.getAddHandlers())
+                .message(this.type(obj.getOperatorType()));
+
+        return super.taskService.addSignature(obj.getTaskId(), flowParams);
     }
 
 }

jy-flow/src/main/java/com/jy/flow/adapter/DeputeAdapter.java

@@ -3,7 +3,8 @@ package com.jy.flow.adapter;
 
 import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
-import com.warm.flow.core.enums.CooperateType;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -21,13 +22,13 @@ public class DeputeAdapter extends AbstractWarmFlowAdapter implements WarmFlowAd
 
     @Override
     public boolean adapter(WarmFlowInteractiveTypeVo obj) {
-        return super.taskService.depute(
-                obj.getTaskId(),
-                LoginContext.getUserId().toString(),
-                permissionList(),
-                obj.getAddHandlers(),
-                this.type(obj.getOperatorType())
-        );
+        FlowParams flowParams = new FlowParams()
+                .handler(LoginContext.getUserId().toString())
+                .permissionFlag(permissionList())
+                .addHandlers(obj.getAddHandlers())
+                .message(this.type(obj.getOperatorType()));
+
+        return super.taskService.addSignature(obj.getTaskId(), flowParams);
     }
 
 }

jy-flow/src/main/java/com/jy/flow/adapter/ReductionSignatureAdapter.java

@@ -3,7 +3,8 @@ package com.jy.flow.adapter;
 
 import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
-import com.warm.flow.core.enums.CooperateType;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -21,13 +22,13 @@ public class ReductionSignatureAdapter extends AbstractWarmFlowAdapter implement
 
     @Override
     public boolean adapter(WarmFlowInteractiveTypeVo obj) {
-        return super.taskService.depute(
-                obj.getTaskId(),
-                LoginContext.getUserId().toString(),
-                permissionList(),
-                obj.getAddHandlers(),
-                this.type(obj.getOperatorType())
-        );
+        FlowParams flowParams = new FlowParams()
+                .handler(LoginContext.getUserId().toString())
+                .permissionFlag(permissionList())
+                .addHandlers(obj.getAddHandlers())
+                .message(this.type(obj.getOperatorType()));
+
+        return super.taskService.addSignature(obj.getTaskId(), flowParams);
     }
 
 }

jy-flow/src/main/java/com/jy/flow/adapter/TransferAdapter.java

@@ -3,7 +3,8 @@ package com.jy.flow.adapter;
 
 import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
-import com.warm.flow.core.enums.CooperateType;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
@@ -21,13 +22,13 @@ public class TransferAdapter extends AbstractWarmFlowAdapter implements WarmFlow
 
     @Override
     public boolean adapter(WarmFlowInteractiveTypeVo obj) {
-        return super.taskService.depute(
-                obj.getTaskId(),
-                LoginContext.getUserId().toString(),
-                permissionList(),
-                obj.getAddHandlers(),
-                this.type(obj.getOperatorType())
-        );
+        FlowParams flowParams = new FlowParams()
+                .handler(LoginContext.getUserId().toString())
+                .permissionFlag(permissionList())
+                .addHandlers(obj.getAddHandlers())
+                .message(this.type(obj.getOperatorType()));
+
+        return super.taskService.addSignature(obj.getTaskId(), flowParams);
     }
 
 }

jy-flow/src/main/java/com/jy/flow/controller/DefController.java

@@ -1,11 +1,11 @@
 package com.jy.flow.controller;
 
 import com.jy.flow.model.dto.FlowDefinitionDto;
-import com.warm.flow.core.entity.Definition;
-import com.warm.flow.core.service.DefService;
-import com.warm.flow.core.utils.page.Page;
-import com.warm.flow.orm.entity.FlowDefinition;
 import jakarta.annotation.Resource;
+import org.dromara.warm.flow.core.entity.Definition;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.core.utils.page.Page;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;

jy-flow/src/main/java/com/jy/flow/controller/ExecuteController.java

@@ -18,27 +18,27 @@ import com.jy.system.dao.SysDeptDao;
 import com.jy.system.dao.SysRoleDao;
 import com.jy.system.dao.SysUserDao;
 import com.jy.system.model.entity.SysUser;
-import com.warm.flow.core.FlowFactory;
-import com.warm.flow.core.dto.FlowParams;
-import com.warm.flow.core.entity.HisTask;
-import com.warm.flow.core.entity.Instance;
-import com.warm.flow.core.entity.Node;
-import com.warm.flow.core.entity.Skip;
-import com.warm.flow.core.entity.Task;
-import com.warm.flow.core.entity.User;
-import com.warm.flow.core.enums.SkipType;
-import com.warm.flow.core.enums.UserType;
-import com.warm.flow.core.service.HisTaskService;
-import com.warm.flow.core.service.InsService;
-import com.warm.flow.core.service.NodeService;
-import com.warm.flow.core.service.SkipService;
-import com.warm.flow.core.service.TaskService;
-import com.warm.flow.core.service.UserService;
-import com.warm.flow.core.utils.StreamUtils;
-import com.warm.flow.orm.entity.FlowHisTask;
-import com.warm.flow.orm.entity.FlowInstance;
-import com.warm.flow.orm.entity.FlowSkip;
 import jakarta.annotation.Resource;
+import org.dromara.warm.flow.core.FlowFactory;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.entity.HisTask;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.entity.Node;
+import org.dromara.warm.flow.core.entity.Skip;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.core.entity.User;
+import org.dromara.warm.flow.core.enums.SkipType;
+import org.dromara.warm.flow.core.enums.UserType;
+import org.dromara.warm.flow.core.service.HisTaskService;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.core.service.NodeService;
+import org.dromara.warm.flow.core.service.SkipService;
+import org.dromara.warm.flow.core.service.TaskService;
+import org.dromara.warm.flow.core.service.UserService;
+import org.dromara.warm.flow.core.utils.StreamUtils;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.warm.flow.orm.entity.FlowSkip;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;

jy-flow/src/main/java/com/jy/flow/mapper/WarmFlowMapper.java

@@ -3,10 +3,10 @@ package com.jy.flow.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jy.flow.model.dto.FlowTaskDto;
 import com.jy.flow.model.vo.FlowTaskVo;
-import com.warm.flow.core.entity.HisTask;
-import com.warm.flow.orm.entity.FlowHisTask;
-import com.warm.flow.orm.entity.FlowTask;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.warm.flow.core.entity.HisTask;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowTask;
 
 public interface WarmFlowMapper {
 

jy-flow/src/main/java/com/jy/flow/mapper/xml/WarmFLowMapper.xml

@@ -23,7 +23,7 @@
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
-    <resultMap type="com.warm.flow.orm.entity.FlowUser" id="FlowUserResult">
+    <resultMap type="org.dromara.warm.flow.orm.entity.FlowUser" id="FlowUserResult">
         <result property="id" column="user_id"/>
         <result property="type" column="type"/>
         <result property="processedBy" column="processed_by"/>
@@ -34,7 +34,7 @@
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
-    <resultMap type="com.warm.flow.orm.entity.FlowHisTask" id="FlowHisTaskResult">
+    <resultMap type="org.dromara.warm.flow.orm.entity.FlowHisTask" id="FlowHisTaskResult">
         <result property="id" column="id"/>
         <result property="nodeCode" column="node_code"/>
         <result property="nodeName" column="node_name"/>

jy-flow/src/main/java/com/jy/flow/model/dto/FlowDefinitionDto.java

@@ -1,8 +1,8 @@
 package com.jy.flow.model.dto;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.warm.flow.orm.entity.FlowDefinition;
 import lombok.Setter;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
 
 @Setter
 public class FlowDefinitionDto extends FlowDefinition {

jy-flow/src/main/java/com/jy/flow/model/dto/FlowHisTaskDto.java

@@ -2,8 +2,8 @@ package com.jy.flow.model.dto;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.warm.flow.orm.entity.FlowHisTask;
 import lombok.Setter;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
 
 @Setter
 public class FlowHisTaskDto extends FlowHisTask {

jy-flow/src/main/java/com/jy/flow/model/dto/FlowTaskDto.java

@@ -3,8 +3,8 @@ package com.jy.flow.model.dto;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.warm.flow.orm.entity.FlowTask;
 import lombok.Setter;
+import org.dromara.warm.flow.orm.entity.FlowTask;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;

jy-flow/src/main/java/com/jy/flow/model/vo/FlowTaskVo.java

@@ -1,8 +1,8 @@
 package com.jy.flow.model.vo;
 
-import com.warm.flow.orm.entity.FlowTask;
 import lombok.Getter;
 import lombok.Setter;
+import org.dromara.warm.flow.orm.entity.FlowTask;
 
 @Getter
 @Setter

jy-flow/src/main/java/com/jy/flow/service/ExecuteService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jy.flow.model.dto.FlowHisTaskDto;
 import com.jy.flow.model.dto.FlowTaskDto;
 import com.jy.flow.model.vo.FlowTaskVo;
-import com.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
 
 public interface ExecuteService {
 

jy-flow/src/main/java/com/jy/flow/service/impl/ExecuteServiceImpl.java

@@ -6,8 +6,8 @@ import com.jy.flow.model.dto.FlowHisTaskDto;
 import com.jy.flow.model.dto.FlowTaskDto;
 import com.jy.flow.model.vo.FlowTaskVo;
 import com.jy.flow.service.ExecuteService;
-import com.warm.flow.orm.entity.FlowHisTask;
 import jakarta.annotation.Resource;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
 import org.springframework.stereotype.Service;
 
 @Service

jy-flow/src/main/java/com/jy/flow/utils/FlowUtil.java

@@ -6,13 +6,13 @@ import com.jy.flow.model.dto.WarmFlowHandleDto;
 import com.jy.flow.model.enums.FlowStatusEnum;
 import com.jy.framework.satoken.LoginContext;
 import com.jy.framework.utils.AssertUtil;
-import com.warm.flow.core.dto.FlowParams;
-import com.warm.flow.core.entity.Instance;
-import com.warm.flow.core.entity.Task;
-import com.warm.flow.core.service.InsService;
-import com.warm.flow.core.service.TaskService;
-import com.warm.flow.orm.entity.FlowInstance;
-import com.warm.flow.orm.entity.FlowTask;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.core.service.TaskService;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.warm.flow.orm.entity.FlowTask;
 
 import java.util.Map;
 

jy-framework/pom.xml

@@ -98,8 +98,8 @@
         </dependency>
 
         <dependency>
-            <groupId>io.github.minliuhua</groupId>
-            <artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
+            <groupId>org.dromara.warm</groupId>
+            <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>com.baomidou</groupId>

jy-framework/src/main/java/com/jy/framework/exception/UnifiedExceptionHandler.java

@@ -9,11 +9,11 @@ import cn.hutool.http.HttpStatus;
 import com.jy.framework.model.base.R;
 import com.jy.framework.model.event.ExceptionEvent;
 import com.jy.framework.utils.ServletUtil;
-import com.warm.flow.core.exception.FlowException;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.warm.flow.core.exception.FlowException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.BindException;

jy-system/src/main/java/com/jy/system/service/impl/AuthServiceImpl.java

@@ -321,7 +321,7 @@ public class AuthServiceImpl implements AuthService {
         AssertUtil.notBlank(code, "验证码不能为空");
 
         // 获取验证码缓存key
-        String cacheCodeKey = RedisKey.getCaptchaCode(uuid.toLowerCase());
+        String cacheCodeKey = RedisKey.getCaptchaCode(uuid);
 
         // 获取验证码缓存值
         String cacheCode = RedisCache.get(cacheCodeKey);
@@ -331,7 +331,7 @@ public class AuthServiceImpl implements AuthService {
         RedisCache.delete(cacheCodeKey);
 
         // 比较验证码
-        AssertUtil.equals(code, cacheCode, "验证码错误");
+        AssertUtil.equals(code.toLowerCase(), cacheCode, "验证码错误");
     }
 
     /**

jy-ui/src/components/flow/PropertySetting/between.vue

@@ -138,11 +138,10 @@ const config: FormConfigType[] = [
     label: '监听器类型',
     multiple: true,
     option: [
-      { key: 'permission', label: '权限认证' },
-      { key: 'create', label: '任务创建' },
-      { key: 'start', label: '任务开始办理' },
-      { key: 'assignment', label: '分派监听器' },
-      { key: 'finish', label: '任务完成' }
+      { key: 'create', label: '创建' },
+      { key: 'start', label: '开始' },
+      { key: 'assignment', label: '分派' },
+      { key: 'finish', label: '完成' },
     ]
   },
   {

jy-ui/src/components/flow/PropertySetting/end.vue

@@ -45,8 +45,10 @@ const config: FormConfigType[] = [
     label: '监听器类型',
     multiple: true,
     option: [
-      { key: 'permission', label: '权限认证' },
-      { key: 'create', label: '任务创建' }
+      { key: 'create', label: '创建' },
+      { key: 'start', label: '开始' },
+      { key: 'assignment', label: '分派' },
+      { key: 'finish', label: '完成' }
     ]
   },
   {

jy-ui/src/components/flow/PropertySetting/index.vue

@@ -132,7 +132,7 @@ watch(
           ...n.properties,
           nodeName: n.text instanceof Object ? n.text.value : n.text,
           collaborativeWay: nodeRatioNumber == 0 ? '1' : nodeRatioNumber == 100 ? '3' : '2',
-          permissionFlagArr: permissionFlag === '' ? [] : (permissionFlag?.split(',') ?? []),
+          permissionFlagArr: permissionFlag === '' ? [] : (permissionFlag?.split('@@') ?? []),
           listenerTypeArr: listenerType === '' ? [] : (listenerType?.split(',') ?? []),
           nodeRatioNumber
         }
@@ -190,7 +190,7 @@ watch(
     // 监听节点属性变化并更新
     props.lf.setProperties(objId.value, {
       permissionFlagArr: n,
-      permissionFlag: n.join(',')
+      permissionFlag: n.join('@@')
     })
   }
 )

jy-ui/src/components/flow/PropertySetting/skip.vue

@@ -65,6 +65,10 @@ const config: FormConfigType[] = [
     label: '条件',
     option: [
       {
+        key: 'spel',
+        label: 'spel表达式'
+      },
+      {
         key: 'gt',
         label: '大于'
       },
@@ -95,10 +99,6 @@ const config: FormConfigType[] = [
       {
         key: 'notNike',
         label: '不包含'
-      },
-      {
-        key: 'spel',
-        label: 'spel表达式'
       }
     ],
     if: () => props.skipConditionShow,
@@ -116,10 +116,10 @@ const config: FormConfigType[] = [
 function updateSkipCondition() {
   const value = computedModelValue.value
 
-  let skipCondition = '@@' + value.conditionType + '@@|'
-  if (value.conditionType !== 'spel') {
-    skipCondition += (value.condition ?? '') + '@@' + value.conditionType + '@@'
+  let skipCondition = value.conditionType + "|";
+  if (!/^spel/.test(value.conditionType)) {
+    skipCondition += (value.condition ? value.condition : '') + "|";
   }
-  value.skipCondition = skipCondition + (value.conditionValue ?? '')
+  value.skipCondition = skipCondition + (value.conditionValue ? value.conditionValue : '')
 }
 </script>

jy-ui/src/components/flow/PropertySetting/start.vue

@@ -45,11 +45,10 @@ const config: FormConfigType[] = [
     label: '监听器类型',
     multiple: true,
     option: [
-      { key: 'permission', label: '权限认证' },
-      { key: 'create', label: '任务创建' },
-      { key: 'start', label: '任务开始办理' },
-      { key: 'assignment', label: '分派监听器' },
-      { key: 'finish', label: '任务完成' }
+      { key: 'create', label: '创建' },
+      { key: 'start', label: '开始' },
+      { key: 'assignment', label: '分派' },
+      { key: 'finish', label: '完成' }
     ]
   },
   {

jy-ui/src/views/flow/definition/index.vue

@@ -249,26 +249,10 @@ const formConfig: FormConfigType[] = [
     label: '监听器类型',
     multiple: true,
     option: [
-      {
-        key: 'create',
-        label: '任务创建'
-      },
-      {
-        key: 'start',
-        label: '任务开始办理'
-      },
-      {
-        key: 'assignment',
-        label: '分派监听器'
-      },
-      {
-        key: 'permission',
-        label: '权限认证'
-      },
-      {
-        key: 'finish',
-        label: '任务完成'
-      }
+      { key: 'create', label: '创建' },
+      { key: 'start', label: '开始' },
+      { key: 'assignment', label: '分派' },
+      { key: 'finish', label: '完成' }
     ]
   },
   {

pom.xml

@@ -27,7 +27,7 @@
         <easy-captcha.version>1.6.2</easy-captcha.version>
         <nashorn-core.version>15.4</nashorn-core.version>
         <beetl.version>3.17.0.RELEASE</beetl.version>
-        <warm-flow.version>1.2.10</warm-flow.version>
+        <warm-flow.version>1.3.7</warm-flow.version>
         <esdk-obs-java.version>3.24.9</esdk-obs-java.version>
     </properties>
 
@@ -120,9 +120,9 @@
             </dependency>
 
             <dependency>
-                <groupId>io.github.minliuhua</groupId>
+                <groupId>org.dromara.warm</groupId>
+                <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
                 <version>${warm-flow.version}</version>
-                <artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
             </dependency>
 
             <dependency>