Merge branch 'feature-1.4-pushParam' of…

Merge branch 'feature-1.4-pushParam' of https://gitlab.aillo.cc/hewei/wecloud_im_server into feiwa_test

 Conflicts:
	config/src/main/resources/config/logback.xml

config/src/main/resources/config/logback.xml

@@ -147,14 +147,8 @@
     <!-- 解决SpringBootAdmin错误日志问题 -->
     <!-- 解决SpringBootAdmin错误日志问题 -->
     <logger name="org.apache.catalina.connector.CoyoteAdapter" level="OFF"/>
     <logger name="org.apache.catalina.connector.CoyoteAdapter" level="OFF"/>
 
 
-    <!--    <root level="INFO">-->
-    <!--        <appender-ref ref="ELASTIC"/>-->
-    <!--        <appender-ref ref="CONSOLE"/>-->
-    <!--        <appender-ref ref="ASYNC_FILE"/>-->
-    <!--        <appender-ref ref="ASYNC_ERROR_FILE"/>-->
-    <!--    </root>-->
 
 
-    <springProfile name="test">
+    <springProfile name="dev">
         <root level="INFO">
         <root level="INFO">
             <appender-ref ref="ELASTIC"/>
             <appender-ref ref="ELASTIC"/>
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="CONSOLE"/>
@@ -163,7 +157,7 @@
         </root>
         </root>
     </springProfile>
     </springProfile>
 
 
-    <springProfile name="prod">
+    <springProfile name="test">
         <root level="INFO">
         <root level="INFO">
             <appender-ref ref="ELASTIC"/>
             <appender-ref ref="ELASTIC"/>
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="CONSOLE"/>
@@ -172,12 +166,14 @@
         </root>
         </root>
     </springProfile>
     </springProfile>
 
 
-
-    <!--    <springProfile name="eslog">-->
-    <!--        <root level="INFO">-->
-    <!--            <appender-ref ref="ELASTIC"/>-->
-    <!--        </root>-->
-    <!--    </springProfile>-->
+    <springProfile name="prod">
+        <root level="ERROR">
+            <appender-ref ref="ELASTIC"/>
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="ASYNC_FILE"/>
+            <appender-ref ref="ASYNC_ERROR_FILE"/>
+        </root>
+    </springProfile>
 
 
 
 
 </configuration>
 </configuration>
\ No newline at end of file