diff --git a/lms/nladmin-system/src/main/java/org/nl/config/ESConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/ESConfig.java
new file mode 100644
index 000000000..1222496c6
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/config/ESConfig.java
@@ -0,0 +1,18 @@
+package org.nl.config;
+
+/*
+ * @author ZZQ
+ * @Date 2023/2/13 9:58 上午
+ */
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Data
+public class ESConfig {
+
+ @Value(("${es.index}"))
+ private String index;
+}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
index bbc2e077b..820221159 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
@@ -123,11 +123,8 @@ public class LogAspect {
StackTraceElement[] stackTrace = ex.getStackTrace();
if (stackTrace!=null && stackTrace.length>0){
for (StackTraceElement stack : stackTrace) {
- x++;
- errorStack.append(stack.toString().replaceAll("<",">")).append("
");
- if (x>10){
- break;
- }
+ x++;errorStack.append(stack.toString().replaceAll("<",">")).append("
");
+ if (x>10){ break; }
}
}
log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}] {}", url,errorMsg,params, errorStack.append("】").toString());
@@ -179,7 +176,4 @@ public class LogAspect {
return "";
}
}
-
-
-
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java
index 63317ba91..5f0ba2659 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java
@@ -8,7 +8,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
* @author ZZQ
* @Date 2023/2/8 4:06 下午
*/
-@Document(indexName = "lms_log", type = "lms_log")
+@Document(indexName = "#{@ESConfig.index}", type = "lms_log")
@Data
public class LogRepositoryDTO {
diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml
index d267e00d8..263ccda44 100644
--- a/lms/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml
@@ -184,3 +184,5 @@ sa-token:
loki:
url: http://localhost:3100/loki/api/v1
systemName: lms
+es:
+ index: lms_log
diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml
index 6bb7eed6e..5d6d7fc79 100644
--- a/lms/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml
@@ -186,3 +186,5 @@ sa-token:
loki:
url: http://localhost:3100/loki/api/v1
systemName: lms
+es:
+ index: lms_log_prod
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index c9c78c213..9bdd5c291 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -15,6 +15,7 @@ https://juejin.cn/post/6844903775631572999
value="%black(%contextName-) %X{traceId} %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
+
@@ -50,7 +51,7 @@ https://juejin.cn/post/6844903775631572999
http://10.1.3.90:9200/_bulk
- lms_log
+ ${esIndex}
lms_log
es-logger
es-error-logger