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

pom-spring rocketmq-升级

Browse Source
This commit is contained in:
khalil
2025-05-15 18:45:07 +08:00
parent ae170ad591
commit b63952006b
9 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java
View File

@@ -10,8 +10,8 @@ import com.accompany.admin.vo.withdraw.WithdrawBlockVo;
import com.accompany.business.service.user.UserQueryService;
import com.accompany.core.exception.AdminServiceException;
import com.accompany.core.model.Users;
import com.alipay.api.internal.util.StringUtils;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

2
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/RoomGiftSerialAdminController.java
View File

@@ -17,7 +17,7 @@ import com.accompany.core.exception.AdminServiceException;
import com.accompany.core.service.common.JedisService;
import com.accompany.core.vo.BaseResponseVO;
import com.alibaba.fastjson.JSON;
import com.alipay.api.internal.util.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;

5
accompany-base/accompany-payment/accompany-payment-service/pom.xml
View File

@@ -22,11 +22,6 @@
<artifactId>accompany-basic-service</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
<version>${alipay-sdk-java.version}</version>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-androidpublisher</artifactId>

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/OpenBoxEnergyActService.java
View File

@@ -11,7 +11,6 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.core.service.SysConfService;
import com.accompany.core.service.common.JedisService;
import com.alipay.api.internal.util.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.joda.time.DateTime;
import org.joda.time.Period;
@@ -21,6 +20,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.Collections;
import java.util.Date;
@@ -52,7 +52,7 @@ public class OpenBoxEnergyActService {
*/
public Integer getTaskExpiredDays() {
String configStr = sysConfService.getSysConfValueById(Constant.SysConfId.OPEN_BOX_TASK_TIME_LIMIT);
if(StringUtils.isEmpty(configStr)) {
if(!StringUtils.hasText(configStr)) {
return DEFAULT_ENERGY_TASK_DAYS;
}
return Integer.parseInt(configStr);
@@ -137,7 +137,7 @@ public class OpenBoxEnergyActService {
*/
public Integer getEnergyValue(Long uid) {
String energyValue = jedisService.hget(RedisKey.open_box_energy.getKey(), uid.toString());
if(StringUtils.isEmpty(energyValue)) {
if(!StringUtils.hasText(energyValue)) {
return 0;
}
return Integer.parseInt(energyValue);
@@ -211,7 +211,7 @@ public class OpenBoxEnergyActService {
public boolean getShowEnergySwitch(){
String showSwitch = sysConfService.getSysConfValueById(Constant.SysConfId.open_box_show_energy_switch);
if (!StringUtils.isEmpty(showSwitch)){
if (StringUtils.hasText(showSwitch)){
return Boolean.valueOf(showSwitch);
}
return false;

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java
View File

@@ -46,7 +46,6 @@ import com.accompany.core.util.PartitionUtil;
import com.accompany.core.vo.UserLevelVo;
import com.accompany.core.vo.vip.UserVipInfoVO;
import com.alibaba.fastjson.JSON;
import com.alipay.api.internal.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -60,6 +59,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.*;
import java.util.concurrent.Executors;
@@ -673,7 +673,7 @@ public class FansService extends ServiceImpl<FansMapper, Fans> {
collectList.forEach(fansRoomVo -> {
String str = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(fansRoomVo.getRoomUid()));
if (StringUtils.isEmpty(str) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(str))
if (!StringUtils.hasText(str) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(str))
fansRoomVo.setMicUsers(Collections.emptyList());
else {
PlayRoomVo playRoomVo = gson.fromJson(str, PlayRoomVo.class);

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomMicService.java
View File

@@ -30,16 +30,15 @@ import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.base.BaseService;
import com.accompany.core.util.I18NMessageSourceUtil;
import com.accompany.core.vo.UserVo;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.internal.util.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.*;
import java.util.stream.Collectors;
@@ -360,7 +359,7 @@ public class RoomMicService extends BaseService {
Room room = roomService.getRoomByRoomId(roomId);
Long roomUid = room.getUid();
String str = jedisService.hget(RedisKey.room_mic_up.getKey(), String.valueOf(roomUid));
if (StringUtils.isEmpty(str) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(str)){
if (!StringUtils.hasText(str) || ApplicationConstant.NULL_JSON_OBJECT.equalsIgnoreCase(str)){
return;
}
PlayRoomVo playRoomVo = gson.fromJson(str, PlayRoomVo.class);

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/TopicBoxMsgService.java
View File

@@ -10,7 +10,7 @@ import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.base.BaseService;
import com.accompany.core.service.common.JedisLockService;
import com.accompany.core.service.common.JedisService;
import com.alipay.api.internal.util.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.factory.annotation.Autowired;

2
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/hall/HallController.java
View File

@@ -5,7 +5,7 @@ import com.accompany.business.service.hall.HallService;
import com.accompany.common.annotation.Authorization;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.alipay.api.internal.util.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

11
accompany-dependencies/pom.xml
View File

@@ -23,10 +23,10 @@
<spring-cloud.version>2021.0.5</spring-cloud.version>
<spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
<spring-cloud-starter-bootstrap.version>3.1.8</spring-cloud-starter-bootstrap.version>
<jedis.version>3.9.0</jedis.version>
<jedis.version>3.10.0</jedis.version>
<httpclient.version>3.1</httpclient.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
<mysql-connector-java.version>8.0.17</mysql-connector-java.version>
<mysql-connector-java.version>8.0.33</mysql-connector-java.version>
<servlet-api.version>3.1.0</servlet-api.version>
<http-client.version>4.5</http-client.version>
<guava.version>31.1-jre</guava.version>
@@ -63,21 +63,20 @@
<mybatisplus.version>3.5.9</mybatisplus.version>
<sud-mgp-auth-java.version>1.0.4</sud-mgp-auth-java.version>
<redisson.version>3.38.0</redisson.version>
<easyexcel.version>3.3.2</easyexcel.version>
<easyexcel.version>4.0.3</easyexcel.version>
<googlecode-libphonenumber.version>8.13.49</googlecode-libphonenumber.version>
<ip2region.version>2.7.0</ip2region.version>
<opencc4j.version>1.7.2</opencc4j.version>
<hutool.version>5.8.27</hutool.version>
<hippo4j-config-spring-boot-starter.version>1.5.0</hippo4j-config-spring-boot-starter.version>
<alipay-sdk-java.version>3.7.110.ALL</alipay-sdk-java.version>
<google-api-services-androidpublisher.version>v3-rev24-1.24.1</google-api-services-androidpublisher.version>
<payermax-server.version>1.0.12</payermax-server.version>
<sharding-jdbc.version>5.5.1</sharding-jdbc.version>
<sharding-jdbc.version>5.5.2</sharding-jdbc.version>
<commons-lang.version>2.6</commons-lang.version>
<tencentcloud-sdk-java.version>3.1.781</tencentcloud-sdk-java.version>
<tencentcloud-cos-sdk-java.version>5.6.179</tencentcloud-cos-sdk-java.version>
<tencentcloud-cos-sts-sdk-java.version>3.1.1</tencentcloud-cos-sts-sdk-java.version>
<rocketmq-spring-boot.version>2.3.1</rocketmq-spring-boot.version>
<rocketmq-spring-boot.version>2.3.3</rocketmq-spring-boot.version>
<kaptcha.version>2.3.2</kaptcha.version>
<hippo4j-core.version>1.5.0</hippo4j-core.version>
<android-json.version>0.0.20131108.vaadin1</android-json.version>