update

@@ -6,8 +6,6 @@ package com.yoho.unions.server.restapi;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
 
 
-import javax.annotation.Resource;
-
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;

@@ -61,6 +61,8 @@ public class UnionServiceImpl implements IUnionService {
 	
 	
 	@Override
 	@Override
 	public UnionResponse clickUnion(ClickUnionRequestBO request) throws ServiceException {
 	public UnionResponse clickUnion(ClickUnionRequestBO request) throws ServiceException {
+		
+		try {
 			log.info("enter clickUnion with param is {}", request);
 			log.info("enter clickUnion with param is {}", request);
 			//检查输入参数
 			//检查输入参数
 			if (StringUtils.isEmpty(request.getAppid())) {
 			if (StringUtils.isEmpty(request.getAppid())) {
@@ -102,15 +104,10 @@ public class UnionServiceImpl implements IUnionService {
 //			}
 //			}
 			
 			
 			//保存到缓存中，有效期三个小时
 			//保存到缓存中，有效期三个小时
-		try {
 			yhValueOperations.setIfAbsent(key, JSON.toJSONString(request));
 			yhValueOperations.setIfAbsent(key, JSON.toJSONString(request));
 			DynamicIntProperty activeTime = DynamicPropertyFactory.getInstance().getIntProperty("activeTime", 3 * 60 * 60);
 			DynamicIntProperty activeTime = DynamicPropertyFactory.getInstance().getIntProperty("activeTime", 3 * 60 * 60);
 			yHRedisTemplate.longExpire(key, activeTime.get(), TimeUnit.SECONDS);
 			yHRedisTemplate.longExpire(key, activeTime.get(), TimeUnit.SECONDS);
 			log.info("clickUnion set redis success with request={}", request);
 			log.info("clickUnion set redis success with request={}", request);
-		} catch (Exception e) {
-			log.error("clickUnion error set redis error with request={}", request);
-			return new UnionResponse(204, "set redis error");
-		}
 			
 			
 			
 			
 //			if (union != null) {
 //			if (union != null) {
@@ -131,12 +128,19 @@ public class UnionServiceImpl implements IUnionService {
 //			unionLogsDAO.insert(logs);
 //			unionLogsDAO.insert(logs);
 			
 			
 			return new UnionResponse();
 			return new UnionResponse();
+		} catch (Exception e) {
+			log.error("clickUnion error with request={}", request, e);
+			return new UnionResponse(300, e.getMessage());
+		}
+		
+		
 	}
 	}
 
 
 	@Override
 	@Override
 	public UnionResponse activateUnion(ActivateUnionRequestBO request) throws ServiceException {
 	public UnionResponse activateUnion(ActivateUnionRequestBO request) throws ServiceException {
+		try {
 			log.info("activateUnion with request is {}", request);
 			log.info("activateUnion with request is {}", request);
-		//检查输入参数
+			// 检查输入参数
 			if (StringUtils.isEmpty(request.getAppid())) {
 			if (StringUtils.isEmpty(request.getAppid())) {
 				log.warn("activateUnion error because appid is empty with param is {}", request);
 				log.warn("activateUnion error because appid is empty with param is {}", request);
 				return new UnionResponse(201, "appid is empty");
 				return new UnionResponse(201, "appid is empty");
@@ -160,42 +164,37 @@ public class UnionServiceImpl implements IUnionService {
 				return new UnionResponse(201, "imei is empty");
 				return new UnionResponse(201, "imei is empty");
 			}
 			}
 
 
-		//组装redis保存的key
+			// 组装redis保存的key
 			String key = UNION_KEY + "_" + request.getClientIp() + "_" + request.getTd();
 			String key = UNION_KEY + "_" + request.getClientIp() + "_" + request.getTd();
-		String value = "";
-		try {
-			value = yhValueOperations.get(key);
-		} catch (Exception e) {
-			log.error("activateUnion error get redis error with request={}", request);
-			return new UnionResponse(204, "get redis error");
-		}
+			String value = yhValueOperations.get(key);
 
 
 			log.info("activateUnion get key={}, value={}", key, value);
 			log.info("activateUnion get key={}, value={}", key, value);
-		//如果redis中不存在存在该用户点击信息，则退出
+			// 如果redis中不存在存在该用户点击信息，则退出
 			if (StringUtils.isEmpty(value)) {
 			if (StringUtils.isEmpty(value)) {
 				log.warn("activateUnion error user not click info. with param is {}", request);
 				log.warn("activateUnion error user not click info. with param is {}", request);
 				return new UnionResponse(204, "user not click");
 				return new UnionResponse(204, "user not click");
 			}
 			}
 
 
-		//把存储的字符串变为对象
+			// 把存储的字符串变为对象
 			ClickUnionRequestBO click = JSON.parseObject(value, ClickUnionRequestBO.class);
 			ClickUnionRequestBO click = JSON.parseObject(value, ClickUnionRequestBO.class);
-		//查询该td在90天内是否已经激活过
+			// 查询该td在90天内是否已经激活过
 			UnionLogs union = unionLogsDAO.selectByClientType(request.getClient_type(), request.getIdfa(), request.getImei(), Byte.valueOf(click.getUnion_type()));
 			UnionLogs union = unionLogsDAO.selectByClientType(request.getClient_type(), request.getIdfa(), request.getImei(), Byte.valueOf(click.getUnion_type()));
 			log.info("activateUnion in selectByClientType result is {}", union);
 			log.info("activateUnion in selectByClientType result is {}", union);
-		//没有点击记录，则退出
-//		if (union == null) {
-//			log.warn("activateUnion error because not click record with request is {}", request);
-//			return new UnionResponse(205, "not click record");
-//		}
+			// 没有点击记录，则退出
+			// if (union == null) {
+			// log.warn("activateUnion error because not click record with request is {}",
+			// request);
+			// return new UnionResponse(205, "not click record");
+			// }
 
 
 			if (union != null && union.getIsActivate() != null && union.getIsActivate().byteValue() == 1) {
 			if (union != null && union.getIsActivate() != null && union.getIsActivate().byteValue() == 1) {
-			//如果90天之内有过激活日志，则不允许重复激活
+				// 如果90天之内有过激活日志，则不允许重复激活
 				log.warn("activateUnion error because 90 days has activate info with param is {}", request);
 				log.warn("activateUnion error because 90 days has activate info with param is {}", request);
 				return new UnionResponse(203, "have activite in 90 days");
 				return new UnionResponse(203, "have activite in 90 days");
 			}
 			}
 
 
-		
-		//UnionTypeModel type = UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
+			// UnionTypeModel type =
+			// UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
 
 
 			String url = click.getCallbackurl();
 			String url = click.getCallbackurl();
 			if (url.indexOf("?") > 0) {
 			if (url.indexOf("?") > 0) {
@@ -214,10 +213,10 @@ public class UnionServiceImpl implements IUnionService {
 			AsyncFuture<String> response = service.get("union.activate", url, null, String.class, null);
 			AsyncFuture<String> response = service.get("union.activate", url, null, String.class, null);
 			String result = response.get();
 			String result = response.get();
 			log.info("activateUnion call union url={}, and result={}", url, result);
 			log.info("activateUnion call union url={}, and result={}", url, result);
-		try {
+
 			JSONObject json = JSON.parseObject(result);
 			JSONObject json = JSON.parseObject(result);
 			if (json.getInteger("code") == 200) {
 			if (json.getInteger("code") == 200) {
-				//调用成功，更新数据库
+				// 调用成功，更新数据库
 				UnionLogs logs = new UnionLogs();
 				UnionLogs logs = new UnionLogs();
 				logs.setAppId(click.getAppid());
 				logs.setAppId(click.getAppid());
 				logs.setUdid(request.getUdid());
 				logs.setUdid(request.getUdid());
@@ -234,7 +233,7 @@ public class UnionServiceImpl implements IUnionService {
 				unionLogsDAO.insert(logs);
 				unionLogsDAO.insert(logs);
 
 
 				UnionTypeModel u = UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
 				UnionTypeModel u = UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
-				//记录日志
+				// 记录日志
 				JSONObject j = new JSONObject();
 				JSONObject j = new JSONObject();
 				j.put("apptype", request.getClient_type());
 				j.put("apptype", request.getClient_type());
 				j.put("appid", click.getAppid());
 				j.put("appid", click.getAppid());
@@ -251,9 +250,10 @@ public class UnionServiceImpl implements IUnionService {
 				return new UnionResponse(json.getInteger("code"), json.getString("message"));
 				return new UnionResponse(json.getInteger("code"), json.getString("message"));
 			}
 			}
 		} catch (Exception e) {
 		} catch (Exception e) {
-			log.error("activateUnion result is not json with url={}, result={}", url, result);
-			return new UnionResponse(210, "error");
+			log.error("activateUnion error with request={}", request, e);
+			return new UnionResponse(300, e.getMessage());
 		}
 		}
+
 	}
 	}
 
 
 }
 }