From 37d76adf129d41f65342874886c43db450ecb0ef Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 12 Mar 2021 17:16:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/controller/WebController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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..225d1a5 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
@@ -23,6 +23,7 @@
import com.moral.api.service.UserService;
import com.moral.constant.ResultMessage;
import com.moral.redis.RedisUtil;
+import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -36,27 +37,22 @@
@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 = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "password", value = "������", required = true, 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 = "������")
--
Gitblit v1.8.0