From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index eb18dbb..b74410c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
@@ -25,6 +26,7 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import org.yeshi.utils.FileUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -38,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;
@@ -64,12 +71,14 @@
import com.yeshi.fanli.util.wx.WXLoginUtil;
import com.yeshi.fanli.vo.user.UserInfoVO;
+import net.coobird.thumbnailator.Thumbnails;
+
@Service
public class UserInfoServiceImpl implements UserInfoService {
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
@Resource
private UserInfoDao userInfoDao;
@@ -114,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;
@@ -921,38 +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 portrait = userInfo.getPortrait();
- if (portrait != null && portrait.trim().length() > 0 && portrait.contains("/img/user/")) {
- COSManager.getInstance().deleteFile(portrait);
- }
-
-
- // 鏂囦欢瑙ｆ瀽
- InputStream inputStream = file.getInputStream();
- String contentType = file.getContentType();
- String type = contentType.substring(contentType.indexOf("/") + 1);
-
- // 鏂囦欢璺緞
- String filePath="/img/user/"+UUID.randomUUID().toString().replace("-", "") + "." + type;
+
+ // 璋锋瓕鍘嬬缉鍥剧墖
+ String targetPath = FileUtil.getCacheDir() + "/uploadPortrait_" + uid + "_" + System.currentTimeMillis()
+ + ".jpg";
+ Thumbnails.of(file.getInputStream()).size(200, 200).toFile(targetPath);
+
// 鎵ц涓婁紶
- String fileLink= COSManager.getInstance().uploadFile(inputStream, 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);
@@ -962,18 +981,17 @@
}
}
});
-
}
-
-
+
@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);
}
+
}
--
Gitblit v1.8.0