Merge remote-tracking branch 'origin/master'

src/main/resources/logback-spring.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <contextName>logback</contextName>
-        <property name="log.path" value="../logs/UDI_WMS_MC"/>
+    <property name="log.path" value="../logs/UDI_SPMS_SERVER"/>
-<!--    输出到控制台/home/glxpdata/udiwms/UDI_WMS_MC/-->
+    <!--    输出到控制台/home/glxpdata/udiwms/UDI_WMS_MC/-->
-<!--    <property name="log.path" value="../logs/udiwms/"/>-->
+    <!--    <property name="log.path" value="../logs/udiwms/"/>-->
     <!--D:\\udi\\logs\\UDI_WMS_MC\\-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -144,4 +144,4 @@
     </springProfile>
     <!-- 生产环境. -->
 
-</configuration>
+</configuration>