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

admin

2020-07-01 65844c288f03ddd14892b5aea5e9ef862f3afb01

 fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java

@@ -103,7 +103,7 @@
            }

            

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

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

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

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

               user.setHeadimgurl(result.getUrl());

               // COS删除其余头像