Merge remote-tracking branch 'origin/master'

wangting

2023-07-05 3bfd5e9e8937b929c774e79913c051841492c9fc

 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java

@@ -79,13 +79,19 @@
    * 用户详情
    */
   private final Kv detail;

   /**
    * 用户密级
    */
   private String secretGrade;

   /**
    * 密码策略修改状态
    */
   private Long strategyUpdateStatus;


   public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities,Long strategyUpdateStatus) {
   public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail,String secretGrade, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities,Long strategyUpdateStatus) {
      super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
      this.userId = userId;
      this.tenantId = tenantId;
@@ -99,6 +105,7 @@
      this.roleName = roleName;
      this.avatar = avatar;
      this.detail = detail;
      this.secretGrade = secretGrade;
      this.strategyUpdateStatus = strategyUpdateStatus;
   }