Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xzxtshiro/controller/AccessController.java

@@ -9,6 +9,7 @@ import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+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;
@@ -25,6 +26,7 @@ import java.util.Map;
  */
 @RequestMapping(value = "/access")
 @Controller
+@CrossOrigin
 public class AccessController {
     @Autowired
     SysUserService userService;