Browse Source

优化

test
smallchill 5 years ago
parent
commit
f9e7784e02
  1. 2
      blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
  2. 3
      blade-ops/blade-websocket/src/main/java/org/springblade/websocket/WebSocketApplication.java

2
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); throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_ROLE);
} }
User user = userInfo.getUser(); User user = userInfo.getUser();
if (user == null) { if (user == null || user.getId() == null) {
throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND); throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
} }
return new BladeUserDetails(user.getId(), return new BladeUserDetails(user.getId(),

3
blade-ops/blade-websocket/src/main/java/org/springblade/websocket/WebSocketApplication.java

@ -1,6 +1,7 @@
package org.springblade.websocket; package org.springblade.websocket;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
/** /**
@ -12,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
public class WebSocketApplication { public class WebSocketApplication {
public static void main(String[] args) { public static void main(String[] args) {
BladeApplication.run("blade-websocket", WebSocketApplication.class, args); BladeApplication.run(AppConstant.APPLICATION_WEBSOCKET_NAME, WebSocketApplication.class, args);
} }
} }

Loading…
Cancel
Save