fix: 网站修改信息无效 #52 #53

Mereithhh · Dec 21, 2024 · 11adf36 · 11adf36
1 parent 3d81f84
commit 11adf36
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/handler/handlers.go b/handler/handlers.go
@@ -113,7 +113,16 @@ func UpdateSettingHandler(c *gin.Context) {
 		})
 		return
 	}
-	service.UpdateSetting(data)
+	logger.LogInfo("更新配置: %+v", data)
+	err := service.UpdateSetting(data)
+	if err != nil {
+		utils.CheckErr(err)
+		c.JSON(http.StatusBadRequest, gin.H{
+			"success":      false,
+			"errorMessage": err.Error(),
+		})
+		return
+	}
 	c.JSON(200, gin.H{
 		"success": true,
 		"message": "更新配置成功",

diff --git a/main.go b/main.go
@@ -104,5 +104,8 @@ func main() {
 	}
 	logger.LogInfo("应用启动成功，网址: http://localhost:%s", *port)
 	listen := fmt.Sprintf(":%s", *port)
-	router.Run(listen)
+	err := router.Run(listen)
+	if err != nil {
+		logger.LogError("应用启动失败，错误: %s", err)
+	}
 }
diff --git a/service/settings.go b/service/settings.go
@@ -2,13 +2,16 @@ package service
 
 import (
 	"github.com/mereith/nav/database"
+	"github.com/mereith/nav/logger"
 	"github.com/mereith/nav/types"
-	"github.com/mereith/nav/utils"
 )
 
 func GetSetting() types.Setting {
 	sql_get_user := `
-		SELECT id,favicon,title,govRecord,logo192,logo512,hideAdmin,hideGithub,jumpTargetBlank FROM nav_setting WHERE id = ?;
+		SELECT id,favicon,title,govRecord,logo192,logo512,hideAdmin,hideGithub,jumpTargetBlank 
+		FROM nav_setting 
+		ORDER BY id ASC 
+		LIMIT 1;
 		`
 	var setting types.Setting
 	row := database.DB.QueryRow(sql_get_user, 0)
@@ -18,8 +21,9 @@ func GetSetting() types.Setting {
 	var jumpTargetBlank interface{}
 	err := row.Scan(&setting.Id, &setting.Favicon, &setting.Title, &setting.GovRecord, &setting.Logo192, &setting.Logo512, &hideAdmin, &hideGithub, &jumpTargetBlank)
 	if err != nil {
+		logger.LogError("获取配置失败: %s", err)
 		return types.Setting{
-			Id:              0,
+			Id:              1,
 			Favicon:         "favicon.ico",
 			Title:           "Van Nav",
 			GovRecord:       "",
@@ -62,17 +66,24 @@ func GetSetting() types.Setting {
 	return setting
 }
 
-func UpdateSetting(data types.Setting) {
+func UpdateSetting(data types.Setting) error {
 	sql_update_setting := `
 		UPDATE nav_setting
 		SET favicon = ?, title = ?, govRecord = ?, logo192 = ?, logo512 = ?, hideAdmin = ?, hideGithub = ?, jumpTargetBlank = ?
-		WHERE id = ?;
+		WHERE id = (SELECT id FROM nav_setting ORDER BY id ASC LIMIT 1);
 		`
 
 	stmt, err := database.DB.Prepare(sql_update_setting)
-	utils.CheckErr(err)
-	res, err := stmt.Exec(data.Favicon, data.Title, data.GovRecord, data.Logo192, data.Logo512, data.HideAdmin, data.HideGithub, data.JumpTargetBlank, 0)
-	utils.CheckErr(err)
+	if err != nil {
+		return err
+	}
+	res, err := stmt.Exec(data.Favicon, data.Title, data.GovRecord, data.Logo192, data.Logo512, data.HideAdmin, data.HideGithub, data.JumpTargetBlank)
+	if err != nil {
+		return err
+	}
 	_, err = res.RowsAffected()
-	utils.CheckErr(err)
+	if err != nil {
+		return err
+	}
+	return nil
 }