1.优化

@@ -205,7 +205,6 @@ public class UserOperationController {
                     subscribeBean.setSourceInfo(sourceInfo);
             }
 
-            String headimgurl = iptvUserInfo.get("headimgurl").toString();
             String nickname = iptvUserInfo.get("nickname").toString();
             if (StringUtils.isNotBlank(nickname)) {
                 String nicknameDecode = URLDecoder.decode(nickname, "UTF-8");
@@ -213,10 +212,16 @@ public class UserOperationController {
                 subscribeBean.setNickname(nicknameEncode);
             }
 
+            String headimgurl = iptvUserInfo.get("headimgurl").toString();
+            log.info("parseSubscribe ==>> headimgurl ==>> {}", headimgurl);
             if (StringUtils.isNotBlank(headimgurl)) {
                 String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
-                String headImgUrl = this.downloadWeixinImge(headimgurlDecode);
-                subscribeBean.setHeadimgurl(headImgUrl);
+                if (StringUtils.isNotBlank(headimgurlDecode)) {
+                    if (headimgurl.contains("https") || headimgurl.contains("http")) {
+                        headimgurl = this.downloadWeixinImge(headimgurlDecode);
+                    }
+                    subscribeBean.setHeadimgurl(headimgurl);
+                }
             }
 
         } else {
@@ -224,10 +229,10 @@ public class UserOperationController {
             // headimgurl
             String headimgurl = subscribeBean.getHeadimgurl();
             if (StringUtils.isNotBlank(headimgurl)) {
-
+                if (headimgurl.contains("https") || headimgurl.contains("http")) {
                     String headImgUrl = this.downloadWeixinImge(headimgurl);
                     subscribeBean.setHeadimgurl(headImgUrl);
-
+                }
             }
 
         }
@@ -357,6 +362,9 @@ public class UserOperationController {
 
                     try {
                         String headimgurl = iptvUserInfo.get("headimgurl").toString();
+
+                        log.info("headimgurl ==>> {}", headimgurl);
+
                         String nickname = iptvUserInfo.get("nickname").toString();
                         if (StringUtils.isNotBlank(nickname)) {
                             String nicknameDecode = URLDecoder.decode(nickname, "UTF-8");
@@ -365,12 +373,16 @@ public class UserOperationController {
                         }
 
                         if (StringUtils.isNotBlank(headimgurl)) {
+
+                            if(headimgurl.contains("https")||headimgurl.contains("http")) {
                                 String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
-                            String imageEncode = Base64Util.encode(headimgurlDecode);
+//                                String imageEncode = Base64Util.encode(headimgurlDecode);
                                 String image = RestTemplateClient.netImage(headimgurlDecode);
                                 memberDTO.setAvatarUrl(StringUtils.isNotBlank(image) == true ? image:headimgurlDecode);
                             }
 
+                        }
+
                     } catch (Exception e) {
                         log.info("头像解析失败！！！");
                         e.printStackTrace();

@@ -245,7 +245,6 @@ public class TaskOperationServiceImpl implements TaskOperationService {
             this.grantRight(tempRightsMap);
 
         }
-        System.out.println(taskList);
         return ResultInfo.success();
 
     }

@@ -418,7 +418,7 @@ public class UserOperationServiceImpl implements UserOperationService {
                 Objects.isNull(_userWeixinDTO.getMemberId())) {
 
             UserWeixin userWeixin = new UserWeixin();
-            BeanUtils.copyProperties(resources,userWeixin);
+            BeanUtils.copyProperties(resources, userWeixin);
             userWeixin.setStatus(SUBSCRIBE_STATUS);
 
             // 创建小屏账户同时创建会员
@@ -591,10 +591,12 @@ public class UserOperationServiceImpl implements UserOperationService {
                 String headimgurl = json.get("headimgurl").toString();
                 if (StringUtils.isNotBlank(headimgurl)) {
                     String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
+                    if (headimgurlDecode.contains("http") || headimgurlDecode.contains("https")) {
                         String image = this.downloadWeixinImgeFromAppEngine(headimgurlDecode);
                         if (StringUtils.isNotBlank(image))
                             json.put("headimgurl",image);
                     }
+                }
                 data = json.toJSONString();
             } catch (Exception e) {
                 log.info("头像解析失败！！！");