From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 3486170..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
@@ -14,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;
@@ -33,6 +30,7 @@
@Slf4j
@Api(tags = {"������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
public class LoginController {
@Autowired
@@ -41,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"))) {
--
Gitblit v1.8.0