ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 4f343b84a9a5fd7494dcc188779771af75861f82 2 parents 84961549 2fe9061f

Merge branch 'test6.8.6' into gray

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
@@ -599,8 +599,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -599,8 +599,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
599 String headIcon = profileInfo.getHead_ico(); 599 String headIcon = profileInfo.getHead_ico();
600 if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像 600 if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
601 //ufo 用户的默认头像 601 //ufo 用户的默认头像
602 -// headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}");  
603 - headIcon = "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}"; 602 + headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}");
604 } 603 }
605 track.setHeadIcon(headIcon); 604 track.setHeadIcon(headIcon);
606 605
@@ -661,8 +660,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -661,8 +660,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
661 String headIcon = profileMap.get(toUid).getHead_ico(); 660 String headIcon = profileMap.get(toUid).getHead_ico();
662 if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像 661 if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
663 //ufo 用户的默认头像 662 //ufo 用户的默认头像
664 -// headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}");  
665 - headIcon = "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}"; 663 + headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}");
666 } 664 }
667 item.setHeadIcon(headIcon); 665 item.setHeadIcon(headIcon);
668 item.setType(MESSAGE_TYPE_EX_OWNER); 666 item.setType(MESSAGE_TYPE_EX_OWNER);