优化文件上传目录，删除账户打通

admin

2020-01-03 65a2010b427689fb5f7bb6d7969845af145b17a7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -110,6 +110,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.HongBaoUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -359,7 +360,7 @@
            form.setPortrait(weiXinUser.getHeadimgurl());

            String wxHeadImg = COSManager.getInstance()

                  .uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),

                        Constant.WXHEADURL + UUID.randomUUID().toString())

                        FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())

                  .getUrl();

            form.setWxPic(wxHeadImg);

            form.setNickName(weiXinUser.getNickname());

@@ -430,7 +431,7 @@
            form.setWxName(xinUser.getNickname());

            String wxHeadImg = COSManager.getInstance()

                  .uploadFile(HttpUtil.getAsInputStream(xinUser.getHeadimgurl()),

                        Constant.WXHEADURL + UUID.randomUUID().toString())

                        FilePathEnum.userPortrait + UUID.randomUUID().toString())

                  .getUrl();

            form.setWxPic(wxHeadImg);

         } else if (formLoginType == Constant.TAOBAO) {

@@ -697,7 +698,7 @@
         find.setWxUnionId(weiXinUser.getUnionid());

         String wxHeadImg = COSManager.getInstance()

               .uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),

                     Constant.WXHEADURL + UUID.randomUUID().toString())

                     FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())

               .getUrl();

         find.setWxPic(wxHeadImg);

      } else { // 绑定淘宝

@@ -2173,8 +2174,11 @@
            userInfo.setWeiXinTip("添加微信号后，你的邀请人和直接粉丝可以通过微信与你建立联系。");



         // 查询是否为VIP

         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {

            userInfo.setVip(userVIPInfoService.isVIP(uid));

				
            boolean verifyForbid = redPackForbidService.verifyForbid(uid);

            data.put("redPackLock", verifyForbid);

         }



         data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));

@@ -2193,13 +2197,6 @@
               bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);

            data.put("bindPhone", bindPhone);

         }



         // 2.0.2 版本

         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

            boolean verifyForbid = redPackForbidService.verifyForbid(uid);

            data.put("redPackLock", verifyForbid);

         }



         

         if  (!StringUtil.isNullOrEmpty(invitCode)) {

            // 2.0.6 返回邀请人

@@ -2383,12 +2380,6 @@
         if (!StringUtil.isNullOrEmpty(inviteCode)) {// 邀请码不为空

            inviteCode = inviteCode.trim();

            if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {



               if (!userVIPInfoService.isVIP(uid)) {

                  out.print(JsonUtil.loadFalseResult(20, "只有超级会员才能修改"));

                  return;

               }



               try {

                  userInfoExtraService.updateInviteCodeVip(inviteCode, uid);

                  out.print(JsonUtil.loadTrueResult("保存成功"));