Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -40,18 +40,23 @@
import com.yeshi.fanli.dao.mybatis.share.ShareMapper;

import com.yeshi.fanli.dao.user.UserInfoDao;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

import com.yeshi.fanli.entity.bus.user.InviteUser;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

@@ -73,7 +78,7 @@


   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

	


   @Resource

   private UserInfoDao userInfoDao;



@@ -118,11 +123,15 @@


   @Resource

   private TaoBaoUnionAuthRecordService taoBaoUnionAuthRecordService;

	


   @Resource

   private SpreadUserImgService spreadUserImgService;

	
	


   @Resource

   private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;



   @Resource

   private BindingAccountService bindingAccountService;



   public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {

      List<UserInfo> list = null;

@@ -925,43 +934,44 @@


   @Override

   public void uploadPortrait(MultipartFile file, Long uid) throws UserInfoException, IOException {

		


      UserInfo userInfo = userInfoMapper.selectByPKey(uid);

      if(userInfo == null) {

      if (userInfo == null) {

         throw new UserInfoException(1, "用户不存在");

      }

		


      // 谷歌压缩图片

      String targetPath = FileUtil.getCacheDir() + "/uploadPortrait_" + uid + "_" + System.currentTimeMillis() + ".jpg";

      String targetPath = FileUtil.getCacheDir() + "/uploadPortrait_" + uid + "_" + System.currentTimeMillis()

            + ".jpg";

      Thumbnails.of(file.getInputStream()).size(200, 200).toFile(targetPath);

		


      // 执行上传

      String filePath="/img/user/" + UUID.randomUUID().toString().replace("-", "") + ".jpg";

      String fileLink= COSManager.getInstance().uploadFile(new File(targetPath), filePath).getUrl();

		
      String filePath = "/img/user/" + UUID.randomUUID().toString().replace("-", "") + ".jpg";

      String fileLink = COSManager.getInstance().uploadFile(new File(targetPath), filePath).getUrl();



      // 删除本地图片

      if (new File(targetPath).exists()) {

         new File(targetPath).delete();

      }

		


      // 原头像

      String portrait = userInfo.getPortrait();

		


      // 更新信息

      userInfo.setPortrait(fileLink);

      userInfoMapper.updateByPrimaryKeySelective(userInfo);

		


      // 删除原头像

      if (!StringUtil.isNullOrEmpty(portrait) && portrait.contains("/img/user/")) {

         COSManager.getInstance().deleteFile(portrait);

      }

		


      executor.execute(new Runnable() {

         @Override

         public void run() {

            try {

               // 删除分享头像信息

                spreadUserImgService.deleteImgUrl(uid);

               spreadUserImgService.deleteImgUrl(uid);

            } catch (Exception e) {

               try {

                  LogHelper.errorDetailInfo(e);

@@ -972,16 +982,16 @@
         }

      });

   }

	
	


   @Override

   public void saveUserInfo(String nickName, Long uid) throws UserInfoException {

      UserInfo userInfo = userInfoMapper.selectByPKey(uid);

      if(userInfo == null) {

      if (userInfo == null) {

         throw new UserInfoException(1, "用户不存在");

      }

		


      userInfo.setNickName(nickName);

      userInfoMapper.updateByPrimaryKeySelective(userInfo);

   }



}