Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/java/com/moral/controller/ScreenController.java

@@ -28,14 +28,7 @@
import org.springframework.data.redis.core.RedisTemplate;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.util.ObjectUtils;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

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.RequestParam;

import org.springframework.web.bind.annotation.ResponseBody;

import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.bind.annotation.*;

import org.springframework.web.servlet.ModelAndView;

import org.xml.sax.InputSource;

import com.alibaba.fastjson.JSONArray;

@@ -58,7 +51,7 @@
 */

@RestController

@RequestMapping("/screen")

//@CrossOrigin(origins = "*", maxAge = 3600)

@CrossOrigin(origins = "*", maxAge = 3600)

@SuppressWarnings({ "rawtypes", "unchecked", "unused" })

@Api(tags = "Screen", description = "大屏接口") 

public class ScreenController {