From 37d76adf129d41f65342874886c43db450ecb0ef Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 12 Mar 2021 17:16:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index 0a55944..600db90 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -1,32 +1,58 @@
package com.moral.api.controller;
+import com.moral.api.pojo.dto.LoginDTO;
import com.moral.api.service.ManageAccountService;
+import com.moral.constant.Constants;
import com.moral.constant.ResultMessage;
import com.moral.util.ObjectUtils;
-import io.netty.util.internal.ObjectUtil;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.Map;
@Slf4j
-@Api(tags = {"������������"})
+@Api(tags = {"������������������"})
@RestController
@RequestMapping("/account")
public class AccountController {
@Resource
ManageAccountService accountService;
+ @Autowired
+ @Qualifier("tokenRedisTemplate")
+ RedisTemplate redisTemplate;
+
@PostMapping("login")
- public ResultMessage login(@RequestBody Map<String,Object> paramters){
- if(!ObjectUtils.checkParamAndMap(paramters,"account","password"))
- return ResultMessage.fail("���������������");
- Map<String, Object> result = accountService.login(paramters);
- if(result.get("accountId").equals(-1))
- return ResultMessage.fail(result);
- return ResultMessage.ok(result);
+ public ResultMessage login(@RequestBody Map<String, Object> parameters) {
+ if (!ObjectUtils.isNotAllEmpty(parameters, "account", "password"))
+ return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ String AESAccount = (String) parameters.get("account");
+ String AESPassword = (String) parameters.get("password");
+
+ LoginDTO loginDTO = accountService.login(AESAccount,AESPassword);
+
+ if(loginDTO.getCode().equals(LoginDTO.SUCCESS))
+ return ResultMessage.ok(loginDTO);
+ return ResultMessage.fail(loginDTO);
+ }
+
+
+ @PostMapping("logout")
+ public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ if(!ObjectUtils.isNotAllEmpty(parameters,"accountId"))
+ return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ String token = request.getHeader("token");
+
+ if(accountService.logout(String.valueOf(parameters.get("accountId")),token))
+ return ResultMessage.ok("������������");
+ return ResultMessage.fail("������������");
+
}
--
Gitblit v1.8.0