Merge branch 'master' into deploy

# Conflicts:
#	.gitignore

README.md

@@ -13,7 +13,7 @@
 
 **开发文档：**  [https://el-admin.vip](https://el-admin.vip)
 
-**体验地址：**  [https://el-admin.xin](https://el-admin.xin)
+**体验地址：**  [https://el-admin.vip/demo](https://el-admin.vip/demo)
 
 **账号密码：** `admin / 123456`
 

eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java

@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
-
 import java.util.List;
 
 /**
@@ -45,9 +44,8 @@ public class JobRunner implements ApplicationRunner {
      */
     @Override
     public void run(ApplicationArguments applicationArguments) {
-        log.info("--------------------注入系统定时任务------------------");
         List<QuartzJob> quartzJobs = quartzJobRepository.findByIsPauseIsFalse();
         quartzJobs.forEach(quartzManage::addJob);
-        log.info("--------------------定时任务注入完成------------------");
+        log.info("Timing task injection complete");
     }
 }

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java

@@ -16,7 +16,6 @@
 package me.zhengjie.modules.quartz.task;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 /**
@@ -25,7 +24,6 @@ import org.springframework.stereotype.Component;
  * @date 2019-01-08
  */
 @Slf4j
-@Async
 @Component
 public class TestTask {
 

eladmin-system/src/main/resources/banner.txt

@@ -5,4 +5,4 @@
  |  __| |     | (_| | (_| | | | | | | | | | |
   \___|_|      \__,_|\__,_|_| |_| |_|_|_| |_|
 
- :: Spring Boot ::       (v2.1.0.RELEASE)
+ :: Spring Boot ::       (v2.2.10.RELEASE)

eladmin-system/src/main/resources/config/application-prod.yml

@@ -93,7 +93,7 @@ jwt:
 
 # IP 本地解析
 ip:
-  local-parsing: false
+  local-parsing: true
 
 #是否允许生成代码，生产环境设置为false
 generator: