From 78b39c39cf7d68c2c0efc3c2fabb8f57963d030d Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 24 Oct 2017 14:07:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/controller/ScreenApiController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ScreenApiController.java b/src/main/java/com/moral/monitor/controller/ScreenApiController.java
index 9aba7e9..18cbeee 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenApiController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenApiController.java
@@ -10,6 +10,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -29,6 +30,7 @@
*/
@RestController
@RequestMapping(value = "screen")
+@CrossOrigin(origins = "*", maxAge = 3600)
public class ScreenApiController {
@Autowired
@@ -153,7 +155,7 @@
* @param request the request
* @return the map
*/
- @RequestMapping(value = "/login", method = RequestMethod.POST)
+ @RequestMapping(value = "/login", method = RequestMethod.GET)
public Map<String, Object> screenLogin(HttpServletRequest request) {
Map<String, Object> resultMap = new HashMap<String, Object>();
String msg = "";
--
Gitblit v1.8.0