From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/controller/UserController.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java
index 6044b15..41e3d80 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java
@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -35,16 +36,10 @@
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "������,������6-10", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "password", value = "������,������6-20", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "email", value = "������,������123456@qq.com", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "mobile", value = "���������,1������11���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "addUser", method = RequestMethod.POST)
- public ResultMessage addUser(User user, HttpServletRequest request) {
+ public ResultMessage addUser(@RequestBody User user, HttpServletRequest request) {
if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -59,8 +54,7 @@
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "String")
})
@RequestMapping(value = "deleteUser", method = RequestMethod.POST)
public ResultMessage deleteUser(String userId) {
@@ -79,17 +73,11 @@
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "������,������6-10", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "password", value = "������,������6-20", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "email", value = "������,������123456@qq.com", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "mobile", value = "���������,1������11���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "updateUser", method = RequestMethod.POST)
- public ResultMessage updateUser(User user, HttpServletRequest request) {
- if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
+ public ResultMessage updateUser(@RequestBody User user, HttpServletRequest request) {
+ if (user.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
--
Gitblit v1.8.0