From c046e0c3fb50cef65be071028e93fcfdbc2d3b6a Mon Sep 17 00:00:00 2001
From: dazer007 <ab601026460@163.com>
Date: Fri, 24 Jan 2025 11:12:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20logback=E6=97=A5=E5=BF=97=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/neuhis/his/service/impl/OracleSysServiceImpl.java | 4 ++--
 ruoyi-admin/src/main/resources/logback.xml                | 8 ++++++--
 .../src/main/resources/mapper/his/OracleSysMapper.xml     | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/OracleSysServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/OracleSysServiceImpl.java
index fd2b3626d..b9fa6581b 100644
--- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/OracleSysServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/OracleSysServiceImpl.java
@@ -36,10 +36,10 @@ public class OracleSysServiceImpl implements IOracleSysService {
     @Override
     public List<DeadLockRac> getDeadLockSessionV2Rac() {
         List<DeadLockRac> deadLockRacs = oracleSysMapper.getDeadLockSessionV2Rac();
-        deadLockRacs.add(new DeadLockRac(1, "根锁为此会话杀我KILL ME or igore", "001"));
+        /*deadLockRacs.add(new DeadLockRac(1, "根锁为此会话杀我KILL ME or igore", "001"));
         deadLockRacs.add(new DeadLockRac(5728, "<根锁会话>4903 【SID=4903】的SQL阻塞了本语句[5728]杀掉他", "5728"));
         deadLockRacs.add(new DeadLockRac(2222, "<根锁会话>1111 【SID=1111】的SQL阻塞了本语句[2222]杀掉他", "5728"));
-        deadLockRacs.add(new DeadLockRac(3333, "<根锁会话>1 【SID=1】的SQL阻塞了本语句[3333]杀掉他", "5728"));
+        deadLockRacs.add(new DeadLockRac(3333, "<根锁会话>1 【SID=1】的SQL阻塞了本语句[3333]杀掉他", "5728"));*/
         return this.findV2DeadLockRacSessionId(deadLockRacs);
     }
 
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index 1722d984c..7df4b6633 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+<!--    不定义日志目录，存放当前目录： log.path_IS_UNDEFINED -->
+    <!--定义日志文件的存储地址(linux 服务器可根据硬盘大小自行更改目录)-->
+    <!--<property name="log.path" value="/home/ruoyi/logs" />-->
+    <!--<property name="log.path" value="/data/log/app" />-->
+
     <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+	<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSSZ} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
 	<!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/ruoyi-admin/src/main/resources/mapper/his/OracleSysMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/OracleSysMapper.xml
index bece6f8d5..c75777da1 100644
--- a/ruoyi-admin/src/main/resources/mapper/his/OracleSysMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/his/OracleSysMapper.xml
@@ -167,8 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                               ) t -- 包裹一层，避免杀进程语句重复
         ]]>
     </select>
-
     <update id="killSession" parameterType="java.lang.String">
+
         alter system kill session '${sessionStr}'
     </update>
 </mapper>
\ No newline at end of file