From 7507a3ed2a4570ca510403c48f406942556382a8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 09 三月 2020 09:40:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/system/user/profile/index.vue | 2 +-
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java | 8 ++++----
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml | 5 +++--
ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java | 3 +--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 69d07a0..8993cab 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -33,7 +33,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />鍒涘缓鏃ユ湡
- <div class="pull-right">2018-08-23 09:11:56</div>
+ <div class="pull-right">{{ user.createTime }}</div>
</li>
</ul>
</div>
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
index dfa26e2..20a2a0b 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
@@ -51,16 +51,16 @@
*/
public Set<String> getMenuPermission(SysUser user)
{
- Set<String> roles = new HashSet<String>();
+ Set<String> perms = new HashSet<String>();
// 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄�
if (user.isAdmin())
{
- roles.add("*:*:*");
+ perms.add("*:*:*");
}
else
{
- roles.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+ perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
}
- return roles;
+ return perms;
}
}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index ed427b3..82015c9 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -77,8 +77,7 @@
{
if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
{
- String userKey = getTokenKey(loginUser.getToken());
- redisCache.setCacheObject(userKey, loginUser);
+ refreshToken(loginUser);
}
}
diff --git a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
index 0d2e7a6..53cb94f 100644
--- a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
@@ -25,7 +25,7 @@
<sql id="selectOperLogVo">
select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time
- from sys_oper_log order by oper_id desc
+ from sys_oper_log
</sql>
<insert id="insertOperlog" parameterType="SysOperLog">
@@ -39,7 +39,7 @@
<if test="title != null and title != ''">
AND title like concat('%', #{title}, '%')
</if>
- <if test="businessType != null">
+ <if test="businessType != null and businessType != ''">
AND business_type = #{businessType}
</if>
<if test="businessTypes != null and businessTypes.length > 0">
@@ -61,6 +61,7 @@
and date_format(oper_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
</where>
+ order by oper_id desc
</select>
<delete id="deleteOperLogByIds" parameterType="Long">
--
Gitblit v1.9.3