From 54c0125835e850b97793601ac45ee62fa1c4b12e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 09:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 14 +++++---------
1 files changed, 5 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 ea704fe..b93a263 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
@@ -7,7 +7,6 @@
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -15,10 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.SysConfig;
@@ -34,6 +30,7 @@
@Slf4j
@Api(tags = {"������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
public class LoginController {
@Autowired
@@ -42,7 +39,7 @@
@Autowired
private SysConfigService sysConfigService;
- @ApiOperation(value = "������", notes = "������")
+ @ApiOperation(value = "������������", notes = "������������")
@RequestMapping(value = "login", method = RequestMethod.POST)
public ResultMessage login(@RequestBody Map<String, Object> parameters) {
if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
@@ -61,9 +58,8 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "getUserInfo", method = RequestMethod.POST)
- public ResultMessage getUserInfo(HttpServletRequest request) {
- String token = request.getHeader("token");
- Map<String, Object> result = userService.getUserInfo(token);
+ public ResultMessage getUserInfo() {
+ Map<String, Object> result = userService.getCurrentUserInfo();
return ResultMessage.ok(result);
}
--
Gitblit v1.8.0