From 0d78f68bac9560bc7fe1290a116170d140fd9c54 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sun, 4 Feb 2024 14:14:55 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=8E=A5=E5=85=A5mqtt(td:=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=AF=E5=81=9C=E6=97=B6=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=E8=AF=BB=E5=86=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/hd/nladmin-system/pom.xml                         | 11 ++++++-----
 .../src/main/java/org/nl/config/mqtt/PublishDemo.java |  2 +-
 .../nl/modules/loki/service/impl/LokiServiceImpl.java |  2 --
 .../lucene/service/impl/LuceneServiceImpl.java        |  9 ++-------
 .../src/main/resources/logback-spring.xml             |  8 +++-----
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index 8294f83f..9d945684 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -251,16 +251,17 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.3</version>
-        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
             <version>3.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
+        </dependency>
+
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/PublishDemo.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/PublishDemo.java
index 5e70af91..dc87a7ea 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/PublishDemo.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/PublishDemo.java
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ZZQ
  * @Date 2024/1/31 17:12
  */
-@RestController
+//@RestController
 public class PublishDemo {
 
     @Autowired
diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
index f6eeb49c..9fdb5de2 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
@@ -18,10 +18,8 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class LokiServiceImpl implements LokiService {
 
-    @Value("${loki.url}")
     private String lokiUrl;
 
-    @Value("${loki.systemName}")
     private String systemName;
 
     @Override
diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
index cfce6690..78127402 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
@@ -20,11 +20,6 @@ import java.util.Map;
 @Slf4j
 public class LuceneServiceImpl implements LuceneService {
 
-    @Value("${loki.url}")
-    private String lokiUrl;
-
-    @Value("${loki.systemName}")
-    private String systemName;
 
     //日志索引目录
     @Value("${lucene.index.path}")
@@ -39,12 +34,12 @@ public class LuceneServiceImpl implements LuceneService {
     public JSONArray getLabelsValues() {
         JSONArray result = new JSONArray();
         // 获取所有标签
-        String labelString = HttpUtil.get(lokiUrl + "/labels", CharsetUtil.CHARSET_UTF_8);
+        String labelString = HttpUtil.get(luceneUrl + "/labels", CharsetUtil.CHARSET_UTF_8);
         JSONObject parse = (JSONObject) JSONObject.parse(labelString);
         JSONArray labels = parse.getJSONArray("data");
         for (int i=0; i<labels.size(); i++) {
             // 获取标签下的所有值
-            String valueString = HttpUtil.get(lokiUrl + "/label/" + labels.getString(i) + "/values", CharsetUtil.CHARSET_UTF_8);
+            String valueString = HttpUtil.get(luceneUrl + "/label/" + labels.getString(i) + "/values", CharsetUtil.CHARSET_UTF_8);
             JSONObject parse2 = (JSONObject) JSONObject.parse(valueString);
             JSONArray values = parse2.getJSONArray("data");
             JSONArray children = new JSONArray();
diff --git a/wcs/nladmin-system/src/main/resources/logback-spring.xml b/wcs/nladmin-system/src/main/resources/logback-spring.xml
index 6f25b567..4100b588 100644
--- a/wcs/nladmin-system/src/main/resources/logback-spring.xml
+++ b/wcs/nladmin-system/src/main/resources/logback-spring.xml
@@ -14,9 +14,7 @@ https://juejin.cn/post/6844903775631572999
     <property name="log.pattern"
               value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
     <springProperty scope="context" name="systemName" source="loki.systemName"/>
-    <property name="LOKI_URL" value="${lokiUrl}"/>
     <property name="SYSTEM_NAME" value="${systemName}"/>
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="${logPath}"/>
@@ -66,7 +64,7 @@ https://juejin.cn/post/6844903775631572999
         <queueSize>500</queueSize>
         <appender-ref ref="FILE"/>
     </appender>
-    <appender name="luceneAppender" class="org.nl.common.lucene.LuceneAppender" >
+    <appender name="luceneAppender" class="org.nl.config.lucene.LuceneAppender" >
         <properties>
             <property>
                 <name>system</name>
@@ -98,7 +96,7 @@ https://juejin.cn/post/6844903775631572999
             </property>
         </properties>
     </appender>
-    <appender name="asyncLuceneAppender" class="org.nl.common.lucene.AsyncLuceneAppender">
+    <appender name="asyncLuceneAppender" class="org.nl.config.lucene.AsyncLuceneAppender">
         <appender-ref ref="luceneAppender" />
         <queueSize>512</queueSize>
     </appender>
@@ -126,7 +124,7 @@ https://juejin.cn/post/6844903775631572999
 
 
     <!--开发环境:打印控制台-->
-    <springProfile name="dev">
+    <springProfile name="dev3">
         <root level="info">
             <appender-ref ref="CONSOLE"/>