Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
ry-crm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
田光明
ry-crm
Commits
02e828b9
Commit
02e828b9
authored
Feb 24, 2025
by
EDY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
bbb5be16
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
15 deletions
+13
-15
BaseCustomInfoController.java
...oyi/web/controller/business/BaseCustomInfoController.java
+1
-0
SysLoginController.java
...a/com/ruoyi/web/controller/system/SysLoginController.java
+5
-6
SysLoginService.java
...java/com/ruoyi/framework/web/service/SysLoginService.java
+7
-9
No files found.
ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BaseCustomInfoController.java
View file @
02e828b9
...
...
@@ -78,6 +78,7 @@ public class BaseCustomInfoController extends BaseController
@PostMapping
public
AjaxResult
add
(
@RequestBody
BaseCustomInfo
baseCustomInfo
)
{
baseCustomInfo
.
setFzr
(
getUsername
());
return
toAjax
(
baseCustomInfoService
.
insertBaseCustomInfo
(
baseCustomInfo
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View file @
02e828b9
...
...
@@ -21,7 +21,7 @@ import com.ruoyi.system.service.ISysMenuService;
/**
* 登录验证
*
*
* @author ruoyi
*/
@RestController
...
...
@@ -41,7 +41,7 @@ public class SysLoginController
/**
* 登录方法
*
*
* @param loginBody 登录信息
* @return 结果
*/
...
...
@@ -50,15 +50,14 @@ public class SysLoginController
{
AjaxResult
ajax
=
AjaxResult
.
success
();
// 生成令牌
String
token
=
loginService
.
login
(
loginBody
.
getUsername
(),
loginBody
.
getPassword
(),
loginBody
.
getCode
(),
loginBody
.
getUuid
());
String
token
=
loginService
.
login
(
loginBody
.
getUsername
(),
loginBody
.
getPassword
());
ajax
.
put
(
Constants
.
TOKEN
,
token
);
return
ajax
;
}
/**
* 获取用户信息
*
*
* @return 用户信息
*/
@GetMapping
(
"getInfo"
)
...
...
@@ -84,7 +83,7 @@ public class SysLoginController
/**
* 获取路由信息
*
*
* @return 路由信息
*/
@GetMapping
(
"getRouters"
)
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View file @
02e828b9
...
...
@@ -31,7 +31,7 @@ import com.ruoyi.system.service.ISysUserService;
/**
* 登录校验方法
*
*
* @author ruoyi
*/
@Component
...
...
@@ -45,7 +45,7 @@ public class SysLoginService
@Autowired
private
RedisCache
redisCache
;
@Autowired
private
ISysUserService
userService
;
...
...
@@ -54,17 +54,15 @@ public class SysLoginService
/**
* 登录验证
*
*
* @param username 用户名
* @param password 密码
* @param code 验证码
* @param uuid 唯一标识
* @return 结果
*/
public
String
login
(
String
username
,
String
password
,
String
code
,
String
uuid
)
public
String
login
(
String
username
,
String
password
)
{
// 验证码校验
validateCaptcha
(
username
,
code
,
uuid
);
//
// 验证码校验
//
validateCaptcha(username, code, uuid);
// 登录前置校验
loginPreCheck
(
username
,
password
);
// 用户验证
...
...
@@ -102,7 +100,7 @@ public class SysLoginService
/**
* 校验验证码
*
*
* @param username 用户名
* @param code 验证码
* @param uuid 唯一标识
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment