moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pom-清理阿里云七牛云sdk

Browse Source
This commit is contained in:
khalil
2025-09-18 18:08:04 +08:00
parent dd945c2d5b
commit 174f567f90
17 changed files with 52 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java
View File

@@ -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) {

64
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/QiniuUploadController.java
View File

@@ -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<List<String>> uploadPatch(HttpServletRequest request) throws Exception {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
BusiResult<List<String>> busiResult = new BusiResult<>(BusiStatus.SUCCESS);
Map<String, MultipartFile> multipartFileMap = multipartRequest.getFileMap();
List<String> filePathList = new ArrayList<>();
try {
for (Map.Entry<String, MultipartFile> 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<String> 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);
}
}

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java
View File

@@ -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<Void> sendSmsCode(String account, HttpServletRequest request) throws UnsupportedEncodingException, ClientException {
public BusiResult<Void> 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))) {

55
accompany-base/accompany-core/src/main/java/com/accompany/common/config/QiNiuConfig.java
View File

@@ -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;
}
}

30
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/dto/QiniuReturnBodyDTO.java
View File

@@ -1,30 +0,0 @@
/*
* 文 件 名: QiniuReturnBodyDTO
* 版 权:
* 描 述: <描述>
* 创建人: H1
* 创建时间: 2021/5/24
* 修改人:
* 修改内容:
* 修改时间:
*/
package com.accompany.business.dto;
import lombok.Data;
/**
* <br>类描述: 七牛returnBody
* <br>功能详细描述:
*
* @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;
}

7
accompany-business/accompany-business-service/pom.xml
View File

@@ -73,12 +73,7 @@
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
<!-- 金融级实人认证 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>cloudauth20190307</artifactId>
<version>${cloudauth20190307.version}</version>
</dependency>
<!-- 已移除：阿里云金融级实人认证依赖 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>

292
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/api/QinniuService.java
View File

@@ -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<String, String> getUploadToken() {
String key = UUIDUtil.get();
StringMap policy = buildUploadPolicy(key);
String token = auth.uploadToken(QiNiuConfig.bucket, key, QiNiuConfig.expireSecond, policy);
Map<String, String> data = new HashMap<>();
data.put("token", token);
data.put("key", key);
return data;
}
/**
* 获取本地的文件，上传到七牛
*
* @param localPath
* @return
*/
public String uploadByLocalUsePolicyToken(String localPath) {
try {
// 获取上传的凭证
Map<String, String> 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;
}
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/SsMonthCoinRecordServiceImpl.java
View File

@@ -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<SsMonthCoinRecordM
if (partitionId != null){
wrapper.eq(SsMonthCoinRecord::getPartitionId, partitionId);
}
if (StringUtils.isNotEmpty(cycleDate)) {
if (StrUtil.isNotEmpty(cycleDate)) {
wrapper.eq(SsMonthCoinRecord::getCycleDate, cycleDate);
}
if (status != null) {

14
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/home/HomeService.java
View File

@@ -49,7 +49,7 @@ import com.accompany.core.service.base.BaseService;
import com.accompany.core.service.user.UsersBaseService;
import com.accompany.core.vo.user.UserNameplateVo;
import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.utils.StringUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.reflect.TypeToken;
import org.apache.commons.collections.CollectionUtils;
@@ -121,7 +121,7 @@ public class HomeService extends BaseService {
*/
public List<DynamicVo> 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<DynamicVo> dynamicVoLists = gson.fromJson(dynamicStr, new TypeToken<List<DynamicVo>>() {
@@ -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);
}
}

18
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRevenueService.java
View File

@@ -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<String, Object> data = new HashMap<>();
data.put("url", qinniuService.mergeUrl(filename));
data.put("url", tencentCosUploadService.mergeUrl(tencentCosConfig.getUrlPrefix(), filename));
return data;
}
}
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomInsideRecommendServiceImpl.java
View File

@@ -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<RoomInsideRecomm
if (CollectionUtils.isEmpty(playRoomVo.getMicUsers())) return false;
if (playRoomVo.getMicUsers().size() < micNum) return false;
//if (playRoomVo.getOnlineNum() == null) return false;
if (!StringUtils.isEmpty(playRoomVo.getRoomPwd())) return false;
if (!StrUtil.isEmpty(playRoomVo.getRoomPwd())) return false;
return true;
}).collect(Collectors.toList());

26
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/roomtab/HomeRecommenResourceService.java
View File

@@ -42,7 +42,7 @@ import com.accompany.core.service.SysConfService;
import com.accompany.core.service.base.BaseService;
import com.accompany.core.service.common.JedisService;
import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.utils.StringUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
@@ -129,7 +129,7 @@ public class HomeRecommenResourceService extends ServiceImpl<HomeRecommenResourc
}
//获取默认策略
String defaultSeqStr = sysConfService.getSysConfValueById(Constant.SysConfId.HOME_RECOMMEN_RESOURCE_SEQ);
if (StringUtils.isEmpty(defaultSeqStr)) {
if (StrUtil.isEmpty(defaultSeqStr)) {
List<HomeRecommenResource> defaultResourceList = this.list(Wrappers.<HomeRecommenResource>lambdaQuery()
.eq(partitionId != null, HomeRecommenResource::getPartitionId, partitionId)
.eq(HomeRecommenResource::getIsDefault, Boolean.TRUE)
@@ -220,7 +220,7 @@ public class HomeRecommenResourceService extends ServiceImpl<HomeRecommenResourc
Room room = roomService.getRoomByRoomId(playRoomVo.getRoomId());
if (ObjectUtil.isNull(room)) return false;
if (!roomTypeList.contains(room.getIsPermitRoom())) 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());
@@ -256,7 +256,7 @@ public class HomeRecommenResourceService extends ServiceImpl<HomeRecommenResourc
if (!Constant.RoomPlayType.BLIND_DATE.equals(roomPlayType.getType())) return false;
Room room = roomService.getRoomByUid(roomPlayType.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;
if (BlindDatePhaseStateEnum.CLOSED.getCode() == room.getBlindDateState() || room.getBlindDateState() == 0)
return false;
if (currentUser != null && !currentUser.getPartitionId().equals(room.getPartitionId())) {
@@ -288,7 +288,7 @@ public class HomeRecommenResourceService extends ServiceImpl<HomeRecommenResourc
roomUidList = roomUidList.stream().filter(v -> {
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<HomeRecommenResourc
if (ObjectUtil.isNull(room)) return false;
MiniGameRoom miniGameRoom = miniGameRoomService.queryMiniGameByRoomUid(switchRecord.getRoomUid());
if (!Constant.MiniGameRoomState.wait.equals(miniGameRoom.getState())) 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;
return BlindDatePhaseStateEnum.CLOSED.getCode() != room.getBlindDateState();
}).map(MiniGameSwitchRecord::getRoomUid).collect(Collectors.toList());
@@ -353,7 +353,7 @@ public class HomeRecommenResourceService extends ServiceImpl<HomeRecommenResourc
String content = resourceApplyVo.getResourceContent();
HomeRecomRoomVo homeRecomRoomVo = new HomeRecomRoomVo();
homeRecomRoomVo.setFailContext(Constant.BigGooseConstant.pick_fail_context);
if (StringUtils.isEmpty(content)) return homeRecomRoomVo;
if (StrUtil.isEmpty(content)) return homeRecomRoomVo;
//拿到
List<String> 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<HomeRecommenResourc
if (ObjectUtil.isNull(users)) continue;
Room room = roomService.getRoomByUid(users.getUid());
if (ObjectUtil.isNull(room)) continue;
if (StringUtils.isNotEmpty(room.getRoomPwd()) || !room.getValid()) continue;
if (StrUtil.isNotEmpty(room.getRoomPwd()) || !room.getValid()) continue;
if (currentUser != null && !currentUser.getPartitionId().equals(room.getPartitionId())) continue;
uidList.add(users.getUid());
}
@@ -566,7 +566,7 @@ public class HomeRecommenResourceService extends ServiceImpl<HomeRecommenResourc
if (Constant.BigGooseResourceType.blind_room != resourceType && blindStateList.contains(room.getBlindDateState()))
return false;
if (!roomTypeList.contains(room.getIsPermitRoom())) 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());
@@ -615,7 +615,7 @@ public class HomeRecommenResourceService extends ServiceImpl<HomeRecommenResourc
Map<Byte, List<Long>> 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<HomeRecommenResourc
String[] uidStr = cacheList.stream().map(cacheDto -> String.valueOf(cacheDto.getUid())).toArray(String[]::new);
List<String> 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<Long> 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<HomeRecommenResourc
//获取运行中的房间
List<String> 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分钟没人进房的不要

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java
View File

@@ -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;
/**

33
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/QiniuController.java
View File

@@ -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<Map<String, String>> getUploadToken() {
return new BaseResponseVO<>(BusiStatus.SUCCESS, qiniuService.getUploadToken());
}
}

10
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/guild/GuildApplyController.java
View File

@@ -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<Void> 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);

30
accompany-business/accompany-business-web/src/test/java/servicetest/QiniuServiceTest.java
View File

@@ -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);
// }
}

86
accompany-dependencies/pom.xml
View File

@@ -34,11 +34,8 @@
<fastjson.version>1.2.83</fastjson.version>
<junit.version>4.12</junit.version>
<apache.commons.version>3.12.0</apache.commons.version>
<qiniu.version>7.14.0</qiniu.version>
<okhttp.version>4.12.0</okhttp.version>
<swagger3.version>3.0.0</swagger3.version>
<aliyun-java-sdk-sts.version>3.0.0</aliyun-java-sdk-sts.version>
<aliyun-java-sdk-core.version>4.1.2</aliyun-java-sdk-core.version>
<protobuf-java.version>3.15.5</protobuf-java.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-io.version>2.15.0</commons-io.version>
@@ -48,17 +45,14 @@
<hibernate-validator.version>6.0.17.Final</hibernate-validator.version>
<hanlp.version>portable-1.6.8</hanlp.version>
<hanlp-lucene-plugin.version>1.1.6</hanlp-lucene-plugin.version>
<sdk-core-java.version>1.0.2</sdk-core-java.version>
<jjwt.version>0.9.1</jjwt.version>
<java-jwt.version>3.10.3</java-jwt.version>
<sitemesh.version>2.4.2</sitemesh.version>
<pagehelper.version>6.1.0</pagehelper.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
<orika-core.version>1.5.4</orika-core.version>
<spring-security-oauth2-autoconfigure.version>2.0.1.RELEASE</spring-security-oauth2-autoconfigure.version>
<aliyun-java-sdk-cloudauth.version>1.2.0</aliyun-java-sdk-cloudauth.version>
<mybatisplus.version>3.5.12</mybatisplus.version>
<sud-mgp-auth-java.version>1.0.4</sud-mgp-auth-java.version>
<redisson.version>3.45.1</redisson.version>
@@ -82,7 +76,6 @@
<bitwalker.version>1.20</bitwalker.version>
<sa-token.version>1.44.0</sa-token.version>
<pinyin4j.version>2.5.1</pinyin4j.version>
<cloudauth20190307.version>1.0.1</cloudauth20190307.version>
<aws.version>2.30.37</aws.version>
<dynamic-tp.version>1.2.2</dynamic-tp.version>
</properties>
@@ -183,17 +176,9 @@
<version>${apache.commons.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-sts</artifactId>
<version>${aliyun-java-sdk-sts.version}</version>
</dependency>
<!-- 已移除：阿里云STS临时访问凭证依赖管理 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>${aliyun-java-sdk-core.version}</version>
</dependency>
<!-- 已移除：阿里云核心SDK依赖管理 -->
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -201,17 +186,7 @@
<version>${protobuf-java.version}</version>
</dependency>
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
<version>${qiniu.version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 已移除：七牛云SDK依赖管理 -->
<dependency>
<groupId>junit</groupId>
@@ -279,11 +254,7 @@
<version>${hanlp.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun.api.gateway</groupId>
<artifactId>sdk-core-java</artifactId>
<version>${sdk-core-java.version}</version>
</dependency>
<!-- 已移除：阿里云API网关SDK依赖管理 -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -317,12 +288,6 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
<version>${aliyun-java-sdk-dysmsapi.version}</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
@@ -347,12 +312,6 @@
<version>${sitemesh.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-cloudauth</artifactId>
<version>${aliyun-java-sdk-cloudauth.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
@@ -466,11 +425,7 @@
</exclusions>
</dependency>
<!-- alibaba certification-->
<dependency>
<groupId>com.aliyun.api.gateway</groupId>
<artifactId>sdk-core-java</artifactId>
</dependency>
<!-- 已移除：阿里云API网关SDK依赖 -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -517,21 +472,9 @@
<artifactId>pagehelper</artifactId>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<exclusions>
<exclusion>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- 已移除：阿里云核心SDK依赖 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-cloudauth</artifactId>
</dependency>
<!-- 已移除：阿里云实人认证依赖 -->
<dependency>
<groupId>javax.validation</groupId>
@@ -539,15 +482,9 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-sts</artifactId>
</dependency>
<!-- 已移除：阿里云STS依赖 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
</dependency>
<!-- 已移除：阿里云短信服务依赖 -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -579,10 +516,7 @@
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
</dependency>
<!-- 已移除：七牛云SDK依赖 -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>