czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-01-02 10:45:01 +08:00
parent 51e3639065 003db71b7c
commit f7a63cdea7
10 changed files with 170 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java
View File

@@ -23,8 +23,7 @@ import javax.servlet.http.HttpServletRequest;
public class AppApiMethodAspect {
@Pointcut("!execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..)) " +
"&& (execution(public * (com.sqx.modules.*.controller.*).*(..)) " +
"|| execution(public * (com.sqx.modules.app.*.controller.*).*(..)))")
"&& execution(public * (com.sqx.modules.*.controller..*).*(..)))")
public void pkg() {
}

13
src/main/java/com/sqx/config/ShardingConfig.java
View File

@@ -49,22 +49,11 @@ public class ShardingConfig {
*/
private String centerTablesDataNode;
@Value("${center-tables}")
private String tableNamesAsString;
/**
* 中心表,不进行分库操作
*/
// @Value("${center-tables}")
private Set<String> centerTables;
@PostConstruct
public void init() {
// 使用换行符进行分割，然后去除空白字符，收集到Set集合中
centerTables = Arrays.stream(tableNamesAsString.split(","))
.map(String::trim)
.collect(Collectors.toSet());
}
private List<String> centerTables;
/**

16
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@@ -907,13 +907,17 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
if (StringUtils.isEmpty(msg)) {
return Result.error("验证码不能为空！");
}
Msg msg1 = null;
if (!"prod".equals(profiles) && !"61626364".equals(msg)) {
msg1 = msgDao.findByPhoneAndCode(phone, msg);
if (msg1 == null) {
return Result.error("验证码不正确！");
}
Msg msg1 = msgDao.findByPhoneAndCode(phone, msg);
if (msg1 == null) {
return Result.error("验证码不正确！");
}
// Msg msg1 = null;
// if (!"prod".equals(profiles) || !"61626364".equals(msg)) {
// msg1 = msgDao.findByPhoneAndCode(phone, msg);
// if (msg1 == null) {
// return Result.error("验证码不正确！");
// }
// }
userInfo = new UserEntity();
UserEntity userEntity = null;

4
src/main/java/com/sqx/modules/app/service/impl/UserVipServiceImpl.java
View File

@@ -17,9 +17,9 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
return baseMapper.selectOne(queryWrapper);
}
@Scheduled(cron="0 */1 * * * ?")
// @Scheduled(cron="0 */1 * * * ?")
public void getEndVip() {
baseMapper.updateUserVipByEndTime();
// baseMapper.updateUserVipByEndTime();
}
}

6
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@@ -217,9 +217,11 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
}
} else if (taskCenter.getType().equals(3) && taskCenter.getId().equals(1L)) {
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(userId);
Integer sumOrderNum = 0;
if (inviteAchievement != null) {
sumOrderNum = inviteAchievement.getCount();
}
// Integer sumOrderNum = ordersService.countOrderNum(userId, null);
Integer sumOrderNum = inviteAchievement.getCount();
if (sumOrderNum != null && sumOrderNum < taskCenter.getNumber()) {
return Result.error("领取失败，未达成领取条件");
} else if (recordService.countTaskNum(userId, taskCenter.getId(), null) > 0) {