Authored by mali

Merge branch 'master' into test6.8.5

... ... @@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
... ... @@ -81,6 +82,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
@Autowired
private ConfigReader configReader;
@Value("${uic.url:http://uic.yohoops.org/uic}")
private String uicUrl;
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}";
/**
... ... @@ -337,8 +341,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
try{
UicUserReqBO req = new UicUserReqBO();
req.setYohoUid(uid);
logger.info("getUserBaseInfo start call uic.getUserInfoByYohoUid uid={} ", uid);
return serviceCaller.asyncCall("uic.getUserInfoByYohoUid", req, UserInfoRspBO.class);
String url = uicUrl + "/UserInfoRest/getUserInfoByYohoUid";
logger.info("getUserBaseInfo start call uic.getUserInfoByYohoUid uid={}, url={} ", uid, url);
return serviceCaller.post("uic.getUserInfoByYohoUid",url, req, UserInfoRspBO.class,null);
}catch(Exception e){
logger.warn("getUserBaseInfo call uic.getUserInfoByYohoUid error! uid={}, e {}", uid, e);
return null;
... ... @@ -355,8 +360,9 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
try{
UserInfoBO req = new UserInfoBO();
req.setUid(uid);
String url = uicUrl + "/profile/getProfilePost";
logger.info("getProfileInfo start call uic.getProfileActionPost uid={} ",uid );
return serviceCaller.asyncCall("uic.getProfileActionPost", req, UicResponse.class);
return serviceCaller.post("uic.getProfileActionPost",url, req, UicResponse.class, null);
}catch(Exception e){
logger.warn("getUserProfileInfo call uic.getProfileActionPost error! uid={}, e {}", uid, e);
return null;
... ...