From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 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 beac9a0..e9ae937 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
@@ -27,6 +27,7 @@
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.UserShareGoodsHistoryMapper;
import com.yeshi.fanli.dao.mybatis.share.ShareMapper;
+import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -36,19 +37,15 @@
import com.yeshi.fanli.exception.user.ThreeSaleException;
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.money.extract.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.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserRankService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.account.UserUtil;
@@ -62,12 +59,6 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
- @Resource
- private UserInfoService userInfoService;
-
- @Resource
- private ConfigService configService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -93,11 +84,6 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
- @Resource
- private UserRankService userRankService;
-
- @Resource
- private UserActiveLogService userActiveLogService;
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -107,12 +93,6 @@
@Resource
private SpreadUserImgService spreadUserImgService;
-
- @Resource
- private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
-
- @Resource
- private BindingAccountService bindingAccountService;
@Lazy
@Resource
@@ -169,7 +149,7 @@
UserInfo temp = userInfoMapper.selectByPrimaryKey(form.getId());
COSManager cosManager = COSManager.getInstance();
InputStream inputStream = HttpUtil.getAsInputStream(temp.getPortrait());
- String uploadFile = cosManager.uploadFile(inputStream, UUID.randomUUID().toString()).getUrl();
+ String uploadFile = cosManager.uploadFile(inputStream, FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString()).getUrl();
UserInfo updateTemp = new UserInfo(temp.getId());
updateTemp.setPortrait(uploadFile);
userInfoMapper.updateByPrimaryKeySelective(updateTemp);
@@ -239,7 +219,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.setPortrait(wxHeadImg);
find.setWxPic(wxHeadImg);
@@ -600,7 +580,7 @@
Thumbnails.of(file.getInputStream()).size(200, 200).toFile(targetPath);
// 鎵ц涓婁紶
- String filePath = "/img/user/" + UUID.randomUUID().toString().replace("-", "") + ".jpg";
+ String filePath =FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString().replace("-", "") + ".jpg";
String fileLink = COSManager.getInstance().uploadFile(new File(targetPath), filePath).getUrl();
// 鍒犻櫎鏈湴鍥剧墖
@@ -616,7 +596,7 @@
userInfoMapper.updateByPrimaryKeySelective(userInfo);
// 鍒犻櫎鍘熷ご鍍�
- if (!StringUtil.isNullOrEmpty(portrait) && portrait.contains("/img/user/")) {
+ if (!StringUtil.isNullOrEmpty(portrait)) {
COSManager.getInstance().deleteFile(portrait);
}
@@ -676,4 +656,5 @@
return userInfoMapper.selectAvailableByPrimaryKey(uid);
}
+
}
--
Gitblit v1.8.0