From 8e1c96e58fa47e15e0ea5ad9b9da404eb3c57e56 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 三月 2025 19:36:58 +0800
Subject: [PATCH] xiugai
---
ruoyi-admin/src/main/resources/application-test.yml | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 7 ++-----
ruoyi-common/pom.xml | 13 ++++++-------
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 7e3b361..14887f4 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -162,7 +162,7 @@
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
- expireTime: 1
+ expireTime: 120
mybatis-plus:
# 此处在多数据源中生效
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index c0480b3..99ab005 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -144,10 +144,15 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!--mybatis-plus-->
+<!-- <dependency>-->
+<!-- <groupId>com.baomidou</groupId>-->
+<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!-- <version>3.5.2</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.5.2</version>
+ <version>3.5.7</version>
</dependency>
<!--lombok-->
<dependency>
@@ -192,12 +197,6 @@
<groupId>com.aizuda</groupId>
<artifactId>flowlong-spring-boot-starter</artifactId>
<version>1.0.4</version>
-<!-- <exclusions>-->
-<!-- <exclusion>-->
-<!-- <groupId>com.baomidou</groupId>-->
-<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!-- </exclusion>-->
-<!-- </exclusions>-->
</dependency>
<!-- hutool-->
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index e17245c..6ae87fc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -1003,11 +1003,8 @@
Long taskId = Long.valueOf(processRefuseBO.getTaskId());
FlwTask flwTask = flwTaskMapper.selectById(taskId);
// 直接拒绝当前流程
- try{
-// flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
- }catch (Exception e){
- System.out.println("拒绝流程");
- }
+ flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
+ flwTaskMapper.deleteById(taskId);
// 动作执行记录
StateProcessInstanceAction record = new StateProcessInstanceAction();
record.setId(IdUtils.simpleUUID());
--
Gitblit v1.7.1