From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index a9f2046..4ca9299 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysRoleService;
@@ -61,7 +62,7 @@
* @param loginBody 登录信息
* @return 结果
*/
- @ApiOperation(value = "账号密码登录",notes = "账号密码登录")
+ @ApiOperation(value = "管理后台账号密码登录",notes = "账号密码登录")
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody)
{
@@ -83,6 +84,25 @@
ajax.put("menus",menus);
ajax.put("roleName",roles.get(0).getRoleName());
ajax.put("userInfo",loginUser);
+ return ajax;
+ }
+ /**
+ * 账号密码登录
+ *
+ * @param loginBody 登录信息
+ * @return 结果
+ */
+ @ApiOperation(value = "小程序账号密码登录",notes = "账号密码登录")
+ @PostMapping("/loginApplet")
+ public AjaxResult loginApplet(@RequestBody LoginBody loginBody)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ // 生成令牌
+ LoginUserApplet loginUser = loginService.loginApplet(loginBody.getUsername(), loginBody.getPassword());
+ ajax.put(Constants.TOKEN, tokenService.createTokenApplet(loginUser));
+ ajax.put("userInfo",loginUser);
+ ajax.put("roleName",loginUser.getRoleName());
+ ajax.put("deptType",loginUser.getRoleName());
return ajax;
}
@@ -127,7 +147,7 @@
String code = String.valueOf((int) (Math.random() * 1000000));
redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
try {
- msgUtils.sendMsg(phone, code);
+// msgUtils.sendMsg(phone, code);
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1