From d1b9a449556b86fb23ae65022d2f5d806fdd2e73 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 九月 2025 17:10:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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 cff09cb..e4c3061 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
@@ -88,25 +88,25 @@
* @param loginBody 登录信息
* @return 结果
*/
- @ApiOperation(value = "短信登录",notes = "短信登录")
- @PostMapping("/loginCode")
- public AjaxResult loginCode(@RequestBody LoginBody loginBody)
- {
- AjaxResult ajax = AjaxResult.success();
- // 生成令牌
- LoginUser loginUser = loginService.loginCode(loginBody.getUsername(), loginBody.getCode());
- ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
- List<SysRole> roles = loginUser.getUser().getRoles();
- if(CollectionUtils.isEmpty(roles)){
- return AjaxResult.error("请关联角色!");
- }
- List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
-
- ajax.put("menus",menus);
- ajax.put("roleName",roles.get(0).getRoleName());
- ajax.put("userInfo",loginUser);
- return ajax;
- }
+// @ApiOperation(value = "短信登录",notes = "短信登录")
+// @PostMapping("/loginCode")
+// public AjaxResult loginCode(@RequestBody LoginBody loginBody)
+// {
+// AjaxResult ajax = AjaxResult.success();
+// // 生成令牌
+// LoginUser loginUser = loginService.loginCode(loginBody.getUsername(), loginBody.getCode());
+// ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
+// List<SysRole> roles = loginUser.getUser().getRoles();
+// if(CollectionUtils.isEmpty(roles)){
+// return AjaxResult.error("请关联角色!");
+// }
+// List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
+//
+// ajax.put("menus",menus);
+// ajax.put("roleName",roles.get(0).getRoleName());
+// ajax.put("userInfo",loginUser);
+// return ajax;
+// }
/**
* 获取验证码
--
Gitblit v1.7.1