git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-21 17:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop

Browse Source
This commit is contained in:
Marvin Zhang
2024-11-18 18:09:49 +08:00
parent 7d2d2413fd a4ba3f0121
commit 989f50cc24
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/user/service.go
View File

@@ -30,7 +30,7 @@ func (svc *Service) Init() (err error) {
}
func (svc *Service) init() (err error) {
_, err = service.NewModelService[models.User]().GetOne(bson.M{"username": constants.DefaultAdminUsername}, nil)
u, err := service.NewModelService[models.User]().GetOne(bson.M{"username": constants.DefaultAdminUsername}, nil)
if err != nil {
if !errors2.Is(err, mongo.ErrNoDocuments) {
return err
@@ -41,7 +41,7 @@ func (svc *Service) init() (err error) {
}
// add user
u := models.User{
u = &models.User{
Username: constants.DefaultAdminUsername,
Password: utils.EncryptMd5(constants.DefaultAdminPassword),
Role: constants.RoleAdmin,
@@ -49,12 +49,12 @@ func (svc *Service) init() (err error) {
}
u.SetCreatedAt(time.Now())
u.SetUpdatedAt(time.Now())
_, err = service.NewModelService[models.User]().InsertOne(u)
_, err = service.NewModelService[models.User]().InsertOne(*u)
return err
}
func (svc *Service) initPro() (err error) {
_, err = service.NewModelService[models.User]().GetOne(bson.M{
u, err := service.NewModelService[models.User]().GetOne(bson.M{
"$or": []bson.M{
{"username": constants.DefaultAdminUsername},
{"root_admin": true},
@@ -65,19 +65,25 @@ func (svc *Service) initPro() (err error) {
return err
}
} else {
// exists
// exists, compatible with old versions
u.RootAdmin = true
u.SetUpdatedAt(time.Now())
err = service.NewModelService[models.User]().ReplaceById(u.Id, *u)
if err != nil {
log.Errorf("failed to update user: %v", err)
}
return
}
// add user
u := models.User{
u = &models.User{
Username: constants.DefaultAdminUsername,
Password: utils.EncryptMd5(constants.DefaultAdminPassword),
RootAdmin: true,
}
u.SetCreatedAt(time.Now())
u.SetUpdatedAt(time.Now())
_, err = service.NewModelService[models.User]().InsertOne(u)
_, err = service.NewModelService[models.User]().InsertOne(*u)
return err
}