diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2913514..c88af08 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -106,7 +106,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期(默认30分钟) - expireTime: 30000 + expireTime: 10080 # MyBatisPlus配置 # https://baomidou.com/config/ diff --git a/ruoyi-system/src/main/java/com/ruoyi/common/util/SseUtil.java b/ruoyi-system/src/main/java/com/ruoyi/common/util/SseUtil.java index 471ea8e..7363679 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/common/util/SseUtil.java +++ b/ruoyi-system/src/main/java/com/ruoyi/common/util/SseUtil.java @@ -26,7 +26,7 @@ public class SseUtil { public static final String ZBF_PREFIX = "zbf-"; public static SseEmitter subscribe(String userId,String prefix) { // Spring Boot 2.4.7中SseEmitter构造函数支持超时时间(单位:毫秒) 30 * 60 - SseEmitter emitter = new SseEmitter(30 * 60 * 1000L); // 30分钟超时 + SseEmitter emitter = new SseEmitter(10080 * 60 * 1000L); // 7天过期 与token同步 // 存储emitter并设置回调(2.4.7中回调机制与主流版本一致) String key = prefix + "-" +userId; diff --git a/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectMapper.xml b/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectMapper.xml index a8af119..f5ada5b 100644 --- a/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectMapper.xml @@ -96,10 +96,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" project_img, project_status FROM zbf_project zp - where zp.id in (select zpsa.project_id from zbf_project_subcontracting_apply zpsa + where zp.id in (select zpsa.project_id from zbf_project_subcontracting_apply zpsa where zpsa.fbs_user_id = #{dto.fbsUserId} - and zpsa.apply_status in ('0','1') - ) + + and zpsa.apply_status = '0' + + + and zpsa.apply_status = '1' + + ) + + and zp.project_status = '1' + + + and zp.project_status = '2' + order by zp.id desc