zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into wumedical/v1

Browse Source 
# Conflicts:
#	src/main/java/com/peanut/modules/common/dao/ChineseMedicineResearchDao.java
#	src/main/java/com/peanut/modules/common/dao/GeneralArticleDao.java
#	src/main/java/com/peanut/modules/common/entity/ChineseMedicineResearch.java
#	src/main/java/com/peanut/modules/common/entity/GeneralArticle.java
This commit is contained in:
wangjinlei
2024-03-15 14:27:22 +08:00
parent 3cef570c97 d099c05e90
commit 66b9cb6a0b
19 changed files with 545 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/peanut/modules/sys/service/impl/SysUserTokenServiceImpl.java
View File

@@ -23,7 +23,7 @@ import java.util.Date;
@Service("sysUserTokenService")
public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUserTokenEntity> implements SysUserTokenService {
//10天后过期
private final static int EXPIRE = 3600 * 12 * 10;
private final static int EXPIRE = 3600 * 24 * 10;
@Override
@@ -48,10 +48,12 @@ public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUse
//保存token
this.save(tokenEntity);
}else{
tokenEntity.setToken(token);
if (tokenEntity.getExpireTime().getTime() > now.getTime()){
token = tokenEntity.getToken();
}
tokenEntity.setToken(token);
tokenEntity.setUpdateTime(now);
tokenEntity.setExpireTime(expireTime);
//更新token
this.updateById(tokenEntity);
}