From 6826d59ad7f699905e3f84620d7253e42d521687 Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Wed, 22 Mar 2023 10:43:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=89=B4=E6=9D=83?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/huoran/iasf/common/shiro/ShiroConfig.java    | 1 +
 .../huoran/iasf/service/impl/SysColumnServiceImpl.java    | 2 +-
 .../huoran/iasf/service/impl/SysContentServiceImpl.java   | 2 +-
 src/main/resources/application-dev.yml                    | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java b/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java
index 4b81507..5fcb3c2 100644
--- a/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java
+++ b/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java
@@ -141,6 +141,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sysColumn/getTheFullArticleByColumn", "anon");
         filterChainDefinitionMap.put("/sys/exportFailure", "anon");
         filterChainDefinitionMap.put("/sysColumnLongPage/getRedisCache", "anon");
+        filterChainDefinitionMap.put("/content/classification/allTheQuery", "anon");
         /*filterChainDefinitionMap.put("/index/**", "anon");
         filterChainDefinitionMap.put("/doc.html", "anon");
         filterChainDefinitionMap.put("/swagger-resources/**", "anon");
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
index 7f909ca..b537063 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
@@ -95,7 +95,7 @@ public class SysColumnServiceImpl extends ServiceImpl<SysColumnMapper, SysColumn
 
         if(column.getRole()==null){
 
-        }else if (column.getRole()!=null||column.getRole().equals("admin") || ObjectUtil.isNotNull(column.isIsadmin()) || column.isIsadmin()){
+        }else if (column.getRole()!=null&&column.getRole().equals("admin") || ObjectUtil.isNotNull(column.isIsadmin()) && column.isIsadmin()){
             throw new IllegalArgumentException("参数名不能包含admin");
         }
         //查询所有栏目
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
index 109867d..9517e9f 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
@@ -77,7 +77,7 @@ public class SysContentServiceImpl extends ServiceImpl<SysContentMapper, SysCont
     public R newlyPublishedArticles(PageContentReqVO reqVO) {
         if(reqVO.getRole()==null){
 
-        }else if (reqVO.getRole()!=null||reqVO.getRole().equals("admin") || ObjectUtil.isNotNull(reqVO.isIsadmin()) || reqVO.isIsadmin()){
+        }else if (reqVO.getRole()!=null&&reqVO.getRole().equals("admin") || ObjectUtil.isNotNull(reqVO.isIsadmin()) && reqVO.isIsadmin()){
             throw new IllegalArgumentException("参数名不能包含admin");
         }
         Page<PageContentRespVO> page = new Page<PageContentRespVO>(reqVO.getPageNum(), reqVO.getPageSize());
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3ba0eee..32b1191 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,11 +6,11 @@ spring:
       datasource:
         master:
           username: root
-          password: 123456
-#          password: iasf#2022
+#          password: 123456
+          password: iasf#2022
           driver-class-name: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://127.0.0.1:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
-          url: jdbc:mysql://192.168.31.136:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
+          url: jdbc:mysql://127.0.0.1:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
+#          url: jdbc:mysql://192.168.31.136:3306/iasf?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8
   cache:
     type: redis
   redis:

From 013178aeb162e7e8012e32b4359a57c434cf69f3 Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Wed, 22 Mar 2023 11:18:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java | 2 +-
 .../com/huoran/iasf/service/impl/SysContentServiceImpl.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
index b537063..7f909ca 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
@@ -95,7 +95,7 @@ public class SysColumnServiceImpl extends ServiceImpl<SysColumnMapper, SysColumn
 
         if(column.getRole()==null){
 
-        }else if (column.getRole()!=null&&column.getRole().equals("admin") || ObjectUtil.isNotNull(column.isIsadmin()) && column.isIsadmin()){
+        }else if (column.getRole()!=null||column.getRole().equals("admin") || ObjectUtil.isNotNull(column.isIsadmin()) || column.isIsadmin()){
             throw new IllegalArgumentException("参数名不能包含admin");
         }
         //查询所有栏目
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
index c829d55..b7f4356 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
@@ -82,7 +82,7 @@ public class SysContentServiceImpl extends ServiceImpl<SysContentMapper, SysCont
     public R newlyPublishedArticles(PageContentReqVO reqVO) {
         if(reqVO.getRole()==null){
 
-        }else if (reqVO.getRole()!=null&&reqVO.getRole().equals("admin") || ObjectUtil.isNotNull(reqVO.isIsadmin()) && reqVO.isIsadmin()){
+        }else if (reqVO.getRole()!=null||reqVO.getRole().equals("admin") || ObjectUtil.isNotNull(reqVO.isIsadmin()) || reqVO.isIsadmin()){
             throw new IllegalArgumentException("参数名不能包含admin");
         }
         Page<PageContentRespVO> page = new Page<PageContentRespVO>(reqVO.getPageNum(), reqVO.getPageSize());