From 923510deed8c991823db60dbd430bf18d78b98cb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 07 Apr 2021 17:27:24 +0800
Subject: [PATCH] 登陆用户信息返回修改，用户组查询修改
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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..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,9 +44,12 @@
@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());
@@ -52,7 +58,17 @@
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 = "������")
--
Gitblit v1.8.0