diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java index 01fa8afbc..a068928c0 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java @@ -69,7 +69,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap public void configure(AuthorizationServerSecurityConfigurer oauthServer) { oauthServer .allowFormAuthenticationForClients() - .checkTokenAccess("permitAll()"); + .checkTokenAccess("isAuthenticated()"); } @Override diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java index 603a19705..6781dd508 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/WebSecurityConfigurer.java @@ -62,13 +62,13 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { http .formLogin() - .loginPage("/oauth/login") - .loginProcessingUrl("/oauth/form") + .loginPage("/token/login") + .loginProcessingUrl("/token/form") .and() .authorizeRequests() .antMatchers( + "/token/**", "/actuator/**", - "/oauth/**", "/mobile/**").permitAll() .anyRequest().authenticated() .and().csrf().disable() diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 3fd9cd984..564955d57 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -55,7 +55,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/oauth") +@RequestMapping("/token") public class PigxTokenEndpoint { private static final String PIGX_OAUTH_ACCESS = SecurityConstants.PIGX_PREFIX + SecurityConstants.OAUTH_PREFIX + "access:"; private final TokenStore tokenStore; @@ -103,7 +103,7 @@ public class PigxTokenEndpoint { * @param from 内部调用标志 * @return */ - @DeleteMapping("/token/{token}") + @DeleteMapping("/{token}") public R delToken(@PathVariable("token") String token, @RequestHeader(required = false) String from) { if (StrUtil.isBlank(from)) { return null; diff --git a/pigx-auth/src/main/resources/templates/ftl/login.ftl b/pigx-auth/src/main/resources/templates/ftl/login.ftl index 835506495..becb0c495 100755 --- a/pigx-auth/src/main/resources/templates/ftl/login.ftl +++ b/pigx-auth/src/main/resources/templates/ftl/login.ftl @@ -16,7 +16,7 @@
-