Authored by linlong

Merge branch 'master' into hotfix_0307

@@ -174,7 +174,7 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher @@ -174,7 +174,7 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
174 //组装redis保存的key 174 //组装redis保存的key
175 String key; 175 String key;
176 if (StringUtils.isNotEmpty(request.getIdfa())) { 176 if (StringUtils.isNotEmpty(request.getIdfa())) {
177 - key = UNION_KEY + "_" + request.getIdfa() + "_" + request.getAppkey(); 177 + key = UNION_KEY + "_" + request.getIdfa().toUpperCase() + "_" + request.getAppkey();
178 } else if (StringUtils.isNotEmpty(request.getImei())) { 178 } else if (StringUtils.isNotEmpty(request.getImei())) {
179 key = UNION_KEY + "_" + request.getImei() + "_" + request.getAppkey(); 179 key = UNION_KEY + "_" + request.getImei() + "_" + request.getAppkey();
180 } else { 180 } else {