From 4923f4bbb330515f656addda2464051f2bfd2ba9 Mon Sep 17 00:00:00 2001
From: Parker <meet.parker@foxmail.com>
Date: Fri, 8 Jan 2021 13:43:08 +0800
Subject: [PATCH] =?UTF-8?q?User=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/opsli/core/utils/UserUtil.java   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java
index 49de8db3..37dc2860 100644
--- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java
+++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java
@@ -15,6 +15,7 @@
  */
 package org.opsli.core.utils;
 
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
@@ -247,12 +248,12 @@ public class UserUtil {
         try {
             Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId);
             if(obj instanceof List){
-                List<String> list = (List<String>) obj;
+                List<String> list = Convert.toList(String.class, obj);
                 if (!list.isEmpty()) {
                     return list;
                 }
             }else {
-                JSONArray jsonArray = (JSONArray) obj;
+                JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
                 if (jsonArray != null && !jsonArray.isEmpty()) {
                     return jsonArray.toJavaList(String.class);
                 }
@@ -286,12 +287,12 @@ public class UserUtil {
             try {
                 Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId);
                 if(obj instanceof List){
-                    List<String> list = (List<String>) obj;
+                    List<String> list = Convert.toList(String.class, obj);
                     if (!list.isEmpty()) {
                         return list;
                     }
                 }else {
-                    JSONArray jsonArray = (JSONArray) obj;
+                    JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
                     if (jsonArray != null && !jsonArray.isEmpty()) {
                         return jsonArray.toJavaList(String.class);
                     }
@@ -334,12 +335,12 @@ public class UserUtil {
         try {
             Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId);
             if(obj instanceof List){
-                List<String> list = (List<String>) obj;
+                List<String> list = Convert.toList(String.class, obj);
                 if (!list.isEmpty()) {
                     return list;
                 }
             }else {
-                JSONArray jsonArray = (JSONArray) obj;
+                JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
                 if (jsonArray != null && !jsonArray.isEmpty()) {
                     return jsonArray.toJavaList(String.class);
                 }
@@ -374,12 +375,12 @@ public class UserUtil {
             try {
                 Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId);
                 if(obj instanceof List){
-                    List<String> list = (List<String>) obj;
+                    List<String> list = Convert.toList(String.class, obj);
                     if (!list.isEmpty()) {
                         return list;
                     }
                 }else {
-                    JSONArray jsonArray = (JSONArray) obj;
+                    JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
                     if (jsonArray != null && !jsonArray.isEmpty()) {
                         return jsonArray.toJavaList(String.class);
                     }
@@ -421,7 +422,7 @@ public class UserUtil {
         try {
             Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId);
             if(obj instanceof List){
-                List<Object> list = (List<Object>) obj;
+                List<?> list = Convert.toList(obj);
                 if (!list.isEmpty()) {
                     List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size());
                     for (Object menuObj : list) {
@@ -436,7 +437,7 @@ public class UserUtil {
                     return menuModels;
                 }
             }else {
-                JSONArray jsonArray = (JSONArray) obj;
+                JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
                 if (jsonArray != null && !jsonArray.isEmpty()) {
                     return jsonArray.toJavaList(MenuModel.class);
                 }
@@ -471,7 +472,7 @@ public class UserUtil {
             try {
                 Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId);
                 if(obj instanceof List){
-                    List<Object> list = (List<Object>) obj;
+                    List<?> list = Convert.toList(obj);
                     if (!list.isEmpty()) {
                         List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size());
                         for (Object menuObj : list) {
@@ -486,7 +487,7 @@ public class UserUtil {
                         return menuModels;
                     }
                 }else {
-                    JSONArray jsonArray = (JSONArray) obj;
+                    JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
                     if (jsonArray != null && !jsonArray.isEmpty()) {
                         return jsonArray.toJavaList(MenuModel.class);
                     }