From 268a86dc9146b450721e4c0e4dbbe0daa03ee9c6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 12 Mar 2021 17:32:19 +0800
Subject: [PATCH] 校验用户信息，用户增删改查
---
screen-api/src/main/java/com/moral/api/controller/WebController.java | 106 ++++++----------------------------------------------
1 files changed, 13 insertions(+), 93 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/WebController.java b/screen-api/src/main/java/com/moral/api/controller/WebController.java
index 2d7943b..73a11d1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/WebController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/WebController.java
@@ -18,11 +18,11 @@
import org.springframework.web.bind.annotation.RestController;
import com.moral.api.entity.Group;
-import com.moral.api.entity.User;
import com.moral.api.service.GroupService;
import com.moral.api.service.UserService;
import com.moral.constant.ResultMessage;
-import com.moral.redis.RedisUtil;
+import com.moral.util.TokenUtils;
+import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -36,111 +36,31 @@
@Autowired
private GroupService groupService;
- /**
- * @param account ������
- * @param password ������
- * @Auther jinpengyong
- * @Description web������
- */
@ApiOperation(value = "������", notes = "������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "������", required = true, paramType = "path", dataType = "String"),
- @ApiImplicitParam(name = "password", value = "������", required = true, paramType = "path", dataType = "String")
+ @ApiImplicitParam(name = "account", value = "������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "password", value = "������", required = false, paramType = "query", dataType = "String")
})
- @RequestMapping(value = "login/{account}/{password}", method = RequestMethod.GET)
- public ResultMessage login(@PathVariable("account") String account, @PathVariable("password") String password) {
- if (account == null || password == null) {
- return ResultMessage.fail("���������������������������");
+ @RequestMapping(value = "login", method = RequestMethod.POST)
+ public ResultMessage login(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
+ return ResultMessage.fail("���������������������������������");
}
- Map<String, Object> map = userService.login(account, password);
+ Map<String, Object> map = userService.login(parameters);
if (map.get("token") == null) {
return ResultMessage.fail(map.get("msg").toString());
}
- return ResultMessage.ok(map.get("token"));
+ return ResultMessage.ok(map);
}
@ApiOperation(value = "������", notes = "������")
@RequestMapping(value = "logout", method = RequestMethod.POST)
public ResultMessage logout(HttpServletRequest request) {
+ String userId = request.getHeader("uid");
String token = request.getHeader("token");
- if (token == null) {
- return ResultMessage.fail("���������");
- }
- RedisUtil.del(token);
+ TokenUtils.destoryToken(userId, token);
return ResultMessage.ok();
- }
-
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "password", value = "������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "email", value = "������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "mobile", value = "���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String")
- })
- @RequestMapping(value = "addUser", method = RequestMethod.POST)
- public ResultMessage addUser(User user, HttpServletRequest request) {
- Integer currentUserId = Integer.parseInt(request.getHeader("uid"));
- Map<String, Object> map = userService.addUser(user, currentUserId);
- String msg = map.get("msg").toString();
- boolean flag = Boolean.parseBoolean(map.get("flag").toString());
- if (flag) {
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "path", dataType = "String")
- })
- @RequestMapping(value = "deleteUser/{userId}", method = RequestMethod.GET)
- public ResultMessage deleteUser(@PathVariable("userId") String userId, HttpServletRequest request) {
- Integer currentUserId = Integer.parseInt(request.getHeader("uid"));
- Map<String, Object> map = userService.deleteUser(Integer.parseInt(userId), currentUserId);
- String msg = map.get("msg").toString();
- boolean flag = Boolean.parseBoolean(map.get("flag").toString());
- if (flag) {
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "password", value = "������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "email", value = "������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "mobile", value = "���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String")
- })
- @RequestMapping(value = "updateUser", method = RequestMethod.POST)
- public ResultMessage updateUser(User user, HttpServletRequest request) {
- Integer currentUserId = Integer.parseInt(request.getHeader("uid"));
- Map<String, Object> map = userService.updateUser(user, currentUserId);
- String msg = map.get("msg").toString();
- boolean flag = Boolean.parseBoolean(map.get("flag").toString());
- if (flag) {
- return ResultMessage.ok(msg);
- }
- return ResultMessage.fail(msg);
- }
-
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = false, paramType = "path", dataType = "String")
- })
- @RequestMapping(value = "getUserInfo/{userId}", method = RequestMethod.GET)
- public ResultMessage getUserInfo(@PathVariable("userId") String userId, HttpServletRequest request) {
- Integer currentUserId = Integer.parseInt(request.getHeader("uid"));
- if (userId == null) {
- List<User> users = userService.getUsersByOrgId(currentUserId);
- return ResultMessage.ok(users);
- }
- User user = userService.getUserById(Integer.parseInt(userId), currentUserId);
- return ResultMessage.ok(user);
}
@ApiOperation(value = "���������", notes = "���������")
--
Gitblit v1.8.0