降低springboot版本到1.5.2

pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.1.5.RELEASE</version>
+    <version>1.5.2.RELEASE</version>
   </parent>
 
   <dependencies>
@@ -40,7 +40,6 @@
     <dependency>
       <groupId>org.springframework.security.oauth</groupId>
       <artifactId>spring-security-oauth2</artifactId>
-      <version>2.3.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
@@ -50,6 +49,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <version>3.5</version>
     </dependency>
     <dependency>
       <groupId>com.nimbusds</groupId>
@@ -60,10 +60,10 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.thymeleaf.extras</groupId>
       <artifactId>thymeleaf-extras-springsecurity5</artifactId>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>nz.net.ultraq.thymeleaf</groupId>
       <artifactId>thymeleaf-layout-dialect</artifactId>

src/main/java/com/onegini/oidc/Application.java

@@ -3,7 +3,7 @@ package com.onegini.oidc;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 
 @ComponentScan

src/main/java/com/onegini/oidc/config/ApplicationProperties.java

 package com.onegini.oidc.config;
 
-import javax.validation.constraints.NotBlank;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
@@ -15,11 +13,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ApplicationProperties {
-  @NotBlank
   private String clientId;
-  @NotBlank
   private String clientSecret;
-  @NotBlank
   private String issuer;
   private boolean idTokenEncryptionEnabled;
 }

src/main/java/com/onegini/oidc/config/WebConfiguration.java

@@ -2,20 +2,113 @@ package com.onegini.oidc.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.validation.MessageCodesResolver;
+import org.springframework.validation.Validator;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.config.annotation.*;
 
 import nz.net.ultraq.thymeleaf.LayoutDialect;
 
+import java.util.List;
+
 @Configuration
 public class WebConfiguration implements WebMvcConfigurer {
 
+  @Override
+  public void configurePathMatch(PathMatchConfigurer configurer) {
+
+  }
+
+  @Override
+  public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+
+  }
+
+  @Override
+  public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+
+  }
+
+  @Override
+  public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+
+  }
+
+  @Override
+  public void addFormatters(FormatterRegistry registry) {
+
+  }
+
+  @Override
+  public void addInterceptors(InterceptorRegistry registry) {
+
+  }
+
   @Override
   public void addResourceHandlers(final ResourceHandlerRegistry registry) {
     registry.addResourceHandler("/favicon.ico").addResourceLocations("classpath:/static/img/");
     registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
   }
 
+  @Override
+  public void addCorsMappings(CorsRegistry registry) {
+
+  }
+
+  @Override
+  public void addViewControllers(ViewControllerRegistry registry) {
+
+  }
+
+  @Override
+  public void configureViewResolvers(ViewResolverRegistry registry) {
+
+  }
+
+  @Override
+  public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+
+  }
+
+  @Override
+  public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
+
+  }
+
+  @Override
+  public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+
+  }
+
+  @Override
+  public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+
+  }
+
+  @Override
+  public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
+
+  }
+
+  @Override
+  public void extendHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
+
+  }
+
+  @Override
+  public Validator getValidator() {
+    return null;
+  }
+
+  @Override
+  public MessageCodesResolver getMessageCodesResolver() {
+    return null;
+  }
+
   @Bean
   public LayoutDialect layoutDialect() {
     return new LayoutDialect();

src/main/java/com/onegini/oidc/security/SecurityConfiguration.java

@@ -31,28 +31,26 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     return new OpenIdConnectAuthenticationFilter(LOGIN_URL);
   }
 
-  @Bean
-  public OAuth2ClientContextFilter oAuth2ClientContextFilter() {
-    return new OAuth2ClientContextFilter();
-  }
+/*  @Autowired
+  public OAuth2ClientContextFilter oAuth2ClientContextFilter;*/
 
   @Override
   public void configure(final WebSecurity web) {
     web
         .ignoring()
-        .antMatchers("/static/**", "/favicon.ico");
+        .antMatchers( "/favicon.ico");
   }
 
   @Override
   protected void configure(final HttpSecurity http) throws Exception {
-    http.addFilterAfter(oAuth2ClientContextFilter(), AbstractPreAuthenticatedProcessingFilter.class)
+    http.addFilterAfter(new OAuth2ClientContextFilter(), AbstractPreAuthenticatedProcessingFilter.class)
         .addFilterAfter(openIdConnectAuthenticationFilter(), OAuth2ClientContextFilter.class)
         .exceptionHandling().authenticationEntryPoint(authenticationEntryPoint())
         .and()
         .authorizeRequests()
         .antMatchers("/", "/logout", "/signout-callback-oidc").permitAll()
-        .antMatchers("/static/**", "/favicon.ico").permitAll()
-        .antMatchers(SampleSecuredController.PAGE_SECURED).authenticated()
+        .antMatchers( "/favicon.ico").permitAll()
+        .antMatchers("/**").authenticated()
         .and()
         .logout()
         .logoutUrl(LogoutController.PAGE_LOGOUT)

src/main/resources/application.properties

 onegini.oidc.clientId=java
 onegini.oidc.clientSecret=99224e4094d111eab05bca9a9586eb62
-onegini.oidc.issuer=https://auth.poc.paas.com
-onegini.oidc.idTokenEncryptionEnabled=false
\ No newline at end of file
+onegini.oidc.issuer=https://auth.nbl.k2software.cn
+onegini.oidc.idTokenEncryptionEnabled=false
+server.port=31001
\ No newline at end of file