diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserType.java b/flyfish-common/src/main/java/com/flyfish/framework/enums/UserType.java index 79a0987..c190913 100644 --- a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserType.java +++ b/flyfish-common/src/main/java/com/flyfish/framework/enums/UserType.java @@ -15,7 +15,7 @@ import java.util.Map; @Getter public enum UserType implements NamedEnum { - SUPER_ADMIN("超级管理员"), ADMIN("管理员"), VIP("会员"), USER("非会员"); + SUPER_ADMIN("超级管理员"), ADMIN("管理员"), VIP("会员"), USER("非会员"), OTHER("其他用户"); private static final Map aliasMap; diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/MongoUserDetailsServiceImpl.java b/flyfish-user/src/main/java/com/flyfish/framework/service/MongoUserDetailsServiceImpl.java index 4aef0f3..38feb0d 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/MongoUserDetailsServiceImpl.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/service/MongoUserDetailsServiceImpl.java @@ -39,7 +39,7 @@ import java.util.function.Supplier; public class MongoUserDetailsServiceImpl implements MongoUserDetailsService { // 存储用户校验规则的map - private static final Map, Supplier> checkMap; + private static final Map, Supplier> checkMap; static { checkMap = new HashMap<>(); @@ -79,7 +79,7 @@ public class MongoUserDetailsServiceImpl implements MongoUserDetailsService { .switchIfEmpty(Mono.defer(() -> Mono.error(new UsernameNotFoundException("用户不存在!")))); } - private UserDetails mapToUserDetails(User user) { + private UserDetails mapToUserDetails(IUser user) { AdminUserDetails userDetail = new AdminUserDetails(); CopyUtils.copyProps(user, userDetail); return userDetail; diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/TokenProvider.java b/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/TokenProvider.java index fdc4186..4fefcfa 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/TokenProvider.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/TokenProvider.java @@ -82,6 +82,12 @@ public class TokenProvider implements InitializingBean { return Optional.empty(); } + /** + * 添加token逻辑 + * + * @param exchange 交换报文 + * @param authentication 认证信息 + */ public void addToken(ServerWebExchange exchange, Authentication authentication) { IUser user = (IUser) authentication.getPrincipal(); String token = createToken(authentication, remember); @@ -122,6 +128,12 @@ public class TokenProvider implements InitializingBean { .compact(); } + /** + * token解析第一步,获取认证。此处通过claims就能知道token是哪个端的 + * + * @param token token + * @return 结果 + */ public Authentication getAuthentication(String token) { Claims claims = Jwts.parserBuilder() .setSigningKey(key)