疯狂的狮子li
2020-03-09 7507a3ed2a4570ca510403c48f406942556382a8
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
已修改4个文件
18 ■■■■ 文件已修改
ruoyi-ui/src/views/system/user/profile/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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;
    }
}
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);
        }
    }
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') &lt;= date_format(#{endTime},'%y%m%d')
            </if>
        </where>
        order by oper_id desc
    </select>
    
    <delete id="deleteOperLogByIds" parameterType="Long">