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

Merge branch 'sharding' into test

Browse Source 
# Conflicts:
#	src/main/java/com/sqx/SqxApplication.java
#	src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java
#	src/main/resources/mapper/course/CourseDao.xml
This commit is contained in:
wangw
2024-12-30 16:30:04 +08:00
parent f8e4fbf057 257bc9e760
commit 9bb24f0aba
41 changed files with 669 additions and 1115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java
View File

@@ -97,7 +97,7 @@ public class RedisServiceImpl implements RedisService {
expireTime = jsonObject.getLong("expireTime");
}
if ((StrUtil.isNotBlank(permanentlyFreeWatch) && redisUtils.isExpiredSet(freeWatchKey)) || (StrUtil.isNotBlank(permanentlyFreeWatch) && DateUtil.current() >= expireTime)) {
if ((StrUtil.isNotBlank(permanentlyFreeWatch) && redisUtils.isExpiredSet(freeWatchKey)) || (StrUtil.isNotBlank(permanentlyFreeWatch) && DateUtil.current(false) >= expireTime)) {
if (StrUtil.isBlank(permanentlyFreeWatch)) {
return null;
}
@@ -121,7 +121,7 @@ public class RedisServiceImpl implements RedisService {
redisUtils.set(watchKey, jsonObject.toJSONString(), expire);
return false;
}else {
return DateUtil.current() > expireTime;
return DateUtil.current(false) > expireTime;
}
}
}
@@ -149,7 +149,7 @@ public class RedisServiceImpl implements RedisService {
Integer expireTime = jsonObject.getInteger("expireTime");
Long second = jsonObject.getLong("second");
return expireTime == -1 ? second : expireTime > DateUtil.current() ? expireTime - DateUtil.current() : 0L;
return expireTime == -1 ? second : expireTime > DateUtil.current(false) ? expireTime - DateUtil.current(false) : 0L;
}