Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java

@@ -450,7 +450,7 @@
               LogHelper.test("微信头像下载失败: " + weiXinUser.getUnionid() + " " + headimgurl);

            } else {

               FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String.format(

                     FilePathEnum.userPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

                     FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

               if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {

                  headimgurl = result.getUrl();

               } else {

@@ -569,7 +569,7 @@
               LogHelper.test("微信头像下载失败: " + weiXinUser.getUnionid() + " " + headimgurl);

            } else {

               FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String.format(

                     FilePathEnum.userPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

                     FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

               if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {

                  headimgurl = result.getUrl();

               } else {