wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 

 Conflicts:
	ruoyi-ui/src/views/system/user/profile/index.vue
	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
	ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
	ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
This commit is contained in:
疯狂的狮子li 2020-03-09 09:40:39 +08:00
parent bed1fd98ff 103583a847
commit 7507a3ed2a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/system/user/profile/index.vue
View File

@ -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>

8
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
View File

@ -51,16 +51,16 @@ public class SysPermissionService
*/
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;
}
}

3
ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
View File

@ -77,8 +77,7 @@ public class TokenService
{
if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
{
String userKey = getTokenKey(loginUser.getToken());
redisCache.setCacheObject(userKey, loginUser);
refreshToken(loginUser);
}
}

5
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
View File

@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and date_format(oper_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
</where>
order by oper_id desc
</select>
<delete id="deleteOperLogByIds" parameterType="Long">