diff --git a/boot-starter/boot-starter-security/boot-starter-security-app/src/main/java/com/micro/fast/security/app/jwt/MsJwtEnhancer.java b/boot-starter/boot-starter-security/boot-starter-security-app/src/main/java/com/micro/fast/security/app/jwt/MsJwtEnhancer.java index 9a2ac1f..e8a42bb 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-app/src/main/java/com/micro/fast/security/app/jwt/MsJwtEnhancer.java +++ b/boot-starter/boot-starter-security/boot-starter-security-app/src/main/java/com/micro/fast/security/app/jwt/MsJwtEnhancer.java @@ -4,7 +4,6 @@ import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.token.TokenEnhancer; -import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.Map; @@ -16,7 +15,7 @@ import java.util.Map; public class MsJwtEnhancer implements TokenEnhancer{ @Override public OAuth2AccessToken enhance(OAuth2AccessToken oAuth2AccessToken, OAuth2Authentication oAuth2Authentication) { - //添加自定义的信息 + //添加自定义的信息,在这里面可以填入角色信息 Map info = new HashMap<>(); info.put("project","ms"); ((DefaultOAuth2AccessToken)oAuth2AccessToken).setAdditionalInformation(info); diff --git a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/pom.xml deleted file mode 100644 index a97a60a..0000000 --- a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - boot-starter-security-sso-server - jar - - boot-starter-security-sso-server - boot-starter-security-sso-server - - - com.micro.fast - boot-starter-security-sso - 0.0.1-SNAPSHOT - - - - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.security.oauth - spring-security-oauth2 - - - org.springframework.security - spring-security-jwt - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - boot-starter-security-sso-server - - - diff --git a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/SsoServerApplication.java b/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/SsoServerApplication.java deleted file mode 100644 index 85e7eef..0000000 --- a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/SsoServerApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.micro.fast.security.sso.server; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * sso认证服务器 - * @author lsy - */ -@SpringBootApplication -public class SsoServerApplication { - public static void main(String[] args) { - SpringApplication.run(SsoServerApplication.class,args); - } -} diff --git a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/config/SsoAuthorizationServerConfig.java b/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/config/SsoAuthorizationServerConfig.java deleted file mode 100644 index 775fb67..0000000 --- a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/config/SsoAuthorizationServerConfig.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.micro.fast.security.sso.server.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; -import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; -import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; - -/** - * sso单点登录认证中心 - * @author lsy - */ -@Configuration -@EnableAuthorizationServer -public class SsoAuthorizationServerConfig extends AuthorizationServerConfigurerAdapter{ - @Override - public void configure(ClientDetailsServiceConfigurer clients) throws Exception { - clients.inMemory() - .withClient("ms") - .secret("ms") - .authorizedGrantTypes("authorization_code","refresh_token") - .scopes("all") - .and() - .withClient("ms2") - .secret("ms2") - .authorizedGrantTypes("authorization_code","refresh_token") - .scopes("all"); - } -} diff --git a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/package-info.java b/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/package-info.java deleted file mode 100644 index e804a42..0000000 --- a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/java/com/micro/fast/security/sso/server/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ - -package com.micro.fast.security.sso.server; \ No newline at end of file diff --git a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/resources/application.properties b/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/resources/application.properties deleted file mode 100644 index 12a1a0f..0000000 --- a/boot-starter/boot-starter-security/boot-starter-security-sso/boot-starter-security-sso-server/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -server.port=9999 -server.context-path=/sso-server diff --git a/boot-starter/boot-starter-security/boot-starter-security-sso/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-sso/pom.xml deleted file mode 100644 index 4425973..0000000 --- a/boot-starter/boot-starter-security/boot-starter-security-sso/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - boot-starter-security-sso - jar - - boot-starter-security-sso - boot-starter-security-sso - - - com.micro.fast - boot-starter-security - 0.0.1-SNAPSHOT - - - - boot-starter-security-sso-server - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - boot-starter-security-sso - - diff --git a/boot-starter/boot-starter-security/pom.xml b/boot-starter/boot-starter-security/pom.xml index 300241f..66249e3 100644 --- a/boot-starter/boot-starter-security/pom.xml +++ b/boot-starter/boot-starter-security/pom.xml @@ -16,7 +16,6 @@ boot-starter-security-core - boot-starter-security-sso boot-starter-security-app boot-starter-security-browser boot-starter-security-demo