Merge branch 'master' into dev_toutiao_cl_190806

@@ -684,7 +684,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         Set<Integer> newUids = unionUicRegisterMapper.selectByUids(uids);
         Set<Integer> newUids = unionUicRegisterMapper.selectByUids(uids);
 //        Set<Integer> newUids = uids;//TODO 测试环境绕过
 //        Set<Integer> newUids = uids;//TODO 测试环境绕过
 
 
-        logger.info("joinInviteActivity.uids size is {}.newUids size is {}.",uids.size(),newUids.size());
+        logger.info("joinInviteActivity.uids is {}.newUids is {}.",uids,newUids);
         if (CollectionUtils.isEmpty(newUids)||CollectionUtils.isEmpty(appYohoCpsNewUids)||CollectionUtils.isEmpty(activities)) {
         if (CollectionUtils.isEmpty(newUids)||CollectionUtils.isEmpty(appYohoCpsNewUids)||CollectionUtils.isEmpty(activities)) {
             return;
             return;
         }
         }

@@ -32,7 +32,7 @@ public class InviteYohoUserTask {
     IUnionShareService unionShareService;
     IUnionShareService unionShareService;
 
 
     // 每小时执行一次
     // 每小时执行一次
-    @Scheduled(cron = "0 15 * * * ?")
+    @Scheduled(cron = "0 30 * * * ?")
 //    @Scheduled(cron = "0 * * * * ?")
 //    @Scheduled(cron = "0 * * * * ?")
     public void run() {
     public void run() {
         callback(false);
         callback(false);