Merge remote-tracking branch 'remotes/origin/20180328_sale' into 9637230e

src/main/java/tkio/task/AccountTask.java

@@ -111,6 +111,9 @@ public class AccountTask {
                             account4Web.setStatus("已激活");
 
                         }
+                        if(account4Web.getTrackStatus()){
+                            account4Web.setStatus("已激活");
+                        }
                     }
                     list.add(account4Web);
                 } catch (Exception e){

src/main/resources/spring/applicationContext-schedule.xml

@@ -12,7 +12,7 @@
     <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
    <task:scheduled-tasks>
         <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="tkioAccountTask" method="task" cron="0 1 11 * * ?"/>
+        <task:scheduled ref="tkioAccountTask" method="task" cron="0 10 11 * * ?"/>
     </task:scheduled-tasks>
 
     <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>