修改父类版本为3.6.4

master
zhang chengzhi 2024-08-07 16:48:19 +08:00
parent aa284b51cd
commit 28a0963d9f
6 changed files with 125 additions and 49 deletions

View File

@ -1,7 +1,9 @@
package com.muyu.auth.controller; package com.muyu.auth.controller;
import com.muyu.auth.form.LoginBody; import cn.hutool.core.convert.Convert;
import com.muyu.auth.form.RegisterBody; import com.muyu.auth.domian.LoginUserReq;
import com.muyu.auth.domian.RegisterBody;
import com.muyu.auth.domian.TokenResp;
import com.muyu.auth.service.SysLoginService; import com.muyu.auth.service.SysLoginService;
import com.muyu.common.core.domain.Result; import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.JwtUtils; import com.muyu.common.core.utils.JwtUtils;
@ -10,13 +12,16 @@ import com.muyu.common.security.auth.AuthUtil;
import com.muyu.common.security.service.TokenService; import com.muyu.common.security.service.TokenService;
import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.LoginUser;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import jakarta.servlet.http.HttpServletRequest; import java.util.Map;
/** /**
* token * token
@ -24,6 +29,7 @@ import jakarta.servlet.http.HttpServletRequest;
* @author muyu * @author muyu
*/ */
@RestController @RestController
@Tag(name = "鉴权接口",description = "鉴权相关控制层")
public class TokenController { public class TokenController {
@Autowired @Autowired
private TokenService tokenService; private TokenService tokenService;
@ -32,14 +38,25 @@ public class TokenController {
private SysLoginService sysLoginService; private SysLoginService sysLoginService;
@PostMapping("login") @PostMapping("login")
public Result<?> login (@RequestBody LoginBody form) { @Operation(summary = "登录接口",description = "登录鉴权接口")
public Result<TokenResp> login (@RequestBody LoginUserReq form) {
// 用户登录 // 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
// 获取登录token // 获取登录token
return Result.success(tokenService.createToken(userInfo)); Map<String, Object> tokenMap = tokenService.createToken(userInfo);
return Result.success(
TokenResp.builder()
.accessToken(Convert.toStr(tokenMap.get("access_token")))
.expiresIn(Convert.toLong(tokenMap.get("expires_in")))
.build()
);
} }
@DeleteMapping("logout") @DeleteMapping("logout")
@Operation(summary = "注销接口",description = "用户注销接口")
public Result<?> logout (HttpServletRequest request) { public Result<?> logout (HttpServletRequest request) {
String token = SecurityUtils.getToken(request); String token = SecurityUtils.getToken(request);
if (StringUtils.isNotEmpty(token)) { if (StringUtils.isNotEmpty(token)) {
@ -53,6 +70,7 @@ public class TokenController {
} }
@PostMapping("refresh") @PostMapping("refresh")
@Operation(summary = "用户登录时间刷新",description = "用户登录时间刷新接口,可以进行用户token续约")
public Result<?> refresh (HttpServletRequest request) { public Result<?> refresh (HttpServletRequest request) {
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
if (StringUtils.isNotNull(loginUser)) { if (StringUtils.isNotNull(loginUser)) {

View File

@ -0,0 +1,43 @@
package com.muyu.auth.domian;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*
* @author muyu
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Tag(name = "登录请求实体类")
public class LoginUserReq {
/**
*
*/
@Schema(
title = "用户名称",
type = "String",
defaultValue = "admin",
description = "登录用户名称"
)
private String username;
/**
*
*/
@Schema(
title = "用户密码",
type = "String",
defaultValue = "admin123",
description = "登录用户密码"
)
private String password;
}

View File

@ -0,0 +1,10 @@
package com.muyu.auth.domian;
/**
*
*
* @author muyu
*/
public class RegisterBody extends LoginUserReq {
}

View File

@ -0,0 +1,49 @@
package com.muyu.auth.domian;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Authorzhangchengzhi
* @Packagecom.muyu.auth.domian
* @Projectcloud-auth
* @nameTokenResp
* @Date2024/8/7 15:55
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "token响应结果集",description = "包含token和token有效时间")
public class TokenResp {
/**
* token
*/
@Schema(
title = "token令牌",
type = "String",
defaultValue = "eyj0e.eyj1dlLTj9.Pk5KS_Uh2n",
description = "JWT令牌,包含头,载体,尾"
)
private String accessToken;
/**
*
*/
@Schema(
title = "令牌有效时间/MIN",
type = "Long",
defaultValue = "720",
description = "过期时间,时间单位为分钟(MIN)"
)
private Long expiresIn;
}

View File

@ -1,34 +0,0 @@
package com.muyu.auth.form;
/**
*
*
* @author muyu
*/
public class LoginBody {
/**
*
*/
private String username;
/**
*
*/
private String password;
public String getUsername () {
return username;
}
public void setUsername (String username) {
this.username = username;
}
public String getPassword () {
return password;
}
public void setPassword (String password) {
this.password = password;
}
}

View File

@ -1,10 +0,0 @@
package com.muyu.auth.form;
/**
*
*
* @author muyu
*/
public class RegisterBody extends LoginBody {
}