Merge remote-tracking branch 'origin/master'

沈斌

2017-10-24 78b39c39cf7d68c2c0efc3c2fabb8f57963d030d

Merge remote-tracking branch 'origin/master'

 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 = "";