Authored by mingdan.ge

Merge branch 'master' into dev_cps_icard_190613

@@ -33,6 +33,7 @@ public class SendMessageHelper { @@ -33,6 +33,7 @@ public class SendMessageHelper {
33 try { 33 try {
34 MessageCenterEvent centerEvent = new MessageCenterEvent(); 34 MessageCenterEvent centerEvent = new MessageCenterEvent();
35 centerEvent.setBusinessLine("yohobuy"); 35 centerEvent.setBusinessLine("yohobuy");
  36 + centerEvent.setSecurityKey("1a15a75d-b30f-4d74-a791-d654647a8c77");
36 centerEvent.setUserType("UID"); 37 centerEvent.setUserType("UID");
37 centerEvent.setUserList(Arrays.asList(Integer.toString(uid))); 38 centerEvent.setUserList(Arrays.asList(Integer.toString(uid)));
38 JSONObject params = new JSONObject(); 39 JSONObject params = new JSONObject();
@@ -236,6 +236,9 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic @@ -236,6 +236,9 @@ public class GDT2019ServiceImpl extends UnionServiceImpl implements IUnionServic
236 if (type == 1) { 236 if (type == 1) {
237 //次日留存 START_APP 用户激活后第二天打开APP的行为 237 //次日留存 START_APP 用户激活后第二天打开APP的行为
238 action.put("action_type", "START_APP"); 238 action.put("action_type", "START_APP");
  239 + JSONObject actionParam = new JSONObject();
  240 + actionParam.put("length_of_stay",1);
  241 + action.put("action_param", actionParam);
239 } 242 }
240 actions.add(action); 243 actions.add(action);
241 params.put("actions", actions); 244 params.put("actions", actions);
@@ -301,7 +301,7 @@ public class UnionServiceImpl implements IUnionService, IBusinessExportService, @@ -301,7 +301,7 @@ public class UnionServiceImpl implements IUnionService, IBusinessExportService,
301 String okey = CL_KEY + dateStr+ "_" + request.getUdid(); 301 String okey = CL_KEY + dateStr+ "_" + request.getUdid();
302 String ovalue = redisValueCache.get(okey,String.class); 302 String ovalue = redisValueCache.get(okey,String.class);
303 if (StringUtils.isNotBlank(ovalue)){ 303 if (StringUtils.isNotBlank(ovalue)){
304 - activeUnion.info(" activateUnion get redis with okey={}, ovalue= {}.",ovalue); 304 + activeUnion.info(" activateUnion get redis with okey={}, ovalue= {}.",okey,ovalue);
305 redisTemplate.delete(okey); 305 redisTemplate.delete(okey);
306 ClickUnionRequestBO oclick = JSON.parseObject(ovalue, ClickUnionRequestBO.class); 306 ClickUnionRequestBO oclick = JSON.parseObject(ovalue, ClickUnionRequestBO.class);
307 String union_type = oclick.getUnion_type(); 307 String union_type = oclick.getUnion_type();