Merge remote-tracking branch 'origin/master'

wisenergy-web-admin/src/main/resources/application.yml

@@ -56,11 +56,11 @@ xxl:
   job:
     accessToken:
     admin:
-      addresses: http://172.24.252.165:81/job-admin
+      addresses: http://172.24.252.165:8090/job-admin
     executor:
       address:
       appname: shop-mall
       ip: 172.24.252.165
-      logpath: /home/meepo/logs/xxl-job/jobhandler
+      logpath: /var/logs/xxl-job/jobhandler
       logretentiondays: 30
       port: 9999
\ No newline at end of file