From e5fb957b33678f2ce1836d3bb520c0a793489c03 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 1 Mar 2023 15:23:54 +0800
Subject: [PATCH] =?UTF-8?q?add:=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/application-prod.yml | 18 ++++++++++++++++++
 .../src/main/resources/log/LKToMes.xml         |  2 +-
 .../src/main/resources/log/MesToErp.xml        |  2 +-
 .../src/main/resources/log/MesToLK.xml         |  2 +-
 .../src/main/resources/log/XrToMes.xml         |  2 +-
 .../src/main/resources/logback-spring.xml      |  2 +-
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
index 4fe46016..06b96ca0 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
@@ -14,6 +14,22 @@ erp:
     password: 123456
 #配置数据源
 spring:
+  data:
+    elasticsearch:
+      repositories:
+        enabled: true
+      client:
+        reactive:
+          #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
+          endpoints: 10.16.1.24:9200 #外网
+  #          endpoints: http://10.1.3.90:9200 #外网
+  elasticsearch:
+    rest:
+      #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
+      uris: 10.16.1.24:9200 #外网
+      #      uris: http://10.1.3.90:9200 #外网
+#      username: elastic
+#      password: 123456
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
@@ -158,3 +174,5 @@ logging:
   file:
     path: /app/jar/logs
   config: classpath:logback-spring.xml
+es:
+  index: whxr_log
diff --git a/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml b/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml
index 70a8ba6d..8d8a3734 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml
@@ -3,7 +3,7 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://47.96.133.178:8200/_bulk</url>
+        <url>http://10.16.1.24:9200/_bulk</url>
         <index>${esIndex}</index>
         <type>whxr_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->
diff --git a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
index 454ed15a..7bcceabf 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
@@ -3,7 +3,7 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://47.96.133.178:8200/_bulk</url>
+        <url>http://10.16.1.24:9200/_bulk</url>
         <index>${esIndex}</index>
         <type>whxr_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->
diff --git a/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml b/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml
index aee3a7be..30c19d67 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/MesToLK.xml
@@ -3,7 +3,7 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://47.96.133.178:8200/_bulk</url>
+        <url>http://10.16.1.24:9200/_bulk</url>
         <index>${esIndex}</index>
         <type>whxr_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->
diff --git a/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml b/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml
index 1706cc06..0cefa98f 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/XrToMes.xml
@@ -3,7 +3,7 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://47.96.133.178:8200/_bulk</url>
+        <url>http://10.16.1.24:9200/_bulk</url>
         <index>${esIndex}</index>
         <type>whxr_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->
diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
index e58b21e3..a31dfce9 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -50,7 +50,7 @@ https://juejin.cn/post/6844903775631572999
 
     </appender>
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://47.96.133.178:8200/_bulk</url>
+        <url>http://10.16.1.24:9200/_bulk</url>
         <index>${esIndex}</index>
         <type>whxr_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->