Authored by mali

Merge branch 'master' into test6.8.5

@@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils; @@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils;
37 import org.slf4j.Logger; 37 import org.slf4j.Logger;
38 import org.slf4j.LoggerFactory; 38 import org.slf4j.LoggerFactory;
39 import org.springframework.beans.factory.annotation.Autowired; 39 import org.springframework.beans.factory.annotation.Autowired;
  40 +import org.springframework.beans.factory.annotation.Value;
40 import org.springframework.stereotype.Service; 41 import org.springframework.stereotype.Service;
41 42
42 import java.text.SimpleDateFormat; 43 import java.text.SimpleDateFormat;
@@ -81,6 +82,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -81,6 +82,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
81 @Autowired 82 @Autowired
82 private ConfigReader configReader; 83 private ConfigReader configReader;
83 84
  85 + @Value("${uic.url:http://uic.yohoops.org/uic}")
  86 + private String uicUrl;
  87 +
84 public static final String DEFAULT_HEAD_IMG = "http://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/{mode}/w/{width}/h/{height}"; 88 public static final String DEFAULT_HEAD_IMG = "http://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/{mode}/w/{width}/h/{height}";
85 89
86 /** 90 /**
@@ -337,8 +341,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -337,8 +341,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
337 try{ 341 try{
338 UicUserReqBO req = new UicUserReqBO(); 342 UicUserReqBO req = new UicUserReqBO();
339 req.setYohoUid(uid); 343 req.setYohoUid(uid);
340 - logger.info("getUserBaseInfo start call uic.getUserInfoByYohoUid uid={} ", uid);  
341 - return serviceCaller.asyncCall("uic.getUserInfoByYohoUid", req, UserInfoRspBO.class); 344 + String url = uicUrl + "/UserInfoRest/getUserInfoByYohoUid";
  345 + logger.info("getUserBaseInfo start call uic.getUserInfoByYohoUid uid={}, url={} ", uid, url);
  346 + return serviceCaller.post("uic.getUserInfoByYohoUid",url, req, UserInfoRspBO.class,null);
342 }catch(Exception e){ 347 }catch(Exception e){
343 logger.warn("getUserBaseInfo call uic.getUserInfoByYohoUid error! uid={}, e {}", uid, e); 348 logger.warn("getUserBaseInfo call uic.getUserInfoByYohoUid error! uid={}, e {}", uid, e);
344 return null; 349 return null;
@@ -355,8 +360,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -355,8 +360,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
355 try{ 360 try{
356 UserInfoBO req = new UserInfoBO(); 361 UserInfoBO req = new UserInfoBO();
357 req.setUid(uid); 362 req.setUid(uid);
  363 + String url = uicUrl + "/profile/getProfilePost";
358 logger.info("getProfileInfo start call uic.getProfileActionPost uid={} ",uid ); 364 logger.info("getProfileInfo start call uic.getProfileActionPost uid={} ",uid );
359 - return serviceCaller.asyncCall("uic.getProfileActionPost", req, UicResponse.class); 365 + return serviceCaller.post("uic.getProfileActionPost",url, req, UicResponse.class, null);
360 }catch(Exception e){ 366 }catch(Exception e){
361 logger.warn("getUserProfileInfo call uic.getProfileActionPost error! uid={}, e {}", uid, e); 367 logger.warn("getUserProfileInfo call uic.getProfileActionPost error! uid={}, e {}", uid, e);
362 return null; 368 return null;