From 77d0b2f08d33730aa0701e0b528edcade5c4879b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:38:11 +0800
Subject: [PATCH] screen-api更新
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 2f34eee..ea704fe 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
@@ -7,6 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -22,7 +23,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.SysConfig;
import com.moral.api.service.SysConfigService;
-import com.moral.api.service.UserLogService;
import com.moral.api.service.UserService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
@@ -50,25 +50,35 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
Map<String, Object> result = userService.login(parameters);
- if (!result.containsKey("data")) {
+ if (!result.containsKey("token")) {
return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
}
- Map<String, Object> data = (Map<String, Object>) result.get("data");
- return ResultMessage.ok(data);
+ return ResultMessage.ok(result);
}
- @ApiOperation(value = "������", notes = "������")
- @RequestMapping(value = "logout", method = RequestMethod.POST)
+ @ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
- if (!parameters.containsKey("uid")) {
+ @RequestMapping(value = "getUserInfo", method = RequestMethod.POST)
+ public ResultMessage getUserInfo(HttpServletRequest request) {
+ String token = request.getHeader("token");
+ Map<String, Object> result = userService.getUserInfo(token);
+ return ResultMessage.ok(result);
+ }
+
+ @ApiOperation(value = "������", notes = "������")
+ @RequestMapping(value = "logout", method = RequestMethod.GET)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ public ResultMessage logout(Integer userId, HttpServletRequest request) {
+ if (userId == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- TokenUtils.destoryToken(parameters.get("uid").toString(), token);
+ TokenUtils.destoryToken(userId.toString(), token);
return ResultMessage.ok();
}
@@ -79,9 +89,9 @@
queryWrapper.eq(Constants.FRONT_VERIFICATIONCODE_COLUMN, Constants.FRONT_ERIFICATIONCODE_VALUE);
SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
if (Constants.VERFICATIONCODE_OPEN.equals(sysConfig.getCode())) {
- return new ResultMessage(ResponseCodeEnum.VERIFICATION_OPEN,null);
+ return new ResultMessage(ResponseCodeEnum.VERIFICATION_OPEN, null);
}
- return new ResultMessage(ResponseCodeEnum.VERIFICATION_CLOSE,null);
+ return new ResultMessage(ResponseCodeEnum.VERIFICATION_CLOSE, null);
}
@ApiOperation(value = "���������������", notes = "���������������")
--
Gitblit v1.8.0