Merge branch 'master' into 日志优化

# Conflicts:
#	server/src/main/java/com/yoho/unions/server/service/impl/UnionServiceImpl.java

@@ -289,6 +289,13 @@ public class UnionServiceImpl implements IUnionService {
 						log.info("activateUnion with get redis third with key={}, value={}", key, value);
 						clickUnion.info("activateUnion with get redis third with key={}, value={}", key, value);
 					}
+
+					if(arr.length==3){
+						request.setTd(arr[1]+"_"+arr[2]);
+						key = UNION_KEY + "_" + request.getClientIp() + "_" + request.getTd() + "_" + request.getAppkey();
+						value = yhValueOperations.get(key);
+						log.info("activateUnion with get redis third with key={}, value={}", key, value);
+					}
 				}
 			}