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

Improve syncer.initAdapter().

Browse Source
This commit is contained in:
Yang Luo 2021-12-23 21:28:40 +08:00
parent fa45d3083a
commit f4890a6a22
4 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
object/init.go
View File

@ -50,26 +50,28 @@ func initBuiltInUser() {
}
user = &User{
Owner: "built-in",
Name: "admin",
CreatedTime: util.GetCurrentTime(),
Id: util.GenerateId(),
Type: "normal-user",
Password: "123",
DisplayName: "Admin",
Avatar: "https://casbin.org/img/casbin.svg",
Email: "admin@example.com",
Phone: "12345678910",
Address: []string{},
Affiliation: "Example Inc.",
Tag: "staff",
Score: 2000,
Ranking: 1,
IsAdmin: true,
IsGlobalAdmin: true,
IsForbidden: false,
IsDeleted: false,
Properties: make(map[string]string),
Owner: "built-in",
Name: "admin",
CreatedTime: util.GetCurrentTime(),
Id: util.GenerateId(),
Type: "normal-user",
Password: "123",
DisplayName: "Admin",
Avatar: "https://casbin.org/img/casbin.svg",
Email: "admin@example.com",
Phone: "12345678910",
Address: []string{},
Affiliation: "Example Inc.",
Tag: "staff",
Score: 2000,
Ranking: 1,
IsAdmin: true,
IsGlobalAdmin: true,
IsForbidden: false,
IsDeleted: false,
SignupApplication: "built-in-app",
CreatedIp: "127.0.0.1",
Properties: make(map[string]string),
}
AddUser(user)
}

3
object/syncer_user.go
View File

@ -125,6 +125,9 @@ func (syncer *Syncer) calculateHash(user *OriginalUser) string {
func (syncer *Syncer) initAdapter() {
if syncer.Adapter == nil {
dataSourceName := fmt.Sprintf("%s:%s@tcp(%s:%d)/", syncer.User, syncer.Password, syncer.Host, syncer.Port)
if !isCloudIntranet {
dataSourceName = strings.ReplaceAll(dataSourceName, "dbi.", "db.")
}
syncer.Adapter = NewAdapter(beego.AppConfig.String("driverName"), dataSourceName, syncer.Database)
}
}

4
web/src/Setting.js
View File

@ -558,3 +558,7 @@ export function getApplicationOrgName(application) {
export function getRandomName() {
return Math.random().toString(36).slice(-6);
}
export function getRandomNumber() {
return Math.random().toString(10).slice(-11);
}

4
web/src/UserListPage.js
View File

@ -70,8 +70,8 @@ class UserListPage extends React.Component {
passwordSalt: "",
displayName: `New User - ${randomName}`,
avatar: "https://casbin.org/img/casbin.svg",
email: "user@example.com",
phone: "12345678",
email: `${randomName}@example.com`,
phone: Setting.getRandomNumber(),
address: [],
affiliation: "Example Inc.",
tag: "staff",