From c536752f14fa7dcf4fe5aa718a5a6b4c1f2df743 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 19 Mar 2024 14:15:11 +0800
Subject: [PATCH] 1

---
 .../peanut/modules/book/service/impl/BuyOrderServiceImpl.java | 2 +-
 src/main/java/com/peanut/modules/sys/oauth2/OAuth2Realm.java  | 3 +++
 src/main/resources/logback-spring.xml                         | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

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<BuyOrderDao, BuyOrder> impl
     public Page<BuyOrder> getUserOrderList(UserOrderDto userOrderDto) {
         LambdaQueryWrapper<BuyOrder> 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 @@
 
     <springProfile name="dev,dev1">
         <include resource="org/springframework/boot/logging/logback/base.xml" />
-<!--        <logger name="org.springframework.web" level="DEBUG"/>-->
-<!--        <logger name="org.springboot.sample" level="DEBUG" />-->
+        <logger name="org.springframework.web" level="DEBUG"/>
+        <logger name="org.springboot.sample" level="DEBUG" />
         <logger name="com.peanut" level="DEBUG" additivity="false">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>