From 447dd1c534e7b8983321cd5a6cdaaa758ff7c46b Mon Sep 17 00:00:00 2001 From: Yixiang Zhao Date: Sun, 20 Mar 2022 22:28:22 +0800 Subject: [PATCH] feat: update the uploaded user field and provide demo xlsx file (#596) Signed-off-by: Yixiang Zhao --- object/user_upload.go | 64 ++++++++++++++++++++++-------------------- xlsx/user_test.xlsx | Bin 0 -> 10977 bytes 2 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 xlsx/user_test.xlsx diff --git a/object/user_upload.go b/object/user_upload.go index 29f4d3ee2..cdefb34d7 100644 --- a/object/user_upload.go +++ b/object/user_upload.go @@ -52,8 +52,8 @@ func UploadUsers(owner string, fileId string) bool { oldUserMap := getUserMap(owner) newUsers := []*User{} - for _, line := range table { - if parseLineItem(&line, 0) == "" { + for index, line := range table { + if index == 0 || parseLineItem(&line, 0) == "" { continue } @@ -67,38 +67,42 @@ func UploadUsers(owner string, fileId string) bool { Password: parseLineItem(&line, 6), PasswordSalt: parseLineItem(&line, 7), DisplayName: parseLineItem(&line, 8), - Avatar: parseLineItem(&line, 9), + FirstName: parseLineItem(&line, 9), + LastName: parseLineItem(&line, 10), + Avatar: parseLineItem(&line, 11), PermanentAvatar: "", - Email: parseLineItem(&line, 10), - Phone: parseLineItem(&line, 11), - Location: parseLineItem(&line, 12), - Address: []string{parseLineItem(&line, 13)}, - Affiliation: parseLineItem(&line, 14), - Title: parseLineItem(&line, 15), - IdCardType: parseLineItem(&line, 16), - IdCard: parseLineItem(&line, 17), - Homepage: parseLineItem(&line, 18), - Bio: parseLineItem(&line, 19), - Tag: parseLineItem(&line, 20), - Region: parseLineItem(&line, 21), - Language: parseLineItem(&line, 22), - Gender: parseLineItem(&line, 23), - Birthday: parseLineItem(&line, 24), - Education: parseLineItem(&line, 25), - Score: parseLineItemInt(&line, 26), - Ranking: parseLineItemInt(&line, 27), + Email: parseLineItem(&line, 12), + Phone: parseLineItem(&line, 13), + Location: parseLineItem(&line, 14), + Address: []string{parseLineItem(&line, 15)}, + Affiliation: parseLineItem(&line, 16), + Title: parseLineItem(&line, 17), + IdCardType: parseLineItem(&line, 18), + IdCard: parseLineItem(&line, 19), + Homepage: parseLineItem(&line, 20), + Bio: parseLineItem(&line, 21), + Tag: parseLineItem(&line, 22), + Region: parseLineItem(&line, 23), + Language: parseLineItem(&line, 24), + Gender: parseLineItem(&line, 25), + Birthday: parseLineItem(&line, 26), + Education: parseLineItem(&line, 27), + Score: parseLineItemInt(&line, 28), + Karma: parseLineItemInt(&line, 29), + Ranking: parseLineItemInt(&line, 30), IsDefaultAvatar: false, - IsOnline: parseLineItemBool(&line, 28), - IsAdmin: parseLineItemBool(&line, 29), - IsGlobalAdmin: parseLineItemBool(&line, 30), - IsForbidden: parseLineItemBool(&line, 31), - IsDeleted: parseLineItemBool(&line, 32), - SignupApplication: parseLineItem(&line, 33), + IsOnline: parseLineItemBool(&line, 31), + IsAdmin: parseLineItemBool(&line, 32), + IsGlobalAdmin: parseLineItemBool(&line, 33), + IsForbidden: parseLineItemBool(&line, 34), + IsDeleted: parseLineItemBool(&line, 35), + SignupApplication: parseLineItem(&line, 36), Hash: "", PreHash: "", - CreatedIp: parseLineItem(&line, 34), - LastSigninTime: parseLineItem(&line, 35), - LastSigninIp: parseLineItem(&line, 36), + CreatedIp: parseLineItem(&line, 37), + LastSigninTime: parseLineItem(&line, 38), + LastSigninIp: parseLineItem(&line, 39), + Ldap: "", Properties: map[string]string{}, } diff --git a/xlsx/user_test.xlsx b/xlsx/user_test.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..cb9b7dbad05ec7b02b40297a3e4680cf19c5697a GIT binary patch literal 10977 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 literal 0 HcmV?d00001