llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-22 00:23:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in update column names.

Browse Source
This commit is contained in:
Yang Luo
2021-05-09 16:14:05 +08:00
parent 6e5aa2bc40
commit 19c1ef1b68
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
original/sync.go
View File

@ -17,6 +17,7 @@ package original
import (
"fmt"
"strconv"
"strings"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
@ -26,6 +27,13 @@ func getFullAvatarUrl(avatar string) string {
return fmt.Sprintf("%s%s", avatarBaseUrl, avatar)
}
func getPartialAvatarUrl(avatar string) string {
if strings.HasPrefix(avatar, avatarBaseUrl) {
return avatar[len(avatarBaseUrl):]
}
return avatar
}
func createUserFromOriginalUser(originalUser *User) *object.User {
user := &object.User{
Owner: orgName,
@ -58,7 +66,7 @@ func createOriginalUserFromUser(user *object.User) *User {
Name: user.DisplayName,
Password: user.Password,
Cellphone: user.Phone,
Avatar: user.Avatar,
Avatar: getPartialAvatarUrl(user.Avatar),
Deleted: deleted,
}
return originalUser
@ -98,12 +106,12 @@ func syncUsers() {
// update preHash
user.PreHash = user.Hash
object.SetUserField(user, "preHash", user.PreHash)
object.SetUserField(user, "pre_hash", user.PreHash)
} else {
if user.Hash == oHash {
// update preHash
user.PreHash = user.Hash
object.SetUserField(user, "preHash", user.PreHash)
object.SetUserField(user, "pre_hash", user.PreHash)
} else {
updatedUser := createUserFromOriginalUser(oUser)
updatedUser.Hash = oHash