From 01b880e90c0f260a9baa4aac255ad32e1bfc8ec0 Mon Sep 17 00:00:00 2001
From: Ziin <hiziying@hotmail.com>
Date: Tue, 1 Jul 2025 21:03:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=BB=E6=92=AD=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20xml=EF=BC=8C=E6=B7=BB=E5=8A=A0=20logback=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/logback-spring.xml        | 68 ++++++++++++++++++++
 src/main/resources/mapper/NewHostsMapper.xml |  9 ++-
 2 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/logback-spring.xml

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..a0b3ba7
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds">
+    <!-- 日志上下文名称 -->
+    <contextName>TK-DataSave</contextName>
+
+    <!-- 日志输出格式 -->
+    <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%ex}"/>
+    <property name="FILE_PATTERN" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } | %thread %-40.40logger{39} | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%ex}"/>
+
+<!--    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n"/>-->
+    <!-- 日志文件路径 -->
+    <property name="LOG_FILE_PATH" value="${LOG_FILE:-${user.dir}}/tk-data-user"/>
+
+
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${PATTERN_DEFAULT}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 文件输出 (滚动策略: 按时间) -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_FILE_PATH}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_PATH}-%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>7</maxHistory>
+            <totalSizeCap>10MB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 开发环境配置 -->
+    <springProfile name="dev">
+        <root level="INFO">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILE"/>
+        </root>
+        <!-- 项目包日志级别 -->
+        <logger name="com.yupi.springbootinit" level="DEBUG" additivity="false">
+            <appender-ref ref="STDOUT"/>
+        </logger>
+        <!-- MyBatis日志级别 -->
+        <logger name="com.baomidou.mybatisplus" level="INFO"/>
+    </springProfile>
+
+    <!-- 生产环境配置 -->
+    <springProfile name="prod">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE"/>
+        </root>
+        <!-- 项目包日志级别 -->
+        <logger name="com.yupi.springbootinit" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE"/>
+        </logger>
+        <!-- 第三方框架日志级别 -->
+        <logger name="org.springframework" level="WARN"/>
+        <logger name="com.baomidou.mybatisplus" level="WARN"/>
+        <logger name="org.redisson" level="WARN"/>
+    </springProfile>
+
+
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/mapper/NewHostsMapper.xml b/src/main/resources/mapper/NewHostsMapper.xml
index 9d41ef5..4095f91 100644
--- a/src/main/resources/mapper/NewHostsMapper.xml
+++ b/src/main/resources/mapper/NewHostsMapper.xml
@@ -317,12 +317,12 @@
     <!-- 排序类型   -->
     order by
     <choose>
-    <!-- 传空和默认的情况下按照时间降序排序  -->
-      <when test="hostInfoDTO.sortName == '' or hostInfoDTO.sortName == null">
+      <!-- 传空和默认的情况下按照时间降序排序  -->
+      <when test="hostInfoDTO.sortName == '' and hostInfoDTO.sortName == null">
         ns.create_time  desc
       </when>
       <!-- sortNmae 有值的情况下排序  -->
-      <when test="hostInfoDTO.sortName != null or hostInfoDTO.sort != null ">
+      <when test="hostInfoDTO.sortName != null and hostInfoDTO.sort != null ">
         <if test="hostInfoDTO.sortName == 'createTime' and hostInfoDTO.sort != null">
           ns.create_time ${hostInfoDTO.sort}
         </if>
@@ -347,6 +347,9 @@
           ns.online_fans ${hostInfoDTO.sort}
         </if>
       </when>
+      <otherwise>
+        ns.create_time desc
+      </otherwise>
     </choose>
   </select>