From 3e83ba2e1d2db5e4ee1442e88bf67ff4700a8fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 4 Nov 2024 11:15:48 +0800
Subject: [PATCH] 'commit'

---
 .../base/Res/Controller/ResourceController.java     | 10 +++++-----
 .../com/dsideal/base/Res/Model/ResourceModel.java   | 10 +++++-----
 src/main/resources/logback.xml                      | 13 +++++++------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java
index 98fa23d7..57fe602e 100644
--- a/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java
+++ b/src/main/java/com/dsideal/base/Res/Controller/ResourceController.java
@@ -27,11 +27,11 @@ public class ResourceController extends Controller {
      *
      * @param type_id  文档类型，1：文档 (word,ppt,pdf等)，2：数据库(excel)
      * @param keyword 搜索关键词
-     * @param pageNum  第几页
-     * @param pageSize 每页几条
+     * @param page  第几页
+     * @param limit 每页几条
      */
     @Before(GET.class)
-    public void getZskPage(int type_id,String keyword, int pageNum, int pageSize) {
+    public void getZskPage(int type_id,String keyword, int page, int limit) {
         //根据上传人员ID获取他所隶属的行政区划ID
         String person_id = getCookie("person_id");
         //身份ID
@@ -39,8 +39,8 @@ public class ResourceController extends Controller {
         //行政区划码
         String area_code = rm.getAreaCode(identity_id, person_id);
 
-        Page<Record> page = rm.getZskPage(type_id,keyword,area_code, pageNum, pageSize);
-        renderJson(CommonUtil.renderJsonForLayUI(page));
+        Page<Record> list = rm.getZskPage(type_id,keyword,area_code, page, limit);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
     /**
diff --git a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java
index 5c52e025..f0fcb291 100644
--- a/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java
+++ b/src/main/java/com/dsideal/base/Res/Model/ResourceModel.java
@@ -53,10 +53,10 @@ public class ResourceModel {
     /**
      * 功能：获取知识库分页数据
      *
-     * @param pageNum
-     * @param pageSize
+     * @param page
+     * @param limit
      */
-    public Page<Record> getZskPage(int type_id, String keyword, String area_code, int pageNum, int pageSize) {
+    public Page<Record> getZskPage(int type_id, String keyword, String area_code, int page, int limit) {
         List<String> idList = new ArrayList<>();
 
         //1、如果是云南省:查看所有自己发布的文档，不管是省，市，县，都能看到全省的文档
@@ -80,8 +80,8 @@ public class ResourceModel {
         if (!StrKit.isBlank(keyword)) {
             kv.set("keyword", keyword);
         }
-        SqlPara sqlPara = Db.getSqlPara("Resource.getZskPage");
-        return Db.paginate(pageNum, pageSize, sqlPara);
+        SqlPara sqlPara = Db.getSqlPara("Resource.getZskPage",kv);
+        return Db.paginate(page, limit, sqlPara);
     }
 
 
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index c4d88022..2c24fb65 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
-    <!--关闭logback的INFO级别日志输出-->
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="/usr/local/tomcat8/logs"/>
     <!-- 控制台输出 -->
@@ -31,8 +29,11 @@
             <MaxFileSize>100MB</MaxFileSize>
         </triggeringPolicy>
     </appender>
-    <!--关闭HikariCP日志-->
-    <logger name="com.zaxxer.hikari.pool.PoolBase" level="ERROR"/>
-    <logger name="com.zaxxer.hikari.pool.HikariPool" level="ERROR"/>
-    <logger name="com.zaxxer.hikari.HikariDataSource" level="ERROR"/>
+
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+    </root>
+    <logger level="debug" additivity="false">
+    </logger>
 </configuration>
\ No newline at end of file