Merge branch 'release/S3' of http://47.102.102.152/athena-demo/athena-opt-demo into hotfix

# Conflicts:
#	version_control/BUILD

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="@lmcUrl@">
+			<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" /-->

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;

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>

version_control/BUILD

@@ -1 +1 @@
-999
+1049