work/book-api
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: work:c3f1343ea9a17c5bbc85421c3c3423f1fc0d56fc
Branches Tags
work:master
work:main
work:xiaoqiantx
...
compare: work:2a35ec21520622238a0e5a411c32b7ecad7827b1
Branches Tags
work:master
work:main
work:xiaoqiantx

3 Commits
c3f1343ea9 ... 2a35ec2152

Author SHA1 Message Date
xiaoqiantx223 2a35ec2152 Merge branch 'master' of http://47.96.1.176:3000/work/book-api into xiaoqaintx 
# Conflicts:
#	maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java
 2024-07-18 14:10:43 +08:00
xiaoqiantx223 c655d47680 用户端注册退出登录修改 2024-07-18 14:08:50 +08:00
xiaoqiantx223 de3ae509d6 xiaoqiantx 2024-07-18 09:29:27 +08:00
2 changed files with 6 additions and 11 deletions
Show Stats Expand all files Collapse all files

8
maku-server/src/main/java/net/maku/maku/controller/TUserController.java
View File

@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import java.util.List; import java.util.List;
import java.util.UUID;
/** /**
* *
@ -54,7 +55,9 @@ public class TUserController {
public Result login(@RequestBody TUserEntity entity){ public Result login(@RequestBody TUserEntity entity){
TUserEntity entity1 = tUserService.login(entity); TUserEntity entity1 = tUserService.login(entity);
if(ObjectUtils.isNotNull(entity1)){ if(ObjectUtils.isNotNull(entity1)){
return Result.ok(entity1); String token = UUID.randomUUID()+"";
redisCache.set(token,entity1);
return Result.ok(token);
}else { }else {
return Result.error("登录失败"); return Result.error("登录失败");
} }
@ -73,9 +76,6 @@ public class TUserController {
@Operation(summary = "退出登录") @Operation(summary = "退出登录")
public Result<String> logout(HttpServletRequest request) { public Result<String> logout(HttpServletRequest request) {
String token = request.getHeader("token"); String token = request.getHeader("token");
if (token == null) {
return Result.error("token为空");
}
Object o = redisCache.get(token); Object o = redisCache.get(token);
if (o != null) { if (o != null) {
redisCache.delete(token); redisCache.delete(token);

9
maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java
View File

@ -1,6 +1,5 @@
package net.maku.maku.service.impl; package net.maku.maku.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -39,9 +38,8 @@ public class TUserServiceImpl extends BaseServiceImpl<TUserDao, TUserEntity> imp
private LambdaQueryWrapper<TUserEntity> getWrapper(TUserQuery query){ private LambdaQueryWrapper<TUserEntity> getWrapper(TUserQuery query){
LambdaQueryWrapper<TUserEntity> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<TUserEntity> wrapper = Wrappers.lambdaQuery();
wrapper.like(TUserEntity::getUsername, query.getUsername()); wrapper.like(ObjectUtils.isNotEmpty(query.getUsername()), TUserEntity::getUsername, query.getUsername());
wrapper.eq(ObjectUtil.isNotNull(query.getStatus()), TUserEntity::getStatus, query.getStatus()); wrapper.eq(ObjectUtils.isNotEmpty(query.getStatus()), TUserEntity::getStatus, query.getStatus());
return wrapper; return wrapper;
} }
@ -72,9 +70,6 @@ public class TUserServiceImpl extends BaseServiceImpl<TUserDao, TUserEntity> imp
wrapper.eq(TUserEntity::getPassword, entity.getPassword()); wrapper.eq(TUserEntity::getPassword, entity.getPassword());
TUserEntity one = getOne(wrapper); TUserEntity one = getOne(wrapper);
if(ObjectUtils.isNotNull(one)) { if(ObjectUtils.isNotNull(one)) {
UUID uuid = UUID.randomUUID();
one.setAvatar(uuid.toString());
updateById(one);
return one; return one;
} }
return null; return null;