From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 10 ++++++++++
1 files changed, 10 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..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
@@ -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