From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 01 四月 2025 16:03:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index 4459cb0..d9f93ed 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -2,8 +2,10 @@ import javax.servlet.http.HttpServletRequest; +import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto; import com.ruoyi.system.api.model.AppMiniLoginDto; import com.ruoyi.system.api.model.AppMiniLoginVo; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -27,6 +29,8 @@ * @author jqs */ @RestController +@Api(value = "系统和小程序登录", tags = "系统和小程序登录") + public class TokenController { @Autowired @@ -55,6 +59,16 @@ return R.ok(tokenService.createMiniToken(appMiniLoginVo)); } + @ApiOperation("小程序注册") + @PostMapping("miniRegister") + public R<?> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto) + { + // 小程序用户登录 + AppMiniLoginVo appMiniLoginVo = sysLoginService.miniRegister(appUserRegisterDto); + // 获取登录token + return R.ok(tokenService.createMiniToken(appMiniLoginVo)); + } + @DeleteMapping("logout") public R<?> logout(HttpServletRequest request) { -- Gitblit v1.7.1