From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 edfd72f..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,12 +59,12 @@
return R.ok(tokenService.createMiniToken(appMiniLoginVo));
}
- @ApiOperation("商户端登录")
- @PostMapping("shopLogin")
- public R<?> shopLogin(@RequestBody AppMiniLoginDto appMiniLoginDto)
+ @ApiOperation("小程序注册")
+ @PostMapping("miniRegister")
+ public R<?> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto)
{
// 小程序用户登录
- AppMiniLoginVo appMiniLoginVo = sysLoginService.miniLogin(appMiniLoginDto);
+ AppMiniLoginVo appMiniLoginVo = sysLoginService.miniRegister(appUserRegisterDto);
// 获取登录token
return R.ok(tokenService.createMiniToken(appMiniLoginVo));
}
--
Gitblit v1.7.1