From 4ac0eff40e0bf4f8074fb7b4806118f7024cc101 Mon Sep 17 00:00:00 2001 From: monkeyk7 Date: Sat, 21 Apr 2018 16:16:48 +0800 Subject: [PATCH] Fixed resourceId --- others/database/initial_data.ddl | 4 ++-- .../com/monkeyk/sos/config/OAuth2ServerConfiguration.java | 8 ++++++-- src/main/webapp/WEB-INF/jsp/mobile/dashboard.jsp | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/others/database/initial_data.ddl b/others/database/initial_data.ddl index cce8595..134aff6 100644 --- a/others/database/initial_data.ddl +++ b/others/database/initial_data.ddl @@ -35,9 +35,9 @@ insert into oauth_client_details web_server_redirect_uri,authorities, access_token_validity, refresh_token_validity, additional_information, create_time, archived, trusted) values -('unity-client','unity-resource', '$2a$10$QQTKDdNfj9sPjak6c8oWaumvTsa10MxOBOV6BW3DvLWU6VrjDfDam', 'read','authorization_code,refresh_token,implicit', +('unity-client','sos-resource', '$2a$10$QQTKDdNfj9sPjak6c8oWaumvTsa10MxOBOV6BW3DvLWU6VrjDfDam', 'read','authorization_code,refresh_token,implicit', 'http://localhost:8080/spring-oauth-server/unity/dashboard','ROLE_CLIENT',null, null,null, now(), 0, 0), -('mobile-client','mobile-resource', '$2a$10$uLvpxfvm3CuUyjIvYq7a9OUmd9b3tHFKrUaMyU/jC01thrTdkBDVm', 'read','password,refresh_token', +('mobile-client','sos-resource', '$2a$10$uLvpxfvm3CuUyjIvYq7a9OUmd9b3tHFKrUaMyU/jC01thrTdkBDVm', 'read','password,refresh_token', null,'ROLE_CLIENT',null, null,null, now(), 0, 0); diff --git a/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java b/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java index b4bb66a..5b356d3 100644 --- a/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java +++ b/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java @@ -43,6 +43,10 @@ import javax.sql.DataSource; public class OAuth2ServerConfiguration { + /*Fixed, resource-id */ + public static final String RESOURCE_ID = "sos-resource"; + + // unity resource @Configuration @EnableResourceServer @@ -50,7 +54,7 @@ public class OAuth2ServerConfiguration { @Override public void configure(ResourceServerSecurityConfigurer resources) { - resources.resourceId("unity-resource").stateless(false); + resources.resourceId(RESOURCE_ID).stateless(false); } @Override @@ -76,7 +80,7 @@ public class OAuth2ServerConfiguration { @Override public void configure(ResourceServerSecurityConfigurer resources) { - resources.resourceId("mobile-resource").stateless(false); + resources.resourceId(RESOURCE_ID).stateless(false); } @Override diff --git a/src/main/webapp/WEB-INF/jsp/mobile/dashboard.jsp b/src/main/webapp/WEB-INF/jsp/mobile/dashboard.jsp index c59f663..24f2289 100644 --- a/src/main/webapp/WEB-INF/jsp/mobile/dashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/mobile/dashboard.jsp @@ -12,7 +12,7 @@ Home -

Hi Unity +

Hi Mobile 你已成功访问 [mobile] 资源