update 调整监控依赖 从 common 迁移到 framework

疯狂的狮子li

2021-12-24 5ca038d888922e93bf45c7bd37f3c6dce849dcff

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -1,7 +1,6 @@
package com.ruoyi.common.core.domain.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@@ -70,36 +69,34 @@
    private String os;

    /**
     * 权限列表
     * 菜单权限
     */
    private Set<String> permissions;
    private Set<String> menuPermissions;

    /**
     * 用户信息
     * 角色权限
     */
    private SysUser user;
    private Set<String> rolePermissions;

    public LoginUser(SysUser user, Set<String> permissions) {
        this.user = user;
        this.permissions = permissions;
    }
    /**
     * 用户名
     */
    private String username;

    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions) {
        this.userId = userId;
        this.deptId = deptId;
        this.user = user;
        this.permissions = permissions;
    }
    /**
     * 密码
     */
    private String password;

    @JsonIgnore
    @Override
    public String getPassword() {
        return user.getPassword();
        return password;
    }

    @Override
    public String getUsername() {
        return user.getUserName();
        return username;
    }

    /**