From 7a0dd449cc2f49c18c2bc324a3ed283b5f1b3cf5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 17:43:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 b9ced50..edfd72f 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
@@ -24,7 +24,7 @@
/**
* token 控制
*
- * @author ruoyi
+ * @author jqs
*/
@RestController
public class TokenController
@@ -55,6 +55,16 @@
return R.ok(tokenService.createMiniToken(appMiniLoginVo));
}
+ @ApiOperation("商户端登录")
+ @PostMapping("shopLogin")
+ public R<?> shopLogin(@RequestBody AppMiniLoginDto appMiniLoginDto)
+ {
+ // 小程序用户登录
+ AppMiniLoginVo appMiniLoginVo = sysLoginService.miniLogin(appMiniLoginDto);
+ // 获取登录token
+ return R.ok(tokenService.createMiniToken(appMiniLoginVo));
+ }
+
@DeleteMapping("logout")
public R<?> logout(HttpServletRequest request)
{
--
Gitblit v1.7.1