From f0376f72170c2eb236bec5560b8c5734edd222f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 31 Mar 2021 17:16:40 +0800
Subject: [PATCH] common模块： 增加了convert工具类，驼峰和下划线相互转换 更新了Date工具类，添加根据Date，day获取目标date的方法 更新WebUtils工具类，添加获取请求Ip方法 manage模块： 组织和后台用户增删改查模块全部完成 增加aop用作日志插入
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/LoginController.java b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
index cb1862a..dfb403e 100644
--- a/screen-api/src/main/java/com/moral/api/controller/LoginController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
@@ -45,7 +45,8 @@
@RequestMapping(value = "login", method = RequestMethod.POST)
public ResultMessage login(@RequestBody Map<String, Object> parameters) {
if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
Map<String, Object> result = userService.login(parameters);
if (!result.containsKey("data")) {
@@ -57,15 +58,15 @@
@ApiOperation(value = "������", notes = "������")
@RequestMapping(value = "logout", method = RequestMethod.POST)
@ApiImplicitParams({
- @ApiImplicitParam(name = "uid", value = "������id", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- public ResultMessage logout(String uid, HttpServletRequest request) {
- if (uid == null) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ if (!parameters.containsKey("uid")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- TokenUtils.destoryToken(uid, token);
+ TokenUtils.destoryToken(parameters.get("uid").toString(), token);
return ResultMessage.ok();
}
@@ -84,7 +85,7 @@
queryWrapper.eq("type", Constants.VERIFICATION_TYPE);
SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
String code = sysConfig.getCode();
- if (Constants.VERIFICATION_OPEN_CODE.equals(code)) {
+ if (Constants.VERFICATIONCODE_OPEN.equals(code)) {
try {
response.sendRedirect("/verificationCode/get");
} catch (IOException e) {
--
Gitblit v1.8.0