From c45c2087783863d127f38aa8fc8a3dcc0acd744f Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 16 七月 2025 10:55:21 +0800 Subject: [PATCH] 配置修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 78 ++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 41 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..cff09cb 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 @@ -1,33 +1,31 @@ package com.ruoyi.web.controller.system; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -import com.ruoyi.common.core.domain.R; +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.redis.RedisCache; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.framework.web.service.SysLoginService; +import com.ruoyi.framework.web.service.SysPermissionService; import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.web.controller.tool.MsgUtils; 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.util.StringUtils; -import org.springframework.web.bind.annotation.*; -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.SysUser; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.web.service.SysLoginService; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.system.service.ISysMenuService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Set; /** * 登录验证 @@ -52,19 +50,17 @@ private TokenService tokenService; @Autowired private ISysRoleService roleService; - @Autowired - private MsgUtils msgUtils; /** * 账号密码登录 * - * @param loginBody 登录信息 * @return 结果 */ @ApiOperation(value = "账号密码登录",notes = "账号密码登录") - @PostMapping("/login") - public AjaxResult login(@RequestBody LoginBody loginBody) + @PostMapping("/api/login") + public AjaxResult login(@RequestBody String param) { + LoginBody loginBody = JSON.parseObject(param, LoginBody.class); AjaxResult ajax = AjaxResult.success(); // 生成令牌 LoginUser loginUser = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), @@ -118,23 +114,23 @@ * @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 { - msgUtils.sendMsg(phone, code); - } catch (Exception e) { - throw new RuntimeException(e); - } - return AjaxResult.success("发送短信验证码成功!5分钟内有效"); - } - return AjaxResult.error(500, "发送短信验证码失败,请确认手机号码!"); - } +// @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 { +// msgUtils.sendMsg(phone, code); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// return AjaxResult.success("发送短信验证码成功!5分钟内有效"); +// } +// return AjaxResult.error(500, "发送短信验证码失败,请确认手机号码!"); +// } /** * 获取用户信息 -- Gitblit v1.7.1