Merge branch 'master' into dev-scheduling

cx-aps/cx-aps-server/src/main/resources/logback-spring.xml

@@ -13,7 +13,7 @@
         <Prudent>true</Prudent>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>
-                business-log/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
+                cx-aps-log/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
             </FileNamePattern>
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">