diff --git a/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go b/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go index 7d4bf571..e2db366d 100644 --- a/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go +++ b/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go @@ -99,8 +99,8 @@ func (l *GetLdapOrganizationMembersLogic) GetLdapOrganizationMembers(req *types. Avatar: user.Avatar, EmployeeType: user.EmployeeType, Status: user.Status, - CreateTime: user.CreateTime.Format("2006-01-02 15:04:05"), - UpdateTime: user.UpdateTime.Format("2006-01-02 15:04:05"), + //CreateTime: user.CreateTime.Format("2006-01-02 15:04:05"), + //UpdateTime: user.UpdateTime.Format("2006-01-02 15:04:05"), }) } return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapOrganizationMembersRsp{ diff --git a/server/ldap-admin/internal/logic/getldapuserinfologic.go b/server/ldap-admin/internal/logic/getldapuserinfologic.go index 9122f58d..d8b396fe 100644 --- a/server/ldap-admin/internal/logic/getldapuserinfologic.go +++ b/server/ldap-admin/internal/logic/getldapuserinfologic.go @@ -54,8 +54,8 @@ func (l *GetLdapUserInfoLogic) GetLdapUserInfo(req *types.GetLdapUserInfoReq, us Avatar: user.Avatar, Status: user.Status, EmployeeTpye: user.EmployeeType, - CreateTime: user.CreateTime.Format("2006-01-02 15:04:05"), - UpdateTime: user.UpdateTime.Format("2006-01-02 15:04:05"), + //CreateTime: user.CreateTime.Format("2006-01-02 15:04:05"), + //UpdateTime: user.UpdateTime.Format("2006-01-02 15:04:05"), }) } diff --git a/server/ldap-admin/internal/logic/getldapuserslogic.go b/server/ldap-admin/internal/logic/getldapuserslogic.go index 2fb6efbb..68941660 100644 --- a/server/ldap-admin/internal/logic/getldapuserslogic.go +++ b/server/ldap-admin/internal/logic/getldapuserslogic.go @@ -52,8 +52,8 @@ func (l *GetLdapUsersLogic) GetLdapUsers(req *types.GetLdapUsersReq, userinfo *a Avatar: v.Avatar, EmployeeType: v.EmployeeType, Status: v.Status, - CreateTime: v.CreateTime.Format("2006-01-02 15:04:05"), - UpdateTime: v.UpdateTime.Format("2006-01-02 15:04:05"), + //CreateTime: v.CreateTime.Format("2006-01-02 15:04:05"), + //UpdateTime: v.UpdateTime.Format("2006-01-02 15:04:05"), }) } return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapUsersRsp{ diff --git a/utils/ldap_lib/ldap_time_format.go b/utils/ldap_lib/ldap_time_format.go deleted file mode 100644 index 18efddc7..00000000 --- a/utils/ldap_lib/ldap_time_format.go +++ /dev/null @@ -1,10 +0,0 @@ -package ldap_lib - -import ( - "time" -) - -func LdapTimeToTime(timeStr string) (time.Time, error) { - // 将时间字符串转换为时间 - return time.Parse("20060102150405Z", timeStr) -} diff --git a/utils/ldap_lib/ldap_user.go b/utils/ldap_lib/ldap_user.go index 1da74db7..4cb4902e 100644 --- a/utils/ldap_lib/ldap_user.go +++ b/utils/ldap_lib/ldap_user.go @@ -6,21 +6,18 @@ import ( "github.com/go-ldap/ldap/v3" "strconv" "strings" - "time" ) type LdapUserInfo struct { - UserId int64 `json:"userId"` - UserDN string `json:"user_dn"` - UserName string `json:"user_name"` //用户名 - Password string `json:"password"` //密码 - Email string `json:"email"` //邮箱 - Mobile string `json:"mobile"` //手机号 - Avatar string `json:"avatar"` //头像地址 - EmployeeType int64 `json:"employee_type"` //1正式 2实习 3外包 - Status int64 `json:"status,options=0|1"` //状态 1正常0离职 - CreateTime time.Time `json:"create_time"` - UpdateTime time.Time `json:"update_time"` + UserId int64 `json:"userId"` + UserDN string `json:"user_dn"` + UserName string `json:"user_name"` //用户名 + Password string `json:"password"` //密码 + Email string `json:"email"` //邮箱 + Mobile string `json:"mobile"` //手机号 + Avatar string `json:"avatar"` //头像地址 + EmployeeType int64 `json:"employee_type"` //1正式 2实习 3外包 + Status int64 `json:"status,options=0|1"` //状态 1正常0离职 } // 获取用户详情 @@ -74,16 +71,6 @@ func (l *Ldap) GetLdapUserInfo(userDN string) (*LdapUserInfo, error) { if err != nil { return nil, err } - case "createTimestamp": - user.CreateTime, err = LdapTimeToTime(attr.Values[0]) - if err != nil { - return nil, err - } - case "modifyTimestamp": - user.UpdateTime, err = LdapTimeToTime(attr.Values[0]) - if err != nil { - return nil, err - } } } break @@ -145,16 +132,6 @@ func (l *Ldap) GetLdapBaseTeamUserList(pageSize uint32, pageCookie string) ([]Ld if err != nil { return nil, "", err } - case "createTimestamp": - user.CreateTime, err = LdapTimeToTime(attr.Values[0]) - if err != nil { - return nil, "", err - } - case "modifyTimestamp": - user.UpdateTime, err = LdapTimeToTime(attr.Values[0]) - if err != nil { - return nil, "", err - } } } list = append(list, user) @@ -218,16 +195,6 @@ func (l *Ldap) GetLdapBaseTeamUsersByParams(filter string) ([]LdapUserInfo, erro if err != nil { return nil, err } - case "createTimestamp": - user.CreateTime, err = LdapTimeToTime(attr.Values[0]) - if err != nil { - return nil, err - } - case "modifyTimestamp": - user.UpdateTime, err = LdapTimeToTime(attr.Values[0]) - if err != nil { - return nil, err - } } } list = append(list, user)