From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +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/LoginController.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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..444fa13 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
@@ -21,7 +21,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.SysConfig;
+import com.moral.api.entity.UserLog;
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;
@@ -29,6 +31,7 @@
import com.moral.pojo.VerificationCode;
import com.moral.util.KaptchaUtils;
import com.moral.util.TokenUtils;
+import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -41,31 +44,45 @@
@Autowired
private SysConfigService sysConfigService;
+ @Autowired
+ private UserLogService userLogService;
+
@ApiOperation(value = "������", notes = "������")
@RequestMapping(value = "login", method = RequestMethod.POST)
- public ResultMessage login(@RequestBody Map<String, Object> parameters) {
+ public ResultMessage login(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
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")) {
return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
}
- return ResultMessage.ok(result.get("data"));
+ Map<String, Object> data = (Map<String, Object>) result.get("data");
+ Map<String, Object> userInfo = (Map<String, Object>) data.get("user");
+ UserLog userLog = new UserLog();
+ String ip = WebUtils.getIpAddr(request);
+ userLog.setIp(ip);
+ userLog.setOperateId((Integer) userInfo.get("userId"));
+ Map<String, Object> organization = (Map<String, Object>) userInfo.get("organization");
+ userLog.setOrganizationId((Integer) organization.get("id"));
+ userLog.setContent(userInfo.get("account") + "���������");
+ userLogService.save(userLog);
+ return ResultMessage.ok(data);
}
@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 +101,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