From 4221e0d51424775a1fd1c278e22ca62712c10b47 Mon Sep 17 00:00:00 2001
From: clong <1584238099@qq.com>
Date: Mon, 20 Nov 2023 15:28:39 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo-athenaopt_backend/develop/conf/log4j2.xml | 16 +++++++++++++++-
 demo-athenaopt_backend/pom.xml                 |  7 +++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/demo-athenaopt_backend/develop/conf/log4j2.xml b/demo-athenaopt_backend/develop/conf/log4j2.xml
index f8454c8..42076cc 100644
--- a/demo-athenaopt_backend/develop/conf/log4j2.xml
+++ b/demo-athenaopt_backend/develop/conf/log4j2.xml
@@ -48,9 +48,23 @@
         <Async name="asyncSysAppender">
       		<AppenderRef ref="mongoSysAppender"/>
     	</Async-->
+
+		<!-- 1.引入appender -->
+		<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="http://172.16.2.141:22623">
+			<PatternLayout pattern="${LOG_PATTERN}"/>
+		</DwLog4j2Appender>
+		<!-- 2.引入异步节点 -->
+		<Async name="ASYNC-dwAppender">
+			<AppenderRef ref="dwAppender"/>
+		</Async>
+
 	</Appenders>
 	<Loggers>		
-		<Root level="@logLevel@">		
+		<!--<Root level="@logLevel@">-->
+		<Root level="ERROR">
+			<!-- 3.引入使用 -->
+			<appender-ref ref="ASYNC-dwAppender"/>
+
 			<appender-ref ref="consoleAppender" />
 			<appender-ref ref="rollingfileAppender" />
 			<!-- appender-ref ref="asyncSysAppender" /-->
diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml
index f73389e..a5356de 100644
--- a/demo-athenaopt_backend/pom.xml
+++ b/demo-athenaopt_backend/pom.xml
@@ -56,6 +56,13 @@
             <version>${api.version}</version>
         </dependency>
 
+        <!--引入 lmc-sdk 依赖包-->
+        <dependency>
+            <groupId>com.digiwin.dap.middleware</groupId>
+            <artifactId>lmc-sdk-log4j2</artifactId>
+            <version>2.2.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.digiwin.lcdp</groupId>
             <artifactId>lcdp-modeldriven</artifactId>

From 3a4aaec2b1e613cd49f98718cd391ec092173dbf Mon Sep 17 00:00:00 2001
From: robot <robot@digiwin.com>
Date: Mon, 20 Nov 2023 07:30:44 +0000
Subject: [PATCH 2/8] auto increment build version 1046 [CI SKIP]

---
 version_control/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version_control/BUILD b/version_control/BUILD
index ea934de..0d38a9b 100644
--- a/version_control/BUILD
+++ b/version_control/BUILD
@@ -1 +1 @@
-1045
\ No newline at end of file
+1046

From f179538349330cbb18ca49b7636f4c44ad2413fb Mon Sep 17 00:00:00 2001
From: clong <1584238099@qq.com>
Date: Mon, 20 Nov 2023 15:35:38 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo-athenaopt_backend/develop/conf/log4j2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo-athenaopt_backend/develop/conf/log4j2.xml b/demo-athenaopt_backend/develop/conf/log4j2.xml
index 42076cc..6dc95c2 100644
--- a/demo-athenaopt_backend/develop/conf/log4j2.xml
+++ b/demo-athenaopt_backend/develop/conf/log4j2.xml
@@ -50,7 +50,7 @@
     	</Async-->
 
 		<!-- 1.引入appender -->
-		<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="http://172.16.2.141:22623">
+		<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="https://lmc-hw-test.digiwincloud.com.cn">
 			<PatternLayout pattern="${LOG_PATTERN}"/>
 		</DwLog4j2Appender>
 		<!-- 2.引入异步节点 -->

From 75e2db73ebda6972ea2cbc2c7574f30f51c0eb99 Mon Sep 17 00:00:00 2001
From: robot <robot@digiwin.com>
Date: Mon, 20 Nov 2023 07:37:35 +0000
Subject: [PATCH 4/8] auto increment build version 1047 [CI SKIP]

---
 version_control/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version_control/BUILD b/version_control/BUILD
index 0d38a9b..0eb5aea 100644
--- a/version_control/BUILD
+++ b/version_control/BUILD
@@ -1 +1 @@
-1046
+1047

From 053a476a9701b070c2cb7719aae3315526a0d9c3 Mon Sep 17 00:00:00 2001
From: clong <1584238099@qq.com>
Date: Mon, 20 Nov 2023 15:48:47 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo-athenaopt_backend/develop/conf/log4j2.xml | 12 ++++++------
 demo-athenaopt_backend/pom.xml                 |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/demo-athenaopt_backend/develop/conf/log4j2.xml b/demo-athenaopt_backend/develop/conf/log4j2.xml
index 6dc95c2..3ef6f68 100644
--- a/demo-athenaopt_backend/develop/conf/log4j2.xml
+++ b/demo-athenaopt_backend/develop/conf/log4j2.xml
@@ -50,20 +50,20 @@
     	</Async-->
 
 		<!-- 1.引入appender -->
-		<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="https://lmc-hw-test.digiwincloud.com.cn">
+	<!--	<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="https://lmc-hw-test.digiwincloud.com.cn">
 			<PatternLayout pattern="${LOG_PATTERN}"/>
 		</DwLog4j2Appender>
-		<!-- 2.引入异步节点 -->
+		&lt;!&ndash; 2.引入异步节点 &ndash;&gt;
 		<Async name="ASYNC-dwAppender">
 			<AppenderRef ref="dwAppender"/>
-		</Async>
+		</Async>-->
 
 	</Appenders>
 	<Loggers>		
-		<!--<Root level="@logLevel@">-->
-		<Root level="ERROR">
+		<Root level="@logLevel@">
+		<!--<Root level="ERROR">-->
 			<!-- 3.引入使用 -->
-			<appender-ref ref="ASYNC-dwAppender"/>
+			<!--<appender-ref ref="ASYNC-dwAppender"/>-->
 
 			<appender-ref ref="consoleAppender" />
 			<appender-ref ref="rollingfileAppender" />
diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml
index a5356de..44f79cb 100644
--- a/demo-athenaopt_backend/pom.xml
+++ b/demo-athenaopt_backend/pom.xml
@@ -57,11 +57,11 @@
         </dependency>
 
         <!--引入 lmc-sdk 依赖包-->
-        <dependency>
+        <!--<dependency>
             <groupId>com.digiwin.dap.middleware</groupId>
             <artifactId>lmc-sdk-log4j2</artifactId>
             <version>2.2.0.0</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.digiwin.lcdp</groupId>

From 18e40d052e04c075e9d1c410308834e2c0728c26 Mon Sep 17 00:00:00 2001
From: robot <robot@digiwin.com>
Date: Mon, 20 Nov 2023 07:50:15 +0000
Subject: [PATCH 6/8] auto increment build version 1048 [CI SKIP]

---
 version_control/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version_control/BUILD b/version_control/BUILD
index 0eb5aea..ff0ed70 100644
--- a/version_control/BUILD
+++ b/version_control/BUILD
@@ -1 +1 @@
-1047
+1048

From dc0d0392f2c13d49d194650271ae65b4ed7925f9 Mon Sep 17 00:00:00 2001
From: clong <1584238099@qq.com>
Date: Mon, 20 Nov 2023 16:02:26 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo-athenaopt_backend/develop/conf/log4j2.xml       | 12 ++++++------
 .../app/infra/service/Impl/StaffServiceImpl.java     |  2 +-
 demo-athenaopt_backend/pom.xml                       |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/demo-athenaopt_backend/develop/conf/log4j2.xml b/demo-athenaopt_backend/develop/conf/log4j2.xml
index 3ef6f68..c3be72c 100644
--- a/demo-athenaopt_backend/develop/conf/log4j2.xml
+++ b/demo-athenaopt_backend/develop/conf/log4j2.xml
@@ -50,20 +50,20 @@
     	</Async-->
 
 		<!-- 1.引入appender -->
-	<!--	<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="https://lmc-hw-test.digiwincloud.com.cn">
+		<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="@lmcUrl@">
 			<PatternLayout pattern="${LOG_PATTERN}"/>
 		</DwLog4j2Appender>
-		&lt;!&ndash; 2.引入异步节点 &ndash;&gt;
+		<!-- 2.引入异步节点 -->
 		<Async name="ASYNC-dwAppender">
 			<AppenderRef ref="dwAppender"/>
-		</Async>-->
+		</Async>
 
 	</Appenders>
 	<Loggers>		
-		<Root level="@logLevel@">
-		<!--<Root level="ERROR">-->
+		<!--<Root level="@logLevel@">-->
+		<Root level="ERROR">
 			<!-- 3.引入使用 -->
-			<!--<appender-ref ref="ASYNC-dwAppender"/>-->
+			<appender-ref ref="ASYNC-dwAppender"/>
 
 			<appender-ref ref="consoleAppender" />
 			<appender-ref ref="rollingfileAppender" />
diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/service/Impl/StaffServiceImpl.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/service/Impl/StaffServiceImpl.java
index 58c7eaa..18d94b5 100644
--- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/service/Impl/StaffServiceImpl.java
+++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/service/Impl/StaffServiceImpl.java
@@ -1,4 +1,4 @@
-package com.digiwin.athena.app.infra.service.impl;
+package com.digiwin.athena.app.infra.service.Impl;
 
 import com.digiwin.athena.app.infra.entity.StaffEntity;
 import com.digiwin.athena.app.infra.repository.StaffRepository;
diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml
index 44f79cb..a5356de 100644
--- a/demo-athenaopt_backend/pom.xml
+++ b/demo-athenaopt_backend/pom.xml
@@ -57,11 +57,11 @@
         </dependency>
 
         <!--引入 lmc-sdk 依赖包-->
-        <!--<dependency>
+        <dependency>
             <groupId>com.digiwin.dap.middleware</groupId>
             <artifactId>lmc-sdk-log4j2</artifactId>
             <version>2.2.0.0</version>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>com.digiwin.lcdp</groupId>

From 2d5df87e21c241984492bf796a26464eb1d26de9 Mon Sep 17 00:00:00 2001
From: robot <robot@digiwin.com>
Date: Mon, 20 Nov 2023 08:04:42 +0000
Subject: [PATCH 8/8] auto increment build version 1049 [CI SKIP]

---
 version_control/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version_control/BUILD b/version_control/BUILD
index ff0ed70..d0378c4 100644
--- a/version_control/BUILD
+++ b/version_control/BUILD
@@ -1 +1 @@
-1048
+1049