LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize

Browse Source
This commit is contained in:
MaxKey
2022-02-26 19:40:57 +08:00
parent d88dc90b6f
commit 61673b4b07
11 changed files with 201 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maxkey-core/src/main/java/org/maxkey/constants/ConstsStatus.java
View File

@@ -48,5 +48,11 @@ public final class ConstsStatus {
public static final int APPROVED = 14;
public static final int QUITED = 15;
public static final String NONE = "NONE";
public static final String YES = "YES";
public static final String NO = "NO";
}

13
maxkey-core/src/main/java/org/maxkey/constants/ldap/ActiveDirectoryUser.java
View File

@@ -121,7 +121,13 @@ public class ActiveDirectoryUser {
public static final String NAME = "name";
public static final String UID = "uid";
/**
* First Name
*/
public static final String GIVENNAME = "givenName";
/**
* Last Name/SurName
*/
public static final String SN = "sn";
public static final String INITIALS = "initials";
public static final String DESCRIPTION = "description";
@@ -143,8 +149,13 @@ public class ActiveDirectoryUser {
public static final String INFO = "info";
public static final String HOMEPHONE = "homePhone";
/**
* admin@maxkey.top
*/
public static final String USERPRINCIPALNAME = "userPrincipalName";
/**
* maxkey\admin
*/
public static final String SAMACCOUNTNAME = "sAMAccountname";
public static final String LOGONHOURS = "logonHours";
public static final String LOGONWORKSTATION = "logonWorkstation";

63
maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java
View File

@@ -19,7 +19,6 @@ package org.maxkey.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -271,80 +270,80 @@ public class UserInfo extends JpaBaseEntity {
public static class ONLINE {
// 在线
public static final int ONLINE = 1;
public static final int ONLINE = 1;
// 下线
public static final int OFFLINE = 0;
public static final int OFFLINE = 0;
}
public static class MARRIED {
// 未知
public static final int UNKNOWN = 0;
public static final int UNKNOWN = 0;
// 单身
public static final int SINGLE = 1;
public static final int SINGLE = 1;
// 结婚
public static final int MARRIED = 2;
public static final int MARRIED = 2;
// 离异
public static final int DIVORCE = 3;
public static final int DIVORCE = 3;
// 丧偶
public static final int WIDOWED = 4;
public static final int WIDOWED = 4;
}
public static class GENDER {
// 未知
public static final int UNKNOWN = 0;
public static final int UNKNOWN = 0;
// 女性
public static final int FEMALE = 1;
public static final int FEMALE = 1;
// 男性
public static final int MALE = 2;
public static final int MALE = 2;
}
public static class IDTYPE {
// 未知
public static final int UNKNOWN = 0;
public static final int UNKNOWN = 0;
// 身份证
public static final int IDCARD = 1;
public static final int IDCARD = 1;
// 护照
public static final int PASSPORT = 2;
public static final int PASSPORT = 2;
// 学生证
public static final int STUDENTCARD = 3;
public static final int STUDENTCARD = 3;
// 军人证
public static final int MILITARYCARD = 4;
public static final int MILITARYCARD = 4;
}
public static class AUTHNTYPE {
// 用户名密码
public static final int NORMAL = 1;
public static final int NORMAL = 1;
// 手机
public static final int MOBILE = 2;
public static final int MOBILE = 2;
// 短信
public static final int SMS = 3;
public static final int SMS = 3;
// 邮箱
public static final int EMAIL = 4;
public static final int EMAIL = 4;
public static final int TIMEBASED_OPT = 5;
public static final int TIMEBASED_OPT = 5;
public static final int COUNTERBASED_OPT = 6;
public static final int COUNTERBASED_OPT = 6;
public static final int HOTP_OPT = 7;
public static final int HOTP_OPT = 7;
public static final int RSA_OPT = 8;
public static final int RSA_OPT = 8;
// 证书
public static final int CERTIFICATE = 9;
public static final int CERTIFICATE = 9;
// usb证书
public static final int USBKEY = 10;
public static final int USBKEY = 10;
}
public static class EMPLOYMENTSTATUS {
// 在册人员
public static final int ACTIVE = 1;
public static final int ACTIVE = 1;
// 离职人员
public static final int WITHDRAWN = 2;
public static final int WITHDRAWN = 2;
// 停薪留职人员
public static final int INACTIVE = 3;
public static final int INACTIVE = 3;
// 退休人员
public static final int RETIREE = 4;
public static final int RETIREE = 4;
}
@@ -1324,10 +1323,6 @@ public class UserInfo extends JpaBaseEntity {
builder.append(gender);
builder.append(", birthDate=");
builder.append(birthDate);
builder.append(", picture=");
builder.append(Arrays.toString(picture));
builder.append(", pictureFile=");
builder.append(pictureFile);
builder.append(", idType=");
builder.append(idType);
builder.append(", idCardNo=");