diff --git a/object/init.go b/object/init.go index b679cadf..9d190047 100644 --- a/object/init.go +++ b/object/init.go @@ -31,20 +31,21 @@ func initBuiltInUser() { } user = &User{ - Owner: "built-in", - Name: "admin", - CreatedTime: util.GetCurrentTime(), - Id: util.GenerateId(), - Password: "123", - PasswordType: "plain", - DisplayName: "Admin", - Avatar: "https://casbin.org/img/casbin.svg", - Email: "admin@example.com", - Phone: "1-12345678", - Affiliation: "Example Inc.", - Tag: "staff", - IsAdmin: true, - Github: "", + Owner: "built-in", + Name: "admin", + CreatedTime: util.GetCurrentTime(), + Id: util.GenerateId(), + Password: "123", + PasswordType: "plain", + DisplayName: "Admin", + Avatar: "https://casbin.org/img/casbin.svg", + Email: "admin@example.com", + Phone: "1-12345678", + Affiliation: "Example Inc.", + Tag: "staff", + IsAdmin: true, + IsGlobalAdmin: true, + Github: "", } AddUser(user) } diff --git a/object/user.go b/object/user.go index ec78eed5..743d392f 100644 --- a/object/user.go +++ b/object/user.go @@ -24,16 +24,17 @@ type User struct { Name string `xorm:"varchar(100) notnull pk" json:"name"` CreatedTime string `xorm:"varchar(100)" json:"createdTime"` - Id string `xorm:"varchar(100)" json:"id"` - Password string `xorm:"varchar(100)" json:"password"` - PasswordType string `xorm:"varchar(100)" json:"passwordType"` - DisplayName string `xorm:"varchar(100)" json:"displayName"` - Avatar string `xorm:"varchar(100)" json:"avatar"` - Email string `xorm:"varchar(100)" json:"email"` - Phone string `xorm:"varchar(100)" json:"phone"` - Affiliation string `xorm:"varchar(100)" json:"affiliation"` - Tag string `xorm:"varchar(100)" json:"tag"` - IsAdmin bool `json:"isAdmin"` + Id string `xorm:"varchar(100)" json:"id"` + Password string `xorm:"varchar(100)" json:"password"` + PasswordType string `xorm:"varchar(100)" json:"passwordType"` + DisplayName string `xorm:"varchar(100)" json:"displayName"` + Avatar string `xorm:"varchar(100)" json:"avatar"` + Email string `xorm:"varchar(100)" json:"email"` + Phone string `xorm:"varchar(100)" json:"phone"` + Affiliation string `xorm:"varchar(100)" json:"affiliation"` + Tag string `xorm:"varchar(100)" json:"tag"` + IsAdmin bool `json:"isAdmin"` + IsGlobalAdmin bool `json:"isGlobalAdmin"` Github string `xorm:"varchar(100)" json:"github"` } diff --git a/web/src/App.js b/web/src/App.js index 197a857b..2f84d9e5 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -194,34 +194,37 @@ class App extends Component { ); - res.push( -