Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/java/com/reyun/controller/LoginController.java

@@ -87,8 +87,9 @@ public class LoginController
 
         logger.info(email + "is login...");
         Account account = loginService.login(email, password);
-        logger.info("login account:" + account.toString());
+
         if (account != null) {
+            logger.info("login account:" + account.toString());
 
             if(!account.getRoleCategory().equals(5L)) {
                 Boolean trackAndIoBothExhaust = accountFlowRestrictService.isIoExhaust(account.getId());

src/main/resources/applicationContext-schedule.xml

@@ -12,6 +12,6 @@
     <bean id="autoCalculateFlow" class="com.reyun.task.AutoCalculateFlow"></bean>
 
     <task:scheduled-tasks>
-        <task:scheduled ref="autoCalculateFlow" method="run" cron="0 */6 * * * ?"/>
+        <task:scheduled ref="autoCalculateFlow" method="run" cron="0 0 7 * * ?"/>
     </task:scheduled-tasks>
 </beans>