feat: 发布v2.2.20

TheTNB · Jul 10, 2024 · 0081597 · 0081597
1 parent c4e01b3
commit 0081597
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/app/http/controllers/setting_controller.go b/app/http/controllers/setting_controller.go
@@ -45,13 +45,10 @@ func (r *SettingController) List(ctx http.Context) http.Response {
 		return ErrorSystem(ctx)
 	}
 
+	userID := cast.ToUint(ctx.Value("user_id"))
 	var user models.User
-	err = facades.Auth(ctx).User(&user)
-	if err != nil {
-		facades.Log().Request(ctx.Request()).Tags("面板", "面板设置").With(map[string]any{
-			"error": err.Error(),
-		}).Info("获取用户信息失败")
-		return ErrorSystem(ctx)
+	if err = facades.Orm().Query().Where("id", userID).Get(&user); err != nil {
+		return Error(ctx, http.StatusInternalServerError, "获取用户信息失败")
 	}
 
 	port, err := shell.Execf(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
@@ -129,11 +126,12 @@ func (r *SettingController) Update(ctx http.Context) http.Response {
 		return ErrorSystem(ctx)
 	}
 
+	userID := cast.ToUint(ctx.Value("user_id"))
 	var user models.User
-	err = facades.Auth(ctx).User(&user)
-	if err != nil {
-		return ErrorSystem(ctx)
+	if err = facades.Orm().Query().Where("id", userID).Get(&user); err != nil {
+		return Error(ctx, http.StatusInternalServerError, "获取用户信息失败")
 	}
+
 	user.Username = updateRequest.UserName
 	user.Email = updateRequest.Email
 	if len(updateRequest.Password) > 0 {

diff --git a/config/panel.go b/config/panel.go
@@ -8,7 +8,7 @@ func init() {
 	config := facades.Config()
 	config.Add("panel", map[string]any{
 		"name":    "耗子面板",
-		"version": "v2.2.19",
+		"version": "v2.2.20",
 		"ssl":     config.Env("APP_SSL", false),
 	})
 }