From 5181881febfdb0e41a5cf7aaccf812acdef4e58c Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 14 Jun 2024 16:18:52 +0800 Subject: [PATCH] =?UTF-8?q?Token=E4=B8=BA=E7=A9=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/dal/mysql/goods/GoodsMapper.java | 7 +++++-- .../service/oauth2/OAuth2TokenServiceImpl.java | 15 ++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java index 6ddeef763..041d35146 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java @@ -11,6 +11,8 @@ import org.apache.ibatis.annotations.Mapper; import com.cf.imes.module.executor.controller.admin.goods.vo.*; import org.apache.ibatis.annotations.Param; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; + /** * 生产单商品 Mapper * @@ -21,6 +23,7 @@ public interface GoodsMapper extends BaseMapperX { default PageResult selectPage(GoodsPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(GoodsDO::getOrganId,getUserOrganId()) .eqIfPresent(GoodsDO::getOrderId, reqVO.getOrderId()) .eqIfPresent(GoodsDO::getRawGoodsId, reqVO.getRawGoodsId()) .eqIfPresent(GoodsDO::getGoodsId, reqVO.getGoodsId()) @@ -39,9 +42,9 @@ public interface GoodsMapper extends BaseMapperX { } - List selectGoodsList(@Param("orderId") Long orderId); + List selectGoodsList(@Param("orderId") Long orderId,@Param("organId") Long organId); - List selectGoodsListByOrderIds(@Param("orderIds") List orderIds); + List selectGoodsListByOrderIds(@Param("orderIds") List orderIds, @Param("organId") Long organId); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImpl.java index 482c1a9f0..266bda1a6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/oauth2/OAuth2TokenServiceImpl.java @@ -109,10 +109,11 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService { // 数据库移除令牌存入，所以直接从缓存中获取 OAuth2AccessTokenDO accessTokenDO = oauth2AccessTokenRedisDAO.get(accessToken); - // 有令牌的校验，代表有接口访问，延长令牌的过期时间（30分钟） - oauth2AccessTokenRedisDAO.set(accessTokenDO.setExpiresTime(LocalDateTime.now().plusSeconds(1800))); - - return oauth2AccessTokenRedisDAO.get(accessToken); + if(accessTokenDO != null){ + // 有令牌的校验，代表有接口访问，延长令牌的过期时间（30分钟） + oauth2AccessTokenRedisDAO.set(accessTokenDO.setExpiresTime(LocalDateTime.now().plusSeconds(1800))); + } + return accessTokenDO; } @Override @@ -121,9 +122,9 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService { if (accessTokenDO == null) { throw exception0(GlobalErrorCodeConstants.UNAUTHORIZED.getCode(), "访问令牌不存在"); } - if (DateUtils.isExpired(accessTokenDO.getExpiresTime())) { - throw exception0(GlobalErrorCodeConstants.UNAUTHORIZED.getCode(), "访问令牌已过期"); - } +// if (DateUtils.isExpired(accessTokenDO.getExpiresTime())) { +// throw exception0(GlobalErrorCodeConstants.UNAUTHORIZED.getCode(), "访问令牌已过期"); +// } return accessTokenDO; }