简柏林 / thingskit · Commits

Commit 0c6d927dd0894f48e30d42e03ba46017982a2762

Authored by 黄 x
1 parent 3a7e382c

fix: 修改SecurityUser的变量名称

Inline Side-by-side
Showing 2 changed files with 3 additions and 4 deletions
... ... @@ -15,7 +15,6 @@ package org.thingsboard.server.service.security.model;
15 15
16 16 import lombok.Getter;
17 17 import lombok.Setter;
18   -import org.apache.commons.lang3.StringUtils;
19 18 import org.springframework.security.core.GrantedAuthority;
20 19 import org.springframework.security.core.authority.SimpleGrantedAuthority;
21 20 import org.thingsboard.server.common.data.User;
... ... @@ -43,7 +42,7 @@ public class SecurityUser extends User {
43 42 @Getter @Setter private LocalDateTime tenantExpireTime;
44 43 @Getter @Setter private boolean ptSysadmin = false;
45 44 @Getter @Setter private boolean ptTenantAdmin = false;
46   - @Getter @Setter private boolean ptmAdmin = false;
  45 + @Getter @Setter private boolean ptAdmin = false;
47 46 @Getter @Setter private Set<String> roles;
48 47 @Getter @Setter private String platformUserName;
49 48
... ... @@ -75,7 +74,7 @@ public class SecurityUser extends User {
75 74 this.roles.stream().anyMatch(role -> role.equals(RoleEnum.SYS_ADMIN.name()));
76 75 this.ptTenantAdmin =
77 76 this.roles.stream().anyMatch(role -> role.equals(RoleEnum.TENANT_ADMIN.name()));
78   - this.ptmAdmin =
  77 + this.ptAdmin =
79 78 this.roles.stream()
80 79 .anyMatch(role -> role.equals(RoleEnum.PLATFORM_ADMIN.name()));
81 80 return roleDTOS;
... ...
... ... @@ -136,7 +136,7 @@ public class JwtTokenFactory {
136 136 if(null != securityUser.getRoles()){
137 137 securityUser.setPtSysadmin(securityUser.getRoles().stream().anyMatch(role -> role.equals(RoleEnum.SYS_ADMIN.name())));
138 138 securityUser.setPtTenantAdmin(securityUser.getRoles().stream().anyMatch(role -> role.equals(RoleEnum.TENANT_ADMIN.name())));
139   - securityUser.setPtmAdmin(securityUser.getRoles().stream().anyMatch(role -> role.equals(RoleEnum.PLATFORM_ADMIN.name())));
  139 + securityUser.setPtAdmin(securityUser.getRoles().stream().anyMatch(role -> role.equals(RoleEnum.PLATFORM_ADMIN.name())));
140 140 }
141 141 securityUser.setCurrentUserId(claims.get(CURRENT_USER_ID, String.class));
142 142 securityUser.setPlatformUserName(claims.get(PLATFORM_USER_NAME,String.class));
... ...