权限控制优化

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java

@@ -121,12 +121,14 @@ public class RmResourceRemoteServiceImpl implements IRmResourceRemoteService
         for (RmResourceRemote resourceRemote : reslutList) {
             // 脚本执行返回结果
             JSONObject jsonObject = JSONObject.parseObject(resourceRemote.getDescription());
-            String command = jsonObject.getString("command");
-            String resOut = jsonObject.getString("resOut");
-            String sucOrFail = (!"".equals(resOut) && !"脚本执行失败".equals(resOut)) ? "\n执行成功，\n":"\n执行失败，\n";
             StringBuilder resultSb = new StringBuilder();
-            resultSb.append("【").append(resourceRemote.getClientId()).append("】脚本执行命令：\n")
-                    .append(command).append(sucOrFail).append("执行结果如下：\n").append(resOut);
+            if(jsonObject != null){
+                String command = jsonObject.getString("command");
+                String resOut = jsonObject.getString("resOut");
+                String sucOrFail = (!"".equals(resOut) && !"脚本执行失败".equals(resOut)) ? "\n执行成功，\n":"\n执行失败，\n";
+                resultSb.append("【").append(resourceRemote.getClientId()).append("】脚本执行命令：\n")
+                        .append(command).append(sucOrFail).append("执行结果如下：\n").append(resOut);
+            }
             Map<String,Object> map = new HashMap<>();
             Date createTime = resourceRemote.getCreateTime();
             String createTimeStr = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", createTime);

tongran-rocketmq/src/main/resources/logback.xml

@@ -57,6 +57,26 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
+    <!-- 简化版debug.log配置，只包含日志框架的输出 -->
+    <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/debug.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <!-- 记录DEBUG及以上级别，但不记录ERROR（ERROR有单独文件） -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>NEUTRAL</onMismatch>
+        </filter>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>DEBUG</level>
+        </filter>
+    </appender>
 
 
     <!-- RocketMQ模块日志级别控制 -->

tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml

@@ -43,6 +43,7 @@
             <if test="clientId != null  and clientId != ''"> and client_id = #{clientId}</if>
             <if test="resultFlag != null "> and result_flag = #{resultFlag}</if>
             <if test="scriptId != null "> and script_id = #{scriptId}</if>
+            and script_id != ''
         </where>
         <choose>
             <when test="clientId != null and clientId != ''">