From 354cc1c2c7ff69c1183d77f1761a71d1ad5669da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 30 九月 2025 10:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 68 ++++-----------------------------
1 files changed, 9 insertions(+), 59 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index de263c7..0aca0b3 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,12 +1,12 @@
package com.ruoyi.web.controller.system;
+import com.alibaba.fastjson.JSON;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.model.LoginAppBody;
+import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.SysLoginService;
@@ -18,7 +18,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -56,71 +55,22 @@
/**
* 账号密码登录
*
- * @param loginBody 登录信息
+ * @param param 登录信息
* @return 结果
*/
@ApiOperation(value = "账号密码登录",notes = "账号密码登录")
- @PostMapping("/login")
- public AjaxResult login(@RequestBody LoginBody loginBody)
+ @PostMapping("/api/loginApp")
+ public AjaxResult login(@RequestBody String param)
{
+ LoginAppBody loginAppBody = JSON.parseObject(param, LoginAppBody.class);
AjaxResult ajax = AjaxResult.success();
// 生成令牌
- LoginUser loginUser = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
- loginBody.getUuid());
- ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
- List<SysRole> roles = loginUser.getUser().getRoles();
- if(CollectionUtils.isEmpty(roles)){
- return AjaxResult.error("请关联角色!");
- }
- if(roles.get(0).getStatus() == 1){
- return AjaxResult.error("该账号角色已被禁用!");
- }
-
- List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
-
- ajax.put("menus",menus);
- ajax.put("roleName",roles.get(0).getRoleName());
+ LoginUserApplet loginUser = loginService.loginCodeApplet(loginAppBody.getAccount(), loginAppBody.getPassword());
+ ajax.put(Constants.TOKEN, tokenService.createTokenApplet(loginUser));
ajax.put("userInfo",loginUser);
return ajax;
}
- /**
- * 账号密码登录
- *
- * @param loginBody 登录信息
- * @return 结果
- */
- @ApiOperation(value = "短信登录",notes = "短信登录")
- @PostMapping("/loginCode")
- public AjaxResult loginCode(@RequestBody LoginBody loginBody)
- {
- AjaxResult ajax = AjaxResult.success();
- return ajax;
- }
-
- /**
- * 获取验证码
- *
- * @param phone 手机号
- * @return 结果
- */
-// @ApiOperation(value = "获取验证码",notes = "获取验证码")
-// @GetMapping("/getCode")
-// public AjaxResult getCode(@RequestParam String phone)
-// {
-// // 发送验证码并存储到redis
-// if (StringUtils.hasLength(phone)) {
-// String code = String.valueOf((int) (Math.random() * 1000000));
-// redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
-// try {
-// smsUtil.sendSms(phone, "2369926", new String[]{code});
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// return AjaxResult.success("发送短信验证码成功！5分钟内有效");
-// }
-// return AjaxResult.error(500, "发送短信验证码失败，请确认手机号码!");
-// }
/**
* 获取用户信息
--
Gitblit v1.7.1