From 41eabc21b55cd86155008f087f0b62426d997af6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 30 Dec 2024 16:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=A1=B5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/sys/oauth2/OAuth2Filter.java  | 24 ++++++-------------
 .../resources/mapper/course/CourseDao.xml     | 11 +--------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/sqx/modules/sys/oauth2/OAuth2Filter.java b/src/main/java/com/sqx/modules/sys/oauth2/OAuth2Filter.java
index c13b6713..1a546607 100644
--- a/src/main/java/com/sqx/modules/sys/oauth2/OAuth2Filter.java
+++ b/src/main/java/com/sqx/modules/sys/oauth2/OAuth2Filter.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 
 /**
  * oauth2过滤器
- *
  */
 public class OAuth2Filter extends AuthenticatingFilter {
 
@@ -32,7 +31,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
         //获取请求token
         String token = getRequestToken((HttpServletRequest) request);
 
-        if(StringUtils.isBlank(token)){
+        if (StringUtils.isBlank(token)) {
             return null;
         }
 
@@ -41,7 +40,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
 
     @Override
     protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
-        if(((HttpServletRequest) request).getMethod().equals(RequestMethod.OPTIONS.name())){
+        if (((HttpServletRequest) request).getMethod().equals(RequestMethod.OPTIONS.name())) {
             return true;
         }
 
@@ -52,7 +51,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
         //获取请求token，如果token不存在，直接返回401
         String token = getRequestToken((HttpServletRequest) request);
-        if(StringUtils.isBlank(token)){
+        if (StringUtils.isBlank(token)) {
             HttpServletResponse httpResponse = (HttpServletResponse) response;
             httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
             httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
@@ -63,17 +62,8 @@ public class OAuth2Filter extends AuthenticatingFilter {
 
             return false;
         }
-        try{
-            return executeLogin(request, response);
-        }catch (AbstractMethodError e){
-            if (e.getMessage().contains("sessionCreated")) {
-                logger.error(e.getMessage());
-                return false;
-            }else {
-                logger.error(e.getMessage());
-                return false;
-            }
-        }
+        return executeLogin(request, response);
+
     }
 
     @Override
@@ -99,12 +89,12 @@ public class OAuth2Filter extends AuthenticatingFilter {
     /**
      * 获取请求的token
      */
-    private String getRequestToken(HttpServletRequest httpRequest){
+    private String getRequestToken(HttpServletRequest httpRequest) {
         //从header中获取token
         String token = httpRequest.getHeader("token");
 
         //如果header中不存在token，则从参数中获取token
-        if(StringUtils.isBlank(token)){
+        if (StringUtils.isBlank(token)) {
             token = httpRequest.getParameter("token");
         }
 
diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml
index a8118457..d85de90f 100644
--- a/src/main/resources/mapper/course/CourseDao.xml
+++ b/src/main/resources/mapper/course/CourseDao.xml
@@ -185,9 +185,6 @@
         (select sum(o.pay_money) from orders o where o.course_id=c.course_id and o.status=1) as payMoney,
         (select sum(good_num) from course_details d where d.course_id=c.course_id ) as goodNum,
         (select count(*) from course_details d where d.course_id=c.course_id ) as courseDetailsCount,
-        (select count(*) from course_collect d where d.course_id=c.course_id
-        and date_format(create_time,'%Y-%m-%d')>=date_format(#{startTime},'%Y-%m-%d') and
-        date_format(create_time,'%Y-%m-%d')&lt;=date_format(#{endTime},'%Y-%m-%d') ) as weekGoodNum,
         (select count(*) from course_details cd where c.course_id=cd.course_id and cd.good=1 ) as isRecommend
         FROM
         course AS c
@@ -217,7 +214,7 @@
         <if test='null!= bannerId and bannerId!=0'>
             and c.banner_id = #{bannerId}
         </if>
-        <if test="classifyId==0">
+        <if test="classifyId!=null and classifyId==0">
             and c.is_recommend=1
         </if>
         <if test="over!=null and over==1">
@@ -244,12 +241,6 @@
         <if test="sort==null">
             order by c.sort asc,c.create_time desc
         </if>
-        <if test="sort!=null and sort==1">
-            order by goodNum desc
-        </if>
-        <if test="sort!=null and sort==2">
-            order by weekGoodNum desc
-        </if>
     </select>
 
     <select id="selectCourseTitle" resultType="Map">