diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java index 89ca3006..50a67185 100644 --- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java +++ b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java @@ -78,7 +78,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService { throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_ROLE); } User user = userInfo.getUser(); - if (user == null) { + if (user == null || user.getId() == null) { throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND); } return new BladeUserDetails(user.getId(), diff --git a/blade-ops/blade-websocket/src/main/java/org/springblade/websocket/WebSocketApplication.java b/blade-ops/blade-websocket/src/main/java/org/springblade/websocket/WebSocketApplication.java index 62c44e45..d125ad6a 100644 --- a/blade-ops/blade-websocket/src/main/java/org/springblade/websocket/WebSocketApplication.java +++ b/blade-ops/blade-websocket/src/main/java/org/springblade/websocket/WebSocketApplication.java @@ -1,6 +1,7 @@ package org.springblade.websocket; import org.springblade.core.launch.BladeApplication; +import org.springblade.core.launch.constant.AppConstant; import org.springframework.boot.autoconfigure.SpringBootApplication; /** @@ -12,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class WebSocketApplication { public static void main(String[] args) { - BladeApplication.run("blade-websocket", WebSocketApplication.class, args); + BladeApplication.run(AppConstant.APPLICATION_WEBSOCKET_NAME, WebSocketApplication.class, args); } }