Merge pull request #489 from Cassuis/dev

fix:修复createapp未初始化导致无法创建app以及修改资本资料导致密码重复加密问题
This commit is contained in:
wenjianzhang authored and GitHub committed 2021-07-16 20:52:40 +08:00
commit 12429d4585
2 files changed
+10 -3

No files matched your search

+8 -3
View File
@@ -99,9 +99,14 @@ func (e *SysUser) Update(c *dto.SysUserUpdateReq, p *actions.DataPermission) err
} }
c.Generate(&model) c.Generate(&model)
err = e.Orm.Save(&model).Error update := e.Orm.Model(&model).Where("user_id = ?", &model.UserId).Omit("password", "salt").Updates(&model)
if err != nil { if err = update.Error; err != nil {
e.Log.Errorf("Service UpdateSysUser error: %s", err) e.Log.Errorf("db error: %s", err)
return err
}
if update.RowsAffected == 0 {
err = errors.New("update userinfo error")
log.Warnf("db update error")
return err return err
} }
return nil return nil
+2
View File
@@ -4,6 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg"
"go-admin/cmd/app"
"go-admin/common/global" "go-admin/common/global"
"os" "os"
@@ -45,6 +46,7 @@ func init() {
rootCmd.AddCommand(migrate.StartCmd) rootCmd.AddCommand(migrate.StartCmd)
rootCmd.AddCommand(version.StartCmd) rootCmd.AddCommand(version.StartCmd)
rootCmd.AddCommand(config.StartCmd) rootCmd.AddCommand(config.StartCmd)
rootCmd.AddCommand(app.StartCmd)
} }
//Execute : apply commands //Execute : apply commands