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 @@
mybatis-plus-boot-starter
3.4.0
-
- org.apache.velocity
- velocity-engine-core
- 2.3
-
com.baomidou
mybatis-plus-generator
3.4.0
+
+ org.apache.velocity
+ velocity-engine-core
+ 2.3
+
+
xerces
xercesImpl
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
-
-
@@ -66,7 +64,7 @@ https://juejin.cn/post/6844903775631572999
500
-
+
system
@@ -98,7 +96,7 @@ https://juejin.cn/post/6844903775631572999
-
+
512
@@ -126,7 +124,7 @@ https://juejin.cn/post/6844903775631572999
-
+