From dc3e39dfbc7f99e2dd865c0f8274647c00bc5c70 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 16 Jun 2021 15:54:23 +0800
Subject: [PATCH] screen-api 增加kafka消费者以及websocket搭建
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 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 7fe1193..2f34eee 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,6 @@
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;
@@ -31,7 +30,6 @@
import com.moral.pojo.VerificationCode;
import com.moral.util.KaptchaUtils;
import com.moral.util.TokenUtils;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -44,12 +42,9 @@
@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, HttpServletRequest request) {
+ 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());
@@ -59,14 +54,6 @@
return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
}
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"));
- userLog.setOrganizationId((Integer) userInfo.get("organizationId"));
- userLog.setContent(userInfo.get("account") + "���������");
- userLogService.save(userLog);
return ResultMessage.ok(data);
}
@@ -85,28 +72,16 @@
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