Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QA
holmes
Commits
301c1ab8
Commit
301c1ab8
authored
Jun 25, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录接口的参数类型
parent
1e27a169
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
3 deletions
+69
-3
PermissionController.java
...va/cn/qg/holmes/controller/auth/PermissionController.java
+51
-0
UserController.java
...ain/java/cn/qg/holmes/controller/auth/UserController.java
+4
-3
LoginVo.java
src/main/java/cn/qg/holmes/entity/auth/LoginVo.java
+14
-0
No files found.
src/main/java/cn/qg/holmes/controller/auth/PermissionController.java
0 → 100644
View file @
301c1ab8
package
cn
.
qg
.
holmes
.
controller
.
auth
;
import
cn.qg.holmes.common.JsonResult
;
import
cn.qg.holmes.entity.auth.Permission
;
import
cn.qg.holmes.service.auth.PermissionService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
@CrossOrigin
@RestController
@RequestMapping
(
"/permission"
)
public
class
PermissionController
{
@Autowired
PermissionService
permissionService
;
/**
* 新增权限
* @param permission 权限实体
* @return
*/
@PostMapping
(
"/add"
)
public
JsonResult
addPermission
(
Permission
permission
)
{
return
JsonResult
.
buildSuccessResult
(
permissionService
.
save
(
permission
));
}
/**
* 编辑权限
* @param permission 权限实体
* @return
*/
@PostMapping
(
"/edit"
)
public
JsonResult
editPermission
(
Permission
permission
)
{
return
JsonResult
.
buildSuccessResult
(
permissionService
.
saveOrUpdate
(
permission
));
}
/**
* 删除权限
* @param permissionId 权限id
* @return
*/
@GetMapping
(
"/del"
)
public
JsonResult
delPermission
(
@RequestParam
Integer
permissionId
)
{
return
JsonResult
.
buildSuccessResult
(
permissionService
.
removeById
(
permissionId
));
}
@GetMapping
(
"/list"
)
public
JsonResult
getPermissionList
()
{
return
null
;
}
}
src/main/java/cn/qg/holmes/controller/auth/UserController.java
View file @
301c1ab8
package
cn
.
qg
.
holmes
.
controller
.
auth
;
package
cn
.
qg
.
holmes
.
controller
.
auth
;
import
cn.qg.holmes.common.JsonResult
;
import
cn.qg.holmes.common.JsonResult
;
import
cn.qg.holmes.entity.auth.LoginVo
;
import
cn.qg.holmes.entity.auth.User
;
import
cn.qg.holmes.entity.auth.User
;
import
cn.qg.holmes.entity.auth.UserInfoVo
;
import
cn.qg.holmes.entity.auth.UserInfoVo
;
import
cn.qg.holmes.service.auth.LoginService
;
import
cn.qg.holmes.service.auth.LoginService
;
...
@@ -35,12 +36,12 @@ public class UserController {
...
@@ -35,12 +36,12 @@ public class UserController {
/**
/**
* 登录,鉴权走ldap
* 登录,鉴权走ldap
* @param username 用户名
* @param password 密码
* @return
* @return
*/
*/
@PostMapping
(
"/login"
)
@PostMapping
(
"/login"
)
public
JsonResult
login
(
String
username
,
String
password
)
{
public
JsonResult
login
(
@RequestBody
LoginVo
loginVo
)
{
String
username
=
loginVo
.
getUsername
();
String
password
=
loginVo
.
getPassword
();
boolean
loginResult
=
loginService
.
login
(
username
,
password
);
boolean
loginResult
=
loginService
.
login
(
username
,
password
);
if
(!
loginResult
)
{
if
(!
loginResult
)
{
return
JsonResult
.
buildErrorStateResult
(
"用户名或密码错误"
,
false
);
return
JsonResult
.
buildErrorStateResult
(
"用户名或密码错误"
,
false
);
...
...
src/main/java/cn/qg/holmes/entity/auth/LoginVo.java
0 → 100644
View file @
301c1ab8
package
cn
.
qg
.
holmes
.
entity
.
auth
;
import
lombok.Data
;
/**
* 登录参数类
*/
@Data
public
class
LoginVo
{
private
String
username
;
private
String
password
;
}
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