Merge remote-tracking branch 'origin/master'

# Conflicts:
#	xxl-job-admin/src/main/resources/logback.xml

xxl-job-admin/src/main/resources/logback.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="true" scanPeriod="1 seconds">
+
     <contextName>logback</contextName>
-    <property name="log.path" value="/data/applogs/xxl-job/xxl-job-admin.log"/>
+    <property name="log.path" value="./data/applogs/xxl-job/xxl-job-admin.log"/>
     <!-- just for test  -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>