不明优化

hsweb-authorization/hsweb-authorization-jwt/src/main/java/org/hswebframework/web/authorization/jwt/JwtTokenParser.java

@@ -54,7 +54,7 @@ public class JwtTokenParser implements UserTokenParser {
             } catch (ExpiredJwtException e) {
                 return null;
             } catch (Exception e) {
-                logger.error("parse token [{}] error", headerToken, e);
+                logger.debug("parse token [{}] error", headerToken, e);
                 return null;
             }
         }

hsweb-core/src/main/java/org/hswebframework/web/dict/defaults/DefaultDictSupportApi.java

@@ -11,6 +11,7 @@ import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,7 @@ public class DefaultDictSupportApi implements DictSupportApi {
     }
 
     @Override
+    @SuppressWarnings("all")
     public <T> T unwrap(T target) {
         if (target == null) {
             return null;
@@ -52,6 +54,10 @@ public class DefaultDictSupportApi implements DictSupportApi {
                     .map(this::wrap)
                     .collect(Collectors.toList());
         }
+        if (target instanceof String || target.getClass().isEnum() || target.getClass().isPrimitive() || target instanceof Type) {
+            return target;
+        }
+
         Class type = ClassUtils.getUserClass(target);
         List<ClassDictDefine> defines = repository.getDefine(type);
         if (defines.isEmpty()) {
@@ -92,6 +98,9 @@ public class DefaultDictSupportApi implements DictSupportApi {
         if (target instanceof List) {
             return (T) ((List) target).stream().map(this::wrap).collect(Collectors.toList());
         }
+        if (target instanceof String || target.getClass().isEnum() || target.getClass().isPrimitive() || target instanceof Type) {
+            return target;
+        }
         Class type = ClassUtils.getUserClass(target);
         List<ClassDictDefine> defines = repository.getDefine(type);
         if (defines.isEmpty()) {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleUserService.java

@@ -105,7 +105,12 @@ public class SimpleUserService extends AbstractService<UserEntity, String>
         }
         UserEntity userEntity = createQuery().where(UserEntity.id, id).single();
         if (null != userEntity) {
-            List<String> roleId = userRoleDao.selectByUserId(id).stream().map(UserRoleEntity::getRoleId).collect(Collectors.toList());
+
+            List<String> roleId = userRoleDao
+                    .selectByUserId(id)
+                    .stream()
+                    .map(UserRoleEntity::getRoleId) //转换为roleId
+                    .collect(Collectors.toList());
             BindRoleUserEntity roleUserEntity = entityFactory.newInstance(BindRoleUserEntity.class, userEntity);
             roleUserEntity.setRoles(roleId);
             return roleUserEntity;