From 141b787fd7ef8994ad021a7dcfd548923a3c53b9 Mon Sep 17 00:00:00 2001
From: NiuZiYuan <niuziyuan@jizhiweb.cn>
Date: Fri, 23 May 2025 11:25:07 +0800
Subject: [PATCH] dev

---
 .../common/config/ControllerAspect.java       |  6 +-
 .../clinic/server/common/util/HttpUtil.java   |  4 +-
 .../service/diagnosis/DiagnosisService.java   |  5 +-
 src/main/resources/logback-spring.xml         | 61 +++++++++++++++----
 4 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java b/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java
index 4bd3f60..6f16676 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java
@@ -42,7 +42,11 @@ public class ControllerAspect {
             result.setData(null);
             result.setCode(101);
             log.error(e.getMessage());
-            e.printStackTrace();
+            String isDev = System.getenv("IsDev");
+            if (isDev != null &&isDev.equals("true")) {
+                e.printStackTrace();
+            }
+
             return result;
         }
     }
diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java
index 41d4169..6cf4bfe 100644
--- a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java
+++ b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java
@@ -79,7 +79,9 @@ public class HttpUtil {
         }
         logger.info("调用医保请求出参==》" + result);
         JSONObject result_json = JSON.parseObject(result);
-
+        if(result_json==null||result_json.isEmpty()){
+            throw new MessageException("医保接口返回数据异常");
+        }
         if (!result_json.getString("err_msg").equals("成功") &&!result_json.getString("err_msg").equals("success") && !result_json.getString("err_msg").isEmpty()) {
             throw new MessageException(result_json.getString("err_msg"));
         }
diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java
index d8a3866..734214c 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java
@@ -99,10 +99,7 @@ public class DiagnosisService extends BaseService {
     @Autowired
     private SocialDiagnoseService socialDiagnoseService;
 
-    /*
-     * 保存
-     * @param saveDto 病历信息
-     */
+
     @Transactional(rollbackFor = Exception.class)
     public void save(MedicalRecordSaveDto saveDto) {
         if (saveDto == null){
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index e4bc473..9f31795 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 定义日志文件的路径和名称 -->
-    <property name="LOG_FILE" value="${user.dir}/logs/base/app.log"/>
-    <property name="REQUEST_FILE" value="${user.dir}/logs/request/app.log"/>
 
     <!-- 控制台输出 -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
@@ -11,7 +9,7 @@
         </encoder>
     </appender>
     <appender name="REQUEST" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${REQUEST_FILE}</file>
+        <file>${user.dir}/logs/request/app.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件按天滚动 -->
             <fileNamePattern>${user.dir}/logs/request/app.%d{yyyy-MM-dd}.log</fileNamePattern>
@@ -23,13 +21,11 @@
         </encoder>
         <immediateFlush>true</immediateFlush>
     </appender>
-
-    <!-- 文件输出 -->
-    <appender name="DEFAULT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE}</file>
+    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${user.dir}/logs/info/app.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件按天滚动 -->
-            <fileNamePattern>${user.dir}/logs/base/app.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${user.dir}/logs/info/app.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 保留 30 天的历史日志 -->
             <maxHistory>30</maxHistory>
 
@@ -37,16 +33,55 @@
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- 文件输出 -->
+    <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${user.dir}/logs/warn/app.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件按天滚动 -->
+            <fileNamePattern>${user.dir}/logs/warn/app.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 保留 30 天的历史日志 -->
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${user.dir}/logs/error/app.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件按天滚动 -->
+            <fileNamePattern>${user.dir}/logs/error/app.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 保留 30 天的历史日志 -->
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
     </appender>
 
     <logger name="com.syjiaer.clinic.server.common.util.HttpUtil" level="info" additivity="false">
-<!--        <appender-ref ref="CONSOLE"/>-->
         <appender-ref ref="REQUEST"/>
     </logger>
-
-    <!-- 根日志记录器 -->
-    <root level="WARN">
+    <root level="INFO">
         <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="DEFAULT"/>
+        <appender-ref ref="INFO"/>
+        <appender-ref ref="WARN"/>
+        <appender-ref ref="ERROR"/>
     </root>
 </configuration>
\ No newline at end of file