优化图片上传和日志报文全面

ruoyi-admin/src/main/resources/logback.xml

@@ -11,7 +11,7 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -25,16 +25,9 @@
 		<encoder>
 			<pattern>${log.pattern}</pattern>
 		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
+		<!-- 移除过滤器，接受所有级别的日志 -->
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -47,16 +40,9 @@
         <encoder>
             <pattern>${log.pattern}</pattern>
         </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
+        <!-- 移除过滤器，接受所有级别的日志 -->
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -70,24 +56,21 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.ruoyi" level="debug" />
 	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+	<logger name="org.springframework" level="info" />
 
-	<root level="info">
+	<!-- 根日志级别控制 -->
+	<root level="debug">
 		<appender-ref ref="console" />
+		<appender-ref ref="file_info" />
+		<appender-ref ref="file_error" />
 	</root>
-	
-	<!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info" />
-        <appender-ref ref="file_error" />
-    </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
+</configuration>

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -234,6 +234,11 @@ public class CommunityArticleController extends BaseController {
             boolean isFillWater = communityArticle.isFillWater();
             log.info("isWaterMark:{},isFillWater:{},Images:{}", isWaterMark, isFillWater, communityArticle.getImages());
             if (isWaterMark && null != communityArticle.getImages()) {
+                for (CommunityImagesVo image : communityArticle.getImages()) {
+                    if (null == image) {
+                        throw new RuntimeException("图片上传失败!");
+                    }
+                }
                 log.info("需要做图片/视频修改...");
                 //获取用户名
                 String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
@@ -899,8 +904,6 @@ public class CommunityArticleController extends BaseController {
     }
 
 
-
-
     @ApiOperation("查询用户")
     @GetMapping("/userList")
     public AjaxResult userList(String SearchValue) {
@@ -1562,7 +1565,7 @@ public class CommunityArticleController extends BaseController {
             } else {
                 communityArticleService.update(new UpdateWrapper<CommunityArticle>()
                         .set("is_top", false)
-                        .set("top_time",null)
+                        .set("top_time", null)
                         .eq("id", communityArticle.getId()));
                 msg = "已取消置顶";
             }
@@ -1585,7 +1588,7 @@ public class CommunityArticleController extends BaseController {
                 updateWrapper.eq("user_id", userId)
                         .eq("is_top", 1)
                         .notIn("id", communityArticles.stream().map(CommunityArticle::getId).collect(Collectors.toList()))
-                        .set("top_time",null)
+                        .set("top_time", null)
                         .set("is_top", false); // 将 is_top 设置为 false
 
                 communityArticleMapper.update(null, updateWrapper);