Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-09 2a803694a19d3aa041667af1d66d9c339007a8fd

Merge remote-tracking branch 'origin/master'

 dao/src/main/java/com/sandu/ximon/dao/enums/AdministratorEnums.java

@@ -15,6 +15,10 @@
     * 客户
     */
    CUSTOMER(1),
    /**
     * 普通用户
     */
    NORMAL(2),
    ;

    private final Integer code;

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -113,7 +113,7 @@
        loginUserInfo.setUserId(client.getId());
        loginUserInfo.setAccount(client.getClientName());
        loginUserInfo.setIp(IpUtil.getRealIp());
        loginUserInfo.setAdministratorType(AdministratorEnums.CUSTOMER.getCode());
        loginUserInfo.setAdministratorType(AdministratorEnums.NORMAL.getCode());
        loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));

        // 生成令牌