Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

 fanli/src/main/java/com/yeshi/fanli/job/UpdateRelationAndSpecialOrderJob.java

@@ -100,8 +100,8 @@
   // 每30s爬取一次

   @Scheduled(cron = "0/30 * * * * ? ")

   public void doJob1() {

//      if (!Constant.IS_TASK)

//         return;

      if (!Constant.IS_TASK)

         return;

      long currentTime = System.currentTimeMillis();

      // 爬取21分钟之前到现在的

      updateRelationOrder(currentTime - 1000 * 60 * 20L);