fix: 日志管理

lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java

@@ -127,11 +127,11 @@ public class LuceneLogServiceImpl implements EsLogService {
                 TermQuery termQuery = new TermQuery(new Term("requestMethod", logQuery.getRequestMethod()));
                 booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
             }
-            if (Boolean.TRUE.equals(logQuery.getIsRequest())) {
-                Term traceid = new Term("traceId", " ");
-                TermQuery termQuery = new TermQuery(traceid);
-                booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST_NOT);
-            }
+//            if (Boolean.TRUE.equals(logQuery.getIsRequest())) {
+//                Term traceid = new Term("traceId", " ");
+//                TermQuery termQuery = new TermQuery(traceid);
+//                booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST_NOT);
+//            }
             if (ObjectUtil.isNotEmpty(logQuery.getMessage())) {
                 //查询解析器
                 QueryParser queryParser = new QueryParser("message", new IKAnalyzer(true));

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -63,6 +63,11 @@ https://juejin.cn/post/6844903775631572999
     </appender>
 
     <appender name="luceneAppender" class="org.nl.config.lucene.LuceneAppender" >
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
         <properties>
             <property>
                 <name>system</name>

lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
     </transition>
@@ -24,6 +24,12 @@ export default {
       required: true
     }
   },
+  data() {
+    return {
+      title: '龙电华鑫铜箔LMS',
+      logo: Logo
+    }
+  },
   computed: {
     variables() {
       return variables
@@ -31,12 +37,6 @@ export default {
     sideTheme() {
       return this.$store.state.settings.sideTheme
     }
-  },
-  data() {
-    return {
-      title: '龙电宁鑫铜箔LMS',
-      logo: Logo
-    }
   }
 }
 </script>

lms/nladmin-ui/src/views/login.vue

@@ -2,7 +2,7 @@
   <div class="login" :style="'background-image:url('+ Background +');'">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        {{title}}</h3>
+        {{ title }}</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -50,7 +50,7 @@ export default {
   name: 'Login',
   data() {
     return {
-      title: '龙电宁鑫铜箔LMS',
+      title: '龙电华鑫铜箔LMS',
       Background: Background,
       codeUrl: '',
       cookiePass: '',

lms/nladmin-ui/src/views/loki/view/index.vue

@@ -82,7 +82,7 @@
           />
         </el-form-item>
         <el-form-item v-show="showOptions" label="时间段">
-          <el-select v-model="timeZoneValue"  clearable filterable placeholder="请选择标签" size="mini" @change="queryData">
+          <el-select v-model="timeZoneValue" clearable filterable placeholder="请选择标签" size="mini" @change="queryData">
             <el-option
               v-for="item in timeZoneOptions"
               :key="item.index"
@@ -117,6 +117,15 @@
             :step="1"
           />
         </el-form-item>
+        <el-form-item label="压缩查看" prop="isRequest">
+          <el-switch
+            v-model="compressedView"
+            active-color="#F56C6C"
+            inactive-color="#409EFF"
+            active-value="1"
+            inactive-valu="0"
+          />
+        </el-form-item>
         <el-form-item label="总条数">
           <el-input
             v-model="total"
@@ -161,14 +170,15 @@
           <div v-for="(log, index) in logs" :key="index">
             <div>
               <span style="color: #6c0a99;font-weight: 700">{{ log.system }}</span>
-              <span style="color: #13ce66">{{ log.thread }}</span>
-              <span style="color: #cebb13">{{ log.logger }}</span>
-              <span :style="fontType(log.logLevel)">{{ log.logLevel }}</span>
-              <span>{{ log.requestIp }}</span>
               <span style="color: #7c8db0">{{ log.requestTime }}</span>
+              <span style="color: #13ce66">[{{ log.thread }}]</span>
+              <span :style="fontType(log.logLevel)">{{ log.logLevel }}</span>
+              <span style="color: #cebb13">{{ log.logger }}</span>
+              <span>{{ log.requestIp }}</span>
               <span style="color: chocolate">{{ log.traceId }}</span>
               <span style="color: #7a6df0">{{ log.requestMethod }}</span>
-              <span style="margin: 5px;font-size: 15px" v-html="log.message">{{ log.message }}</span>
+              <span v-if="compressedView === '1'" style="margin: 5px;font-size: 15px; word-break: break-all; white-space: pre-wrap;" v-html="log.message">{{ log.message }}</span>
+              <span v-else style="margin: 5px;font-size: 15px" v-html="log.message">{{ log.message }}</span>
             </div>
           </div>
         </div>
@@ -269,7 +279,8 @@ export default {
         value: 3600 * 1000 * 24 * 15
       }],
       timeZoneValue: '',
-      showOptions: true
+      showOptions: true,
+      compressedView: '0'
     }
   },
   created() {