Pre Merge pull request !378 from 天道酬勤/N/A

Signed-off-by: 邵立佳 <418843795@qq.com>

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java

@@ -46,7 +46,23 @@ public class SysUserOnlineController extends BaseController
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
         for (String key : keys)
         {
-            LoginUser user = redisService.getCacheObject(key);
+            // 获取登录用户缓存对象
+            Object object = redisService.getCacheObject(key);
+            // 登录用户对象
+            LoginUser user;
+            // 判断object类型，如果是JSONObject需要单独处理，解决小概率类型转换异常问题
+            if (object instanceof JSONObject) 
+            {
+                user = JSONObject.parseObject(JSONObject.toJSONString(object, JSONWriter.Feature.WriteNulls), LoginUser.class);
+            } 
+            else if (object instanceof LoginUser) 
+            {
+                user = (LoginUser) object;
+            } 
+            else
+            {
+                throw new ServiceException("用户缓存对象类型异常");
+            }
             if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
             {
                 userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));

ruoyi-ui/src/views/system/menu/index.vue

@@ -130,7 +130,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24" v-if="form.menuType != 'F'">
+          <el-col :span="12" v-if="form.menuType != 'F'">
             <el-form-item label="菜单图标" prop="icon">
               <el-popover
                 placement="bottom-start"
@@ -151,6 +151,11 @@
               </el-popover>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -158,9 +163,15 @@
               <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.menuType == 'C'">
-            <el-form-item label="显示排序" prop="orderNum">
+            <el-form-item prop="routeName">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input v-model="form.routeName" placeholder="请输入路由名称" />
+              <span slot="label">
+                <el-tooltip content="默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：为避免名字的冲突，特殊情况下请自定义，保证唯一性）" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                路由名称
+              </span>
             </el-form-item>
           </el-col>
         </el-row>