From ca73715f46861fa181f25c70f9b4674ddbcfe44c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 1 Nov 2024 16:59:36 +0800
Subject: [PATCH] 'commit'

---
 pom.xml                                          | 16 ++++++++++++++++
 .../com/dsideal/base/Tools/SelectNoXzqh.java     | 12 ++++++------
 src/main/resources/logback.xml                   | 13 ++++++-------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13923783..31210a58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,23 @@
             <version>2.4</version>
             <classifier>jdk15</classifier>
         </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/log4j/log4j -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.25</version>
+        </dependency>
         <!--日志logback-->
         <dependency>
             <groupId>ch.qos.logback</groupId>
diff --git a/src/main/java/com/dsideal/base/Tools/SelectNoXzqh.java b/src/main/java/com/dsideal/base/Tools/SelectNoXzqh.java
index 33238432..b988fbf9 100644
--- a/src/main/java/com/dsideal/base/Tools/SelectNoXzqh.java
+++ b/src/main/java/com/dsideal/base/Tools/SelectNoXzqh.java
@@ -2,17 +2,15 @@ package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Plugin.YamlProp;
-import com.dsideal.base.Util.ExcelCommonUtil;
 import com.jfinal.kit.Prop;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
-
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 public class SelectNoXzqh {
@@ -60,9 +58,10 @@ public class SelectNoXzqh {
         int cnt = 0;
         for (Record record : list2) {
             String tableName = record.getStr("table_name");
+            String dataSetName = record.getStr("dataset_name");
             //这张表中存在行政区划的列名，就跳过，不处理
             if (!dm.hasXzqhColumn(tableName)) {
-                System.out.println("表：" + tableName + "没有行政区划的列名，请手动添加");
+                System.out.println(dataSetName + "表：" + tableName + "没有行政区划的列名，请手动添加");
                 cnt++;
             }
             //否则提醒出来：当前表没有行政区划的列名，需要手动添加
@@ -72,9 +71,10 @@ public class SelectNoXzqh {
         cnt = 0;
         for (Record record : list3) {
             String tableName = record.getStr("table_name");
+            String dataSetName = record.getStr("dataset_name");
             //这张表中存在行政区划的列名，就跳过，不处理
             if (!dm.hasXzqhColumn(tableName)) {
-                System.out.println("表：" + tableName + "没有行政区划的列名，请手动添加");
+                System.out.println(dataSetName + "表：" + tableName + "没有行政区划的列名，请手动添加");
                 cnt++;
             }
         }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 2c24fb65..c4d88022 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,5 +1,7 @@
 <?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"/>
     <!-- 控制台输出 -->
@@ -29,11 +31,8 @@
             <MaxFileSize>100MB</MaxFileSize>
         </triggeringPolicy>
     </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </root>
-    <logger level="debug" additivity="false">
-    </logger>
+    <!--关闭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"/>
 </configuration>
\ No newline at end of file