add:添加日志删除功能

nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/controller/log/LuceneLogController.java

@@ -39,7 +39,7 @@ public class LuceneLogController {
     }
     @DeleteMapping("/clearLogs")
     //("清空日志")
-    public ResponseEntity<Object> clearLogs(@RequestBody LogQuery query) {
+    public ResponseEntity<Object> clearLogs(@RequestBody(required = false) LogQuery query) {
         luceneLogService.clearLogs(query);
         return new ResponseEntity<>(HttpStatus.OK);
     }

nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/logserver/LogQuery.java

@@ -44,4 +44,9 @@ public class LogQuery {
     private Integer size = 20;
 
     private Integer page = 1;
+
+    /**
+     * 日志保留天数，null 或 0 表示全部删除
+     */
+    private Integer retainDays;
 }

nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogServiceImpl.java

@@ -28,7 +28,6 @@ import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -46,13 +45,20 @@ public class LuceneLogServiceImpl implements LuceneLogService {
         try {
             IndexWriter indexWriter = LuceneAppender.indexWriter;
             if (indexWriter != null){
-                BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+                Integer retainDays = query == null ? null : query.getRetainDays();
-                DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, -10);
+                Query deleteQuery;
-                TermRangeQuery termRangeQuery = new TermRangeQuery(
+                if (retainDays == null || retainDays <= 0) {
-                        "requestTime",null,
+                    deleteQuery = new MatchAllDocsQuery();
-                        new BytesRef(DateUtil.format(offset, "yyyy-MM-dd HH:mm:ss.SSS")), true, true);
+                } else {
-                booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST);
+                    DateTime cutoff = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -retainDays);
-                indexWriter.deleteDocuments(termRangeQuery);
+                    deleteQuery = new TermRangeQuery(
+                            "requestTime",
+                            null,
+                            new BytesRef(DateUtil.format(cutoff, "yyyy-MM-dd HH:mm:ss.SSS")),
+                            true,
+                            true);
+                }
+                indexWriter.deleteDocuments(deleteQuery);
                 indexWriter.commit();
             }
         }catch (Exception ex){

nladmin-ui/src/views/lucene/api/lucene.js

@@ -14,10 +14,11 @@ export function getTagName() {
     method: 'post'
   })
 }
-export function deleteAllLog() {
+export function deleteAllLog(data) {
   return request({
     url: 'api/lucene/clearLogs',
-    method: 'post'
+    method: 'delete',
+    data
   })
 }
 

nladmin-ui/src/views/lucene/index.vue

@@ -59,20 +59,41 @@
           <el-button type="primary" size="mini" @click="queryData">
             {{ $t('common.Query') }}
           </el-button>
+          <el-button type="danger" size="mini" @click="clearDialogVisible = true">
+            清除日志
+          </el-button>
         </el-form-item>
       </el-form>
     </div>
+    <el-dialog
+      title="清除日志"
+      :visible.sync="clearDialogVisible"
+      width="360px"
+    >
+      <el-radio-group v-model="clearOption" class="clear-log-options">
+        <el-radio label="all">全部删除</el-radio>
+        <el-radio :label="3">保留3天</el-radio>
+        <el-radio :label="5">保留5天</el-radio>
+        <el-radio :label="7">保留7天</el-radio>
+      </el-radio-group>
+      <span slot="footer">
+        <el-button size="mini" @click="clearDialogVisible = false">取 消</el-button>
+        <el-button type="danger" size="mini" :loading="clearLoading" @click="handleClearLogs">
+          确 定
+        </el-button>
+      </span>
+    </el-dialog>
     <!--表格渲染-->
     <el-card shadow="hover" style="width: 100%" class="log-warpper">
       <div class="log-list">
         <div v-for="(log, index) in logs" :key="index" class="log-item">
           <div class="log-meta">
-            <span v-if="log.requestTime" class="log-time log-badge log-badge-time">{{ log.requestTime }}</span>
+            <span v-if="log.requestTime" class="log-tag log-time">{{ log.requestTime }}</span>
             <span class="log-level" :class="`log-level-${getLevelClass(log.logLevel)}`">{{ log.logLevel || 'UNKNOWN' }}</span>
-            <span v-if="log.requestIp" class="log-ip log-badge log-badge-ip">IP: {{ log.requestIp }}</span>
+            <span v-if="log.requestIp" class="log-tag log-request-ip">{{ log.requestIp }}</span>
-            <span v-if="log.requestMethod" class="log-method log-badge log-badge-method">{{ log.requestMethod }}</span>
+            <span v-if="log.requestMethod" class="log-tag log-request-method">{{ log.requestMethod }}</span>
-            <span v-if="log.traceId && log.traceId.trim()" class="log-trace log-badge log-badge-trace">traceId: {{ log.traceId }}</span>
+            <span v-if="log.traceId && log.traceId.trim()" class="log-tag log-trace">traceId: {{ log.traceId }}</span>
-            <span v-if="log.thread" class="log-thread log-badge log-badge-thread">{{ log.thread }}</span>
+            <span v-if="log.thread" class="log-tag log-thread">{{ log.thread }}</span>
           </div>
           <div class="log-message" v-html="log.messageHtml" />
         </div>
@@ -120,6 +141,9 @@ export default {
       rules: {},
       logs: [],
       tagList: [],
+      clearDialogVisible: false,
+      clearLoading: false,
+      clearOption: 3,
       query: {
         traceId: '',
         requestMethod: '',
@@ -166,11 +190,25 @@ export default {
         requestIp: item && item.requestIp,
         requestMethod: item && item.requestMethod,
         logLevel: item && item.logLevel,
+        logger: item && item.logger,
+        system: item && item.system,
         thread: item && item.thread,
         traceId: item && item.traceId,
         messageHtml: ansi_up.ansi_to_html(rawMessage)
       }
     },
+    handleClearLogs() {
+      const retainDays = this.clearOption === 'all' ? 0 : this.clearOption
+      this.clearLoading = true
+      luceneOperation.deleteAllLog({ retainDays }).then(() => {
+        this.$message.success('日志清除成功')
+        this.clearDialogVisible = false
+        this.query.page = 1
+        this.queryData()
+      }).finally(() => {
+        this.clearLoading = false
+      })
+    },
     queryData() {
       if (this.query.createTime && this.query.createTime.length === 2) {
         this.query.startTime = this.query.createTime[0]
@@ -192,6 +230,12 @@ export default {
 </script>
 
 <style scoped>
+.clear-log-options {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
 .log-list {
   width: 100%;
 }
@@ -214,52 +258,45 @@ export default {
   color: #606266;
 }
 
-.log-badge {
+.log-tag {
   display: inline-flex;
   align-items: center;
+  max-width: 100%;
   padding: 0 8px;
   line-height: 22px;
   border-radius: 11px;
   border: 1px solid transparent;
+  word-break: break-all;
 }
 
-.log-time,
+.log-time {
-.log-ip,
-.log-method,
-.log-thread,
-.log-trace {
-  line-height: 20px;
-}
-
-.log-badge-time {
   color: #606266;
   background: #f4f4f5;
   border-color: #dcdfe6;
 }
 
-.log-badge-ip {
+.log-request-ip {
   color: #7c4dff;
   background: #f3edff;
-  border-color: #d9c8ff;
+  border-color: #d9ccff;
 }
 
-.log-badge-method {
+.log-request-method {
   color: #0f766e;
   background: #ecfdf5;
-  border-color: #b7ebd3;
+  border-color: #a7f3d0;
-  font-weight: 500;
 }
 
-.log-badge-thread {
+.log-thread {
   color: #8e44ad;
-  background: #f8f0ff;
+  background: #f5eef8;
-  border-color: #e2cfff;
+  border-color: #d7bde2;
 }
 
-.log-badge-trace {
+.log-trace {
-  color: #c05621;
+  color: #1f2d3d;
-  background: #fff7ed;
+  background: #ecf5ff;
-  border-color: #fbd38d;
+  border-color: #b3d8ff;
 }
 
 .log-level {