From fdbef2a3293e536be6b119e4e1e67cc8cc9842f0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Apr 2022 08:55:29 +0800
Subject: [PATCH] 空气质量排名报告
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 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 dfb403e..3486170 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
@@ -49,49 +49,47 @@
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"));
}
- return ResultMessage.ok(result.get("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() {
+ Map<String, Object> result = userService.getCurrentUserInfo();
+ 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();
}
- /**
- * @Description: ���������������������������
- * @Param: []
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/3/18
- */
-
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@RequestMapping(value = "verificationCode/config", method = RequestMethod.GET)
- public void verifyConfig(HttpServletResponse response) {
+ public ResultMessage verifyConfig(HttpServletResponse response) {
QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type", Constants.VERIFICATION_TYPE);
+ queryWrapper.eq(Constants.FRONT_VERIFICATIONCODE_COLUMN, Constants.FRONT_ERIFICATIONCODE_VALUE);
SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
- String code = sysConfig.getCode();
- if (Constants.VERFICATIONCODE_OPEN.equals(code)) {
- try {
- response.sendRedirect("/verificationCode/get");
- } catch (IOException e) {
- e.printStackTrace();
- }
+ if (Constants.VERFICATIONCODE_OPEN.equals(sysConfig.getCode())) {
+ return new ResultMessage(ResponseCodeEnum.VERIFICATION_OPEN, null);
}
+ return new ResultMessage(ResponseCodeEnum.VERIFICATION_CLOSE, null);
}
@ApiOperation(value = "���������������", notes = "���������������")
--
Gitblit v1.8.0