diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java index 419464fcf..ace14878d 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java @@ -24,7 +24,7 @@ import com.accompany.core.model.Users; import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.payment.service.RechargeUserService; import com.alibaba.nacos.common.utils.CollectionUtils; -import com.aliyuncs.utils.StringUtils; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -89,10 +89,10 @@ public class GuildApplyAdminService { Date startDate = null, endDate = null; Long uid = null; - if (StringUtils.isNotEmpty(startTimeStr)) { + if (StrUtil.isNotEmpty(startTimeStr)) { startDate = DateUtil.parseDateTime(startTimeStr); } - if (StringUtils.isNotEmpty(endTimeStr)) { + if (StrUtil.isNotEmpty(endTimeStr)) { endDate = DateUtil.parseDateTime(endTimeStr); } if (erbanNo != null) { diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java deleted file mode 100644 index 504a8b26b..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.admin.controller; - -import cn.hutool.core.util.StrUtil; -import com.accompany.business.service.api.QinniuService; -import com.accompany.common.config.QiNiuConfig; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Deprecated -//@RestController -//@RequestMapping(value = "admin/qiniu") -public class QiniuUploadController extends BaseController { - @Autowired - private QinniuService qinniuService; - - @RequestMapping(value = "uploadPatch", method = RequestMethod.POST) - public BusiResult> uploadPatch(HttpServletRequest request) throws Exception { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - BusiResult> busiResult = new BusiResult<>(BusiStatus.SUCCESS); - Map multipartFileMap = multipartRequest.getFileMap(); - List filePathList = new ArrayList<>(); - try { - for (Map.Entry entry : multipartFileMap.entrySet()) { - MultipartFile multipartFile = entry.getValue(); - String fileName = multipartFile.getOriginalFilename(); - String filepath = qinniuService.uploadByStream(multipartFile.getInputStream(), fileName); - String fileUrl = qinniuService.mergeUrl(filepath); - filePathList.add(fileUrl); - } - } catch (Exception e) { - logger.error("uploadPatch failed", e); - throw new ServiceException(BusiStatus.SERVERERROR, e.getMessage()); - } - busiResult.setData(filePathList); - return busiResult; - } - - @PostMapping("/upload/file") - public BusiResult uploadFile(@RequestParam("file") MultipartFile file) { - String fileUrl = StrUtil.EMPTY; - try { - String fileName = file.getOriginalFilename(); - String resourceUrl = QiNiuConfig.resourceUrl; - if (StrUtil.isEmpty(resourceUrl)) { - resourceUrl = QiNiuConfig.accessUrl; - } - String filepath = qinniuService.uploadByStream(file.getInputStream(), fileName); - fileUrl = qinniuService.mergeUrl(resourceUrl, filepath); - } catch (Exception e) { - logger.error(e.getMessage(), e); - } - return BusiResult.success(fileUrl); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java index 1eedf5e35..98852704b 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java @@ -17,7 +17,7 @@ import com.accompany.common.utils.IPUtils; import com.accompany.common.utils.StringUtils; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.MD5; -import com.aliyuncs.exceptions.ClientException; +// 已移除：阿里云ClientException import import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.scheduling.annotation.Async; @@ -173,7 +173,7 @@ public class LoginController extends BaseController { @RequestMapping("/login/sendSmsCode") @ResponseBody - public BusiResult sendSmsCode(String account, HttpServletRequest request) throws UnsupportedEncodingException, ClientException { + public BusiResult sendSmsCode(String account, HttpServletRequest request) throws UnsupportedEncodingException { String realIpAddress = IPUtils.getRealIpAddress(request); logger.info("admin getSmsCode account:{},ip:{}", account, realIpAddress); if (BlankUtil.isBlank(accountFilter(account))) { diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/QiNiuConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/config/QiNiuConfig.java deleted file mode 100644 index 28abcd1a7..000000000 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/config/QiNiuConfig.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.accompany.common.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; -import org.springframework.core.annotation.Order; - -@Lazy(value = false) -@Order(-1) -@Configuration -@ConfigurationProperties(prefix = "qiniu") -public class QiNiuConfig { - - public static String accessUrl; - public static String accessKey; - public static String secretKey; - public static String bucket; - public static Long expireSecond; - public static Integer detectMime; - public static String mimeLimit; - - public static String resourceUrl; - - public void setAccessUrl(String accessUrl) { - this.accessUrl = accessUrl; - } - - public void setAccessKey(String accessKey) { - this.accessKey = accessKey; - } - - public void setSecretKey(String secretKey) { - this.secretKey = secretKey; - } - - public void setBucket(String bucket) { - this.bucket = bucket; - } - - public void setExpireSecond(Long expireSecond) { - this.expireSecond = expireSecond; - } - - public void setDetectMime(Integer detectMime) { - this.detectMime = detectMime; - } - - public void setMimeLimit(String mimeLimit) { - this.mimeLimit = mimeLimit; - } - - public static void setResourceUrl(String resourceUrl) { - QiNiuConfig.resourceUrl = resourceUrl; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/QiniuReturnBodyDTO.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/QiniuReturnBodyDTO.java deleted file mode 100644 index 80d35001f..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/QiniuReturnBodyDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 文 件 名: QiniuReturnBodyDTO - * 版 权: - * 描 述: <描述> - * 创建人: H1 - * 创建时间: 2021/5/24 - * 修改人: - * 修改内容: - * 修改时间: - */ -package com.accompany.business.dto; - -import lombok.Data; - -/** - *
类描述: 七牛returnBody - *
功能详细描述: - * - * @author H1 - * @date [2021/5/24] - */ -@Data -public class QiniuReturnBodyDTO { - private String key; - private String hash; - private String w; - private String h; - private String format; - private String path; -} diff --git a/accompany-business/accompany-business-service/pom.xml b/accompany-business/accompany-business-service/pom.xml index 7712fbcd0..6bfb2c3f8 100644 --- a/accompany-business/accompany-business-service/pom.xml +++ b/accompany-business/accompany-business-service/pom.xml @@ -73,12 +73,7 @@ UserAgentUtils ${bitwalker.version} - - - com.aliyun - cloudauth20190307 - ${cloudauth20190307.version} - + com.google.zxing javase diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/api/QinniuService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/api/QinniuService.java deleted file mode 100644 index 9ea6812e4..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/api/QinniuService.java +++ /dev/null @@ -1,292 +0,0 @@ -package com.accompany.business.service.api; - -import com.accompany.business.dto.QiniuReturnBodyDTO; -import com.accompany.common.config.QiNiuConfig; -import com.accompany.common.utils.FileUtils; -import com.accompany.common.utils.UUIDUtil; -import com.alibaba.fastjson.JSON; -import com.google.gson.Gson; -import com.qiniu.common.QiniuException; -import com.qiniu.http.Response; -import com.qiniu.storage.Configuration; -import com.qiniu.storage.Region; -import com.qiniu.storage.UploadManager; -import com.qiniu.storage.model.DefaultPutRet; -import com.qiniu.util.Auth; -import com.qiniu.util.StringMap; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.DependsOn; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -@DependsOn(value = "qiNiuConfig") -@Service -public class QinniuService { - - private UploadManager uploadManager; - private Auth auth; - - @PostConstruct - public void init() { - //构造一个带指定Zone对象的配置类 - Configuration cfg = new Configuration(Region.regionAs0()); - //...其他参数参考类注释 - uploadManager = new UploadManager(cfg); - //...生成上传凭证，然后准备上传 - auth = Auth.create(QiNiuConfig.accessKey, QiNiuConfig.secretKey); - } - - /** - * 构建成可访问的文件地址 - * - * @param fileName - * @return - */ - public String mergeUrl(String fileName) { - return mergeUrl(QiNiuConfig.accessUrl, fileName); - } - - public String mergeUrl(String prefix, String fileName) { - return prefix + fileName; - } - - /** - * 构建成可访问的文件地址，并加上瘦身的参数 - * - * @param fileName - * @return - */ - public String mergeUrlAndSlim(String fileName) { - return QiNiuConfig.accessUrl + fileName + "?imageslim"; - } - - /** - * 下载网络上的文件，并上传到七牛 - * - * @param url - * @return - * @throws Exception - */ - public String uploadByUrl(String url) throws Exception { - return uploadByUrl(url, null); - } - - /** - * 下载网络上的文件，并上传到七牛 - * - * @param url 网络URL - * @param fileName 指定保存的文件名 - * @return - * @throws Exception - */ - public String uploadByUrl(String url, String fileName) throws Exception { - InputStream is = FileUtils.downloadFileInputStream(url); - return uploadByStream(is, fileName); - } - - /** - * 上传到七牛对象存储，以文件内容的hash值作为文件名 - * - * @param is - * @return 返回上传后的文件名 - * @throws Exception - */ - public String uploadByStream(InputStream is) throws Exception { - return uploadByStream(is, null); - } - - /** - * 上传到七牛对象存储，指定上传后的文件名 - * - * @param is 数据流 - * @param fileName 上传后的文件名，默认不指定的情况下，以文件内容的hash值作为文件名 - * @return 返回上传后的文件名 - * @throws Exception - */ - public String uploadByStream(InputStream is, String fileName) throws Exception { - try { - // 获取上传的凭证 - String upToken = auth.uploadToken(QiNiuConfig.bucket); - Response response = uploadManager.put(is, fileName, upToken, null, null); - //解析上传成功的结果 - DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class); - return putRet.key; - } catch (QiniuException ex) { - log.error("uploadByStream error, response is: " + ex.response, ex); - } - return null; - } - - /** - * 获取本地的文件，上传到七牛 - * - * @param localPath - * @return - */ - public String uploadByLocal(String localPath) { - return uploadByLocal(localPath, null); - } - - /** - * 获取本地的文件，上传到七牛 - * - * @param localPath 本地文件名 - * @param fileName 保存到七牛的文件名 - * @return 返回上传后的文件名 - */ - public String uploadByLocal(String localPath, String fileName) { - try { - // 获取上传的凭证 - String upToken = auth.uploadToken(QiNiuConfig.bucket); - Response response = uploadManager.put(localPath, fileName, upToken); - //解析上传成功的结果 - DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class); - return putRet.key; - } catch (QiniuException ex) { - log.error("uploadByStream error, response is: " + ex.response, ex); - } - return null; - - } - - /** - * 上传到七牛对象存储，以文件内容的hash值作为文件名(不开启鉴黄拦截，用于例如上传分享带二维码图片) - * - * @param is - * @param bucket - * @return 返回上传后的文件名 - * @throws Exception - */ - public String uploadUnInterceptByStream(InputStream is, String bucket) throws Exception { - return uploadByStream(is, null, bucket); - } - - /** - * 上传到七牛对象存储，指定上传后的文件名 - * - * @param is 数据流 - * @param fileName 上传后的文件名，默认不指定的情况下，以文件内容的hash值作为文件名 - * @return 返回上传后的文件名 - * @throws Exception - */ - public String uploadByStream(InputStream is, String fileName, String bucket) throws Exception { - try { - // 获取上传的凭证 - String upToken = auth.uploadToken(bucket); - Response response = uploadManager.put(is, fileName, upToken, null, null); - //解析上传成功的结果 - DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class); - return putRet.key; - } catch (QiniuException ex) { - log.error("uploadByStream error, response is: " + ex.response, ex); - } - return null; - } - - /** - * 构建成可访问的文件地址，并加上瘦身的参数 - * - * @param fileName - * @param accessUrl - * @return - */ - public String mergeUrlAndSlim(String fileName, String accessUrl) { - return accessUrl + fileName + "?imageslim"; - } - - /** - * 构建上传策略 - * 文档地址: https://developer.qiniu.com/kodo/1206/put-policy - * - * @return - */ - private StringMap buildUploadPolicy(String key) { - StringMap map = new StringMap(); - long deadline = System.currentTimeMillis() / 1000 + QiNiuConfig.expireSecond; - String path = new StringBuilder(QiNiuConfig.accessUrl).append(key).toString(); - map.put("scope", QiNiuConfig.bucket); - map.put("deadline", deadline); - map.put("detectMime", QiNiuConfig.detectMime); - map.put("mimeLimit", QiNiuConfig.mimeLimit); - QiniuReturnBodyDTO dto = new QiniuReturnBodyDTO(); - dto.setKey("$(key)"); - dto.setHash("$(etag)"); - dto.setW("$(imageInfo.width)"); - dto.setH("$(imageInfo.height)"); - dto.setFormat("$(imageInfo.format)"); - dto.setPath(path); - map.put("returnBody", JSON.toJSONString(dto)); - return map; - } - - /** - * 获取上传凭证 - * - * @return - */ - public Map getUploadToken() { - String key = UUIDUtil.get(); - StringMap policy = buildUploadPolicy(key); - String token = auth.uploadToken(QiNiuConfig.bucket, key, QiNiuConfig.expireSecond, policy); - Map data = new HashMap<>(); - data.put("token", token); - data.put("key", key); - return data; - } - - /** - * 获取本地的文件，上传到七牛 - * - * @param localPath - * @return - */ - public String uploadByLocalUsePolicyToken(String localPath) { - try { - // 获取上传的凭证 - Map upToken = getUploadToken(); - Response response = uploadManager.put(localPath, upToken.get("key"), upToken.get("token")); - System.out.println(JSON.toJSONString(response)); -// // 解析上传成功的结果 -// DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class); -// return putRet.key; - } catch (QiniuException ex) { - log.error("uploadByStream error, response is: " + ex.response, ex); - } - return null; - } - - /** - * 上传到七牛对象存储，指定上传后的文件名 - * - * @param is 数据流 - * @param fileName 上传后的文件名，默认不指定的情况下，以文件内容的hash值作为文件名 - * @return 返回上传后的文件名 - * @throws Exception - */ - /** - * 上传到七牛对象存储，指定上传后的文件名，同名进行覆盖 - * - * @param is 数据流 - * @param fileName 上传后的文件名，默认不指定的情况下，以文件内容的hash值作为文件名 - * @return 返回上传后的文件名 - * @throws Exception - */ - public String uploadByStreamReplace(InputStream is, String fileName, String key) { - try { - // 获取上传的凭证 - String upToken = auth.uploadToken(QiNiuConfig.bucket, key); - Response response = uploadManager.put(is, fileName, upToken, null, null); - //解析上传成功的结果 - DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class); - return putRet.key; - } catch (QiniuException ex) { - log.error("uploadByStream error, response is: " + ex.response, ex); - } - return null; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordServiceImpl.java index 7d053479b..0e19554d5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordServiceImpl.java @@ -22,7 +22,7 @@ import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.I18NMessageSourceUtil; import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.utils.StringUtils; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -123,7 +123,7 @@ public class SsMonthCoinRecordServiceImpl extends ServiceImpl getHomeDynamic(Long uid) throws Exception { String dynamicStr = jedisService.get(RedisKey.home_dynamic.getKey()); - if (StringUtils.isEmpty(dynamicStr)) { + if (StrUtil.isEmpty(dynamicStr)) { return Collections.emptyList(); } List dynamicVoLists = gson.fromJson(dynamicStr, new TypeToken>() { @@ -198,7 +198,7 @@ public class HomeService extends BaseService { dynamicVo.setAvatar(users.getAvatar()); dynamicVo.setNick(users.getNick()); dynamicVo.setGender(users.getGender()); - dynamicVo.setContent(StringUtils.isEmpty(dynamic.getContent()) ? "此時此刻的我" : dynamic.getContent()); + dynamicVo.setContent(StrUtil.isEmpty(dynamic.getContent()) ? "此時此刻的我" : dynamic.getContent()); dynamicVo.setLikeCount(dynamic.getLikeCount()); dynamicVos.add(dynamicVo); }); @@ -252,7 +252,7 @@ public class HomeService extends BaseService { TopRoomTabHomeVo topRoomTabHomeVo = new TopRoomTabHomeVo(); Room room = roomMap.get(roomTabHome.getRoomUid()); Users users = userMap.get(roomTabHome.getRoomUid()); - if (room == null || StringUtils.isNotEmpty(room.getRoomPwd()) || !room.getValid()) { + if (room == null || StrUtil.isNotEmpty(room.getRoomPwd()) || !room.getValid()) { return; } BeanUtils.copyProperties(roomTabHome, topRoomTabHomeVo); @@ -308,7 +308,7 @@ public class HomeService extends BaseService { }) .filter(playRoomVo -> { // 过滤设置了密码的房间 - if (!StringUtils.isEmpty(playRoomVo.getRoomPwd())) { + if (!StrUtil.isEmpty(playRoomVo.getRoomPwd())) { return false; } // 过滤掉非个人房和非牌照房 @@ -396,7 +396,7 @@ public class HomeService extends BaseService { if (ObjectUtil.isNull(room)) continue; // if (!Constant.PermitType.PERMIT_ROOM.equals(room.getIsPermitRoom())) continue; String roundIdStr = jedisService.hget(RedisKey.corss_room_round_pking.getKey(), String.valueOf(room.getUid())); - if (!StringUtils.isEmpty(roundIdStr)) playRoomVo.setCrossPking(true); + if (!StrUtil.isEmpty(roundIdStr)) playRoomVo.setCrossPking(true); } } @@ -407,7 +407,7 @@ public class HomeService extends BaseService { if (ObjectUtil.isNull(room)) continue; // if (!Constant.PermitType.PERMIT_ROOM.equals(room.getIsPermitRoom())) return; String roundIdStr = jedisService.hget(RedisKey.corss_room_round_pking.getKey(), String.valueOf(room.getUid())); - if (!StringUtils.isEmpty(roundIdStr)) tabHomeVo.setCrossPking(true); + if (!StrUtil.isEmpty(roundIdStr)) tabHomeVo.setCrossPking(true); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java index 60c4e4bf4..c17ab23ea 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java @@ -1,8 +1,5 @@ package com.accompany.business.service.room; - -import com.accompany.business.service.api.QinniuService; -import com.accompany.business.service.clan.ClanService; import com.accompany.business.vo.RoomVo; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; @@ -13,6 +10,8 @@ import com.accompany.core.service.base.BaseService; import com.accompany.core.service.common.JedisService; import com.accompany.sharding.mapper.GiftSendRecordMapperExpand; import com.accompany.sharding.vo.RoomSerialVo; +import com.accompany.common.tencent.cos.TencentCosUploadService; +import com.accompany.common.config.TencentCosConfig; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,21 +26,18 @@ import java.util.Map; @Slf4j public class RoomRevenueService extends BaseService { - private static final Logger logger = LoggerFactory.getLogger(RoomRevenueService.class); - @Autowired RoomService roomService; @Autowired GiftSendRecordMapperExpand giftSendRecordMapperExpand; @Autowired - QinniuService qinniuService; - @Autowired JedisService jedisService; @Autowired RoomRevenueExcelService roomRevenueExcelService; - @Autowired - private ClanService clanService; + private TencentCosUploadService tencentCosUploadService; + @Autowired + private TencentCosConfig tencentCosConfig; /** * 本周房间流水 @@ -88,8 +84,8 @@ public class RoomRevenueService extends BaseService { roomRevenueExcelService.exportExcel(roomVo, startDate, endDate, filename, roomPermitType); Map data = new HashMap<>(); - data.put("url", qinniuService.mergeUrl(filename)); + data.put("url", tencentCosUploadService.mergeUrl(tencentCosConfig.getUrlPrefix(), filename)); return data; } -} +} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java index 6053bc9e0..3015407cd 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java @@ -21,7 +21,7 @@ import com.accompany.core.model.Users; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.user.UsersBaseService; -import com.aliyuncs.utils.StringUtils; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Maps; @@ -244,7 +244,7 @@ public class RoomInsideRecommendServiceImpl extends ServiceImpl defaultResourceList = this.list(Wrappers.lambdaQuery() .eq(partitionId != null, HomeRecommenResource::getPartitionId, partitionId) .eq(HomeRecommenResource::getIsDefault, Boolean.TRUE) @@ -220,7 +220,7 @@ public class HomeRecommenResourceService extends ServiceImpl { Room room = roomService.getRoomByUid(v); if (ObjectUtil.isNull(room)) return false; - if (StringUtils.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; + if (StrUtil.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; if (currentUser != null && !currentUser.getPartitionId().equals(room.getPartitionId())) { return false; } @@ -328,7 +328,7 @@ public class HomeRecommenResourceService extends ServiceImpl erbanNoList = Arrays.stream(content.split(StrUtil.COMMA)).collect(Collectors.toList()); if (CollectionUtils.isEmpty(erbanNoList)) return homeRecomRoomVo; @@ -363,7 +363,7 @@ public class HomeRecommenResourceService extends ServiceImpl> mgMap = miniGameSwitchRecordList.stream().filter(switchRecord -> { Room room = roomService.getRoomByUid(switchRecord.getRoomUid()); if (ObjectUtil.isNull(room)) return false; - if (StringUtils.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; + if (StrUtil.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; return currentUser == null || currentUser.getPartitionId().equals(room.getPartitionId()); }).map(MiniGameSwitchRecord::getRoomUid).collect(Collectors.groupingBy(roomUid -> { MiniGameRoom miniGameRoom = miniGameRoomService.queryMiniGameByRoomUid(roomUid); @@ -681,12 +681,12 @@ public class HomeRecommenResourceService extends ServiceImpl String.valueOf(cacheDto.getUid())).toArray(String[]::new); List singleRoomList = jedisService.hmread(RedisKey.room_mic_up.getKey(), uidStr); if (CollectionUtils.isEmpty(singleRoomList)) return homeRecomRoomVo; - singleRoomList = singleRoomList.stream().filter(playRoomVoStr -> StringUtils.isNotEmpty(playRoomVoStr) && !ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(playRoomVoStr)).collect(Collectors.toList()); + singleRoomList = singleRoomList.stream().filter(playRoomVoStr -> StrUtil.isNotEmpty(playRoomVoStr) && !ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(playRoomVoStr)).collect(Collectors.toList()); if (CollectionUtils.isEmpty(singleRoomList)) return homeRecomRoomVo; List uidList = singleRoomList.stream().map(playRoomVoStr -> gson.fromJson(playRoomVoStr, PlayRoomVo.class)).filter(playRoomVo -> { Room room = roomService.getRoomByRoomId(playRoomVo.getRoomId()); if (ObjectUtil.isNull(room)) return false; - if (StringUtils.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; + if (StrUtil.isNotEmpty(room.getRoomPwd()) || !room.getValid()) return false; if (ObjectUtil.isNull(playRoomVo.getMicUserCount())) return false; if (playRoomVo.getMicUserCount() < 1) return false; Users users = usersService.getUsersByUid(room.getUid()); @@ -725,7 +725,7 @@ public class HomeRecommenResourceService extends ServiceImpl mgRoomRunningStrLIst = jedisService.hmread(RedisKey.room_running.getKey(), roomUidStrList.toArray(String[]::new)); if (CollectionUtils.isEmpty(mgRoomRunningStrLIst)) return Collections.emptyList(); - mgRoomRunningStrLIst = mgRoomRunningStrLIst.stream().filter(runningRoomStr -> StringUtils.isNotEmpty(runningRoomStr) && !ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(runningRoomStr)).collect(Collectors.toList()); + mgRoomRunningStrLIst = mgRoomRunningStrLIst.stream().filter(runningRoomStr -> StrUtil.isNotEmpty(runningRoomStr) && !ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(runningRoomStr)).collect(Collectors.toList()); runningRoomUidList = mgRoomRunningStrLIst.stream(). map(runningRoomStr -> gson.fromJson(runningRoomStr, RunningRoomVo.class)). //人数为0且10分钟没人进房的不要 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java index faf52e07a..690b4fe0e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil; import com.accompany.business.model.PrivatePhoto; import com.accompany.business.model.PrivatePhotoExample; import com.accompany.business.mybatismapper.PrivatePhotoMapper; -import com.accompany.business.service.api.QinniuService; import com.accompany.common.config.YidunImageConfig; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; @@ -43,8 +42,6 @@ public class PrivatePhotoService extends BaseService{ @Autowired private PrivatePhotoMapper privatePhotoMapper; - @Autowired - private QinniuService qinniuService; /** diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java deleted file mode 100644 index 6e1e8cdbf..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.accompany.business.controller; - -import com.accompany.business.service.api.QinniuService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.annotation.H5Authorization; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.vo.BaseResponseVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -@RestController -@RequestMapping(value = "/qiniu/upload") -@Api(tags = "七牛上传") -@Slf4j -public class QiniuController { - @Autowired - private QinniuService qiniuService; - - @ApiOperation("获取文件上传凭证") - @GetMapping("/getUploadToken") - @H5Authorization - @Authorization - public BaseResponseVO> getUploadToken() { - return new BaseResponseVO<>(BusiStatus.SUCCESS, qiniuService.getUploadToken()); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildApplyController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildApplyController.java index 491498686..c87f5b888 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildApplyController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildApplyController.java @@ -8,7 +8,7 @@ import com.accompany.common.annotation.Authorization; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.exception.ServiceException; -import com.aliyuncs.utils.StringUtils; +import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -36,10 +36,10 @@ public class GuildApplyController { @PostMapping("") public BusiResult apply(@RequestBody GuildApplyParam guildApplyParam) { if (guildApplyParam.getApplyUid() == null - || StringUtils.isEmpty(guildApplyParam.getGuildName()) - || StringUtils.isEmpty(guildApplyParam.getGuildContact()) - || StringUtils.isEmpty(guildApplyParam.getGuildAvatar()) - || StringUtils.isEmpty(guildApplyParam.getIdCard())) { + || StrUtil.isEmpty(guildApplyParam.getGuildName()) + || StrUtil.isEmpty(guildApplyParam.getGuildContact()) + || StrUtil.isEmpty(guildApplyParam.getGuildAvatar()) + || StrUtil.isEmpty(guildApplyParam.getIdCard())) { throw new ServiceException(BusiStatus.GUILD_APPLY_PARAM_CHECK); } return guildApplyService.apply(guildApplyParam); diff --git a/accompany-business/accompany-business-web/src/test/java/servicetest/QiniuServiceTest.java b/accompany-business/accompany-business-web/src/test/java/servicetest/QiniuServiceTest.java deleted file mode 100644 index 831c26540..000000000 --- a/accompany-business/accompany-business-web/src/test/java/servicetest/QiniuServiceTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package servicetest; - -import com.accompany.business.service.api.QinniuService; -import com.qiniu.storage.UploadManager; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.client.RestTemplate; - -public class QiniuServiceTest extends CommonTest { - - @Autowired - private QinniuService qiniuService; - private UploadManager uploadManager; - private RestTemplate restTemplate; - - - @Test - public void uploadByLocalUsePolicyTokenTest() { - String localPath = "/home/chenzhixiang/图片/QQ图片20210322173432.png"; - String fileName = null; - qiniuService.uploadByLocalUsePolicyToken(localPath); - } - -// @Test -// public void uploadByToken3Test() { -// String localPath = "C:\\Users\\H1\\Pictures\\default.jpg"; -// String fileName = null; -// qiniuService.uploadByLocalV2(localPath); -// } -} diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index 90d4fd89d..74f5bf926 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -34,11 +34,8 @@ 1.2.83 4.12 3.12.0 - 7.14.0 4.12.0 3.0.0 - 3.0.0 - 4.1.2 3.15.5 3.2.2 2.15.0 @@ -48,17 +45,14 @@ 6.0.17.Final portable-1.6.8 1.1.6 - 1.0.2 0.9.1 3.10.3 2.4.2 6.1.0 2.0.1.Final - 1.1.0 1.3 1.5.4 2.0.1.RELEASE - 1.2.0 3.5.12 1.0.4 3.45.1 @@ -82,7 +76,6 @@ 1.20 1.44.0 2.5.1 - 1.0.1 2.30.37 1.2.2 @@ -183,17 +176,9 @@ ${apache.commons.version} - - com.aliyun - aliyun-java-sdk-sts - ${aliyun-java-sdk-sts.version} - + - - com.aliyun - aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} - + com.google.protobuf @@ -201,17 +186,7 @@ ${protobuf-java.version} - - com.qiniu - qiniu-java-sdk - ${qiniu.version} - - - com.squareup.okhttp3 - okhttp - - - + junit @@ -279,11 +254,7 @@ ${hanlp.version} - - com.aliyun.api.gateway - sdk-core-java - ${sdk-core-java.version} - + com.google.guava @@ -317,12 +288,6 @@ compile - - com.aliyun - aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} - - com.github.pagehelper pagehelper @@ -347,12 +312,6 @@ ${sitemesh.version} - - com.aliyun - aliyun-java-sdk-cloudauth - ${aliyun-java-sdk-cloudauth.version} - - cn.hutool hutool-core @@ -466,11 +425,7 @@ - - - com.aliyun.api.gateway - sdk-core-java - + com.google.guava @@ -517,21 +472,9 @@ pagehelper - - com.aliyun - aliyun-java-sdk-core - - - gson - com.google.code.gson - - - + - - com.aliyun - aliyun-java-sdk-cloudauth - + javax.validation @@ -539,15 +482,9 @@ compile - - com.aliyun - aliyun-java-sdk-sts - + - - com.aliyun - aliyun-java-sdk-dysmsapi - + org.slf4j @@ -579,10 +516,7 @@ jedis - - com.qiniu - qiniu-java-sdk - + com.squareup.okhttp3