diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 27771082..7e0b5771 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -462,7 +462,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl public Page getUserOrderList(UserOrderDto userOrderDto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(BuyOrder::getUserId,userOrderDto.getUserId()); - wrapper.eq(BuyOrder::getOrderType,"order"); +// wrapper.eq(BuyOrder::getOrderType,"order");//这里有点问题 if(userOrderDto.getOrderStatus()==null){ Integer[] sts = {0,1,2,3}; wrapper.in(BuyOrder::getOrderStatus,sts); diff --git a/src/main/java/com/peanut/modules/sys/oauth2/OAuth2Realm.java b/src/main/java/com/peanut/modules/sys/oauth2/OAuth2Realm.java index 76e401fb..10fd447b 100644 --- a/src/main/java/com/peanut/modules/sys/oauth2/OAuth2Realm.java +++ b/src/main/java/com/peanut/modules/sys/oauth2/OAuth2Realm.java @@ -19,6 +19,7 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; import java.util.Date; @@ -35,6 +36,8 @@ public class OAuth2Realm extends AuthorizingRealm { private ShiroService shiroService; @Autowired private SysUserTokenService sysUserTokenService; + @Autowired + private Environment environment; @Override public boolean supports(AuthenticationToken token) { diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index af0788f7..1a298c87 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -188,8 +188,8 @@ - - + +