From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/security/endpoint/ProfileEndpoint.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/security/endpoint/ProfileEndpoint.java b/src/main/java/com/moral/security/endpoint/ProfileEndpoint.java
index 9349580..79d2b24 100644
--- a/src/main/java/com/moral/security/endpoint/ProfileEndpoint.java
+++ b/src/main/java/com/moral/security/endpoint/ProfileEndpoint.java
@@ -2,10 +2,7 @@
 
 import com.moral.security.auth.JwtAuthenticationToken;
 import com.moral.security.model.UserContext;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * End-point for retrieving logged-in user details.
@@ -17,6 +14,7 @@
 @RestController
 public class ProfileEndpoint {
     @RequestMapping(value="/user-context", method=RequestMethod.GET)
+    @CrossOrigin(origins = "*", maxAge = 3600)
     public @ResponseBody
     UserContext get(JwtAuthenticationToken token) {
         return  token.getPrincipal();

--
Gitblit v1.8.0