diff --git a/mcwl-framework/src/main/java/com/mcwl/framework/config/RedisConfig.java b/mcwl-framework/src/main/java/com/mcwl/framework/config/RedisConfig.java index 2eb4907..057f8e9 100644 --- a/mcwl-framework/src/main/java/com/mcwl/framework/config/RedisConfig.java +++ b/mcwl-framework/src/main/java/com/mcwl/framework/config/RedisConfig.java @@ -84,7 +84,7 @@ public class RedisConfig extends CachingConfigurerSupport standaloneConfig.setPassword(RedisPassword.of("MuYu_Cloud@Redis")); LettuceClientConfiguration lettuceClientConfig = LettuceClientConfiguration.builder() - .commandTimeout(Duration.ofSeconds(2)) + .commandTimeout(Duration.ofSeconds(10)) .shutdownTimeout(Duration.ZERO) .build(); diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java index 7c9379b..44b35e9 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java @@ -80,6 +80,7 @@ public class MemberServiceImpl extends ServiceImpl impleme lqw.eq(Member::getUserId, userId) // subscriptionStatus不为expired .ne(Member::getSubscriptionStatus, MemberEnum.MEMBER_CENTER_EXPIRED) + .ne(Member::getSubscriptionStatus, MemberEnum.MEMBER_CENTER_PENDING) .orderBy(true, false, Member::getEndDate); List memberList = baseMapper.selectList(lqw); Member member = new Member();