refactor(site): optimize image processing and error handling for site update

ch3nnn · ch3nnn · commit 059edd55d910 · 2025-02-08T13:07:51.000+08:00
- Extract image resizing and base64 encoding logic into separate functions
- Add error handling for image processing operations
- Use default favicon base64 from repository instead of hardcoding
- Improve logging and error messages in site service
- Update user repository to use struct fields instead of query conditions
diff --git a/internal/dal/repository/repository.go b/internal/dal/repository/repository.go
@@ -123,10 +123,10 @@ func autoMigrateAndInitialize(db *gorm.DB) {
 	_, err = query.SysUser.WithContext(ctx).
 		Where(
 			query.SysUser.ID.Eq(1),
-			query.SysUser.Username.Eq(DefaultUname),
 		).
 		Attrs(
 			field.Attrs(&model.SysUser{
+				Username: DefaultUname,
 				Password: cryptor.Md5String(DefaultUPassword),
 			}),
 		).
diff --git a/internal/service/config/update.go b/internal/service/config/update.go
@@ -6,47 +6,20 @@
 package config
 
 import (
-	"bytes"
-	"encoding/base64"
-	"mime/multipart"
-
-	"github.com/disintegration/imaging"
 	"github.com/gin-gonic/gin"
 
 	v1 "github.com/ch3nnn/webstack-go/api/v1"
 	"github.com/ch3nnn/webstack-go/internal/dal/repository"
+	"github.com/ch3nnn/webstack-go/pkg/tools"
 )
 
 const (
 	LogoWidth     = 200
 	LogoHeight    = 50
-	FaviconWidth  = 32
-	FaviconHeight = 32
+	FaviconWidth  = 64
+	FaviconHeight = 64
 )
 
-func resize2Image(f *multipart.FileHeader, width, height int) (base64Str string, err error) {
-	file, err := f.Open()
-	if err != nil {
-		return
-	}
-	defer file.Close()
-
-	img, err := imaging.Decode(file, imaging.AutoOrientation(true))
-	if err != nil {
-		return
-	}
-
-	var buf bytes.Buffer
-	resize := imaging.Resize(img, width, height, imaging.Lanczos)
-	if err = imaging.Encode(&buf, resize, imaging.PNG); err != nil {
-		return
-	}
-
-	base64Str = base64.StdEncoding.EncodeToString(buf.Bytes())
-
-	return
-}
-
 func (s *service) Update(ctx *gin.Context, req *v1.ConfigUpdateReq) (resp *v1.ConfigUpdateResp, err error) {
 	update := make(map[string]any)
 	if req.SiteTitle != nil {
@@ -71,15 +44,15 @@ func (s *service) Update(ctx *gin.Context, req *v1.ConfigUpdateReq) (resp *v1.Co
 		update["is_about"] = *req.IsAbout
 	}
 	if req.LogFile != nil {
-		base64Str, err := resize2Image(req.LogFile, LogoWidth, LogoHeight)
+		base64Str, err := tools.ResizeMultipartImgToBase64(req.LogFile, LogoWidth, LogoHeight)
 		if err != nil {
 			base64Str = repository.DefaultLogoBase64
 		}
 
 		update["site_logo"] = base64Str
 	}
 	if req.FaviconFile != nil {
-		base64Str, err := resize2Image(req.FaviconFile, FaviconWidth, FaviconHeight)
+		base64Str, err := tools.ResizeMultipartImgToBase64(req.FaviconFile, FaviconWidth, FaviconHeight)
 		if err != nil {
 			base64Str = repository.DefaultFaviconBase64
 		}
diff --git a/internal/service/site/service.go b/internal/service/site/service.go
@@ -16,6 +16,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gocolly/colly"
 	"github.com/mat/besticon/besticon"
+	"github.com/pkg/errors"
 
 	v1 "github.com/ch3nnn/webstack-go/api/v1"
 	"github.com/ch3nnn/webstack-go/internal/dal/repository"
@@ -61,9 +62,6 @@ func (s *service) i() {}
 
 // -----------------------------------------------------------------------------------------------------------------------------------------
 
-// default icon base64
-const defaultIcon = "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAA+VBMVEUAAAC6sWUzNjZCQkIsLi8sLjAsLi//tSs6Oj8tLzAsLi/9sycsLi/9sycsLi/9tCctLi/8tSj/tSguMTEuMzQzMzMwMzb/ujP9tCcsLi8uLzEtLy8sLi8sLi8tLi8sLi8tLi8sLi8tLjAsLi8sLy8sLi8sLjAsLjAtLy8tLzAtLzAuMDAuMDL/tyn9tCf8tCctLi/8tCf8tCf8tCf9sycsLjD9tCgsLjD9tSf9tCgtLzAtMDAuLzAvLzEvLzL/ty0tLy/+tij9tCj9tCj9syf9syj9tCf9tCj9tCf9tCn8tSj/tCj/tikwMDT/vzP/v0AsLy/8sycsLi+FeN01AAAAUXRSTlMAAg8F/uOqIwv7+Pjp6dLQdWM/KSIcFg3v7Uv18tzZzce5ta+ej4eBb2lUQT0x+8jBvrWvqpqLiollZGBcNjAck1T039fNo5h7cFpHOB8UCKLRW+BFAAACmElEQVRYw82VaVPyMBSFW5aC7FulgMiqICIIIiq4gPvum/7/H/NOe+00xwZL+OTzhZkm5wz35txE+eOo2ZExyqob63NpZpHObSaPTJjDJCIvL57HmUv8vChbfJIhyawqVzwg2YrICRNzEpEoHpBohXoBxXtIXqhSxUu0QlS8ZCuK0zhbj/i0KFu8fyuO0kyO9BHqDSaLAQ5jJs+YNzCYPAZvMGTyDHmDVybPq8KTjUvK41kFuZlI6Sc3gjl4WFv+kPO7hpD1L6fidOArH8AgeIiM/eITWSUtdIP279v9L/L7N3tPsFv4KY/ux8xwj1rxYqzK3gsV3wubsf0o6AN10+L4WrH4fBqIin/6tFevj+299QBv0DaJ0Ok2TefIox/R9G2fhkyizRuETYfSdyuWdyC/W34XXzIdwrzBrumyW7Y/fT3fMofb5y/7Wxn28QZnJk8zT+l+ZMQj5TbfhF1nvEFQg7WtPerQ+9Aa23fq894W7NGCCjBPwHJiplKwlhQcdfZjfa6IksBT63OL/RqsuSkACi0T0D4U4kPDhRaXQ+QwBRsrnYBVfKcCX1OHv72tByW0aC1aKC8dqCuniZq9wGYjW4uAuxfp10JtinG+sVLfyFOc2yGnxZiknQydba8qlFd7lJnMDuTIJuPsKbt7ANe97LhneIOU4F+CXFBfijdIeGN8Vef09StvnBO8gSY6qcuwM7iXojPWeAO9KspKtBOzctuJilJW1RVwEKdV7/7r6uKc6z4xhnmBSYM4Y4ydVkLl0A0iIYgzNBl7T+eBxyRCdGuFmrPyrBny3ndi4N4E4Mb1AWIsirMv9HYA+Or4Q68XQu+eBL0wqunllSEKN2GF4iyHrkFuN6FfwxdCHnXeKDXmqvKn+Q+oeE3vIQF62QAAAABJRU5ErkJggg=="
-
 func getWebLogoIconBase64(url string) (string, error) {
 	client := &http.Client{
 		Timeout: 3 * time.Second,
@@ -77,12 +75,17 @@ func getWebLogoIconBase64(url string) (string, error) {
 		besticon.WithLogger(besticon.NewDefaultLogger(io.Discard)), // disable verbose logging
 	)
 
-	icons, err := b.NewIconFinder().FetchIcons(url)
-	if err != nil || len(icons) == 0 {
-		return defaultIcon, err
+	finder := b.NewIconFinder()
+	if _, err := finder.FetchIcons(url); err != nil {
+		return repository.DefaultFaviconBase64, err
+	}
+
+	icon := finder.IconInSizeRange(besticon.SizeRange{Min: 16, Perfect: 64, Max: 512})
+	if icon == nil {
+		return repository.DefaultFaviconBase64, errors.New("failed to fetch icons")
 	}
 
-	return base64.StdEncoding.EncodeToString(icons[0].ImageData), nil
+	return base64.StdEncoding.EncodeToString(icon.ImageData), nil
 }
 
 func getWebTitle(url string) (title string, err error) {
diff --git a/internal/service/site/update.go b/internal/service/site/update.go
@@ -6,51 +6,17 @@
 package site
 
 import (
-	"crypto/tls"
-	"encoding/base64"
-	"io"
-	"net/http"
-
 	"github.com/gin-gonic/gin"
 
 	v1 "github.com/ch3nnn/webstack-go/api/v1"
+	"github.com/ch3nnn/webstack-go/internal/dal/repository"
+	"github.com/ch3nnn/webstack-go/pkg/tools"
 )
 
-func getIconBase64ByFormFile(req *v1.SiteUpdateReq) string {
-	file, err := req.File.Open()
-	if err != nil {
-		return defaultIcon
-	}
-	defer file.Close()
-
-	imgData, err := io.ReadAll(file)
-	if err != nil {
-		return defaultIcon
-	}
-
-	return base64.StdEncoding.EncodeToString(imgData)
-}
-
-func getIconBase64ByURL(req *v1.SiteUpdateReq) string {
-	client := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		},
-	}
-
-	resp, err := client.Get(req.Icon)
-	if err != nil {
-		return defaultIcon
-	}
-	defer resp.Body.Close()
-
-	imgData, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return defaultIcon
-	}
-
-	return base64.StdEncoding.EncodeToString(imgData)
-}
+const (
+	FaviconWidth  = 64
+	FaviconHeight = 64
+)
 
 func (s *service) Update(ctx *gin.Context, req *v1.SiteUpdateReq) (resp *v1.SiteUpdateResp, err error) {
 	update := make(map[string]any)
@@ -62,10 +28,20 @@ func (s *service) Update(ctx *gin.Context, req *v1.SiteUpdateReq) (resp *v1.Site
 		update["Title"] = req.Title
 	}
 	if req.Icon != "" {
-		update["Icon"] = getIconBase64ByURL(req)
+		base64Str, err := tools.ResizeURLImgToBase64(req.Icon, FaviconWidth, FaviconHeight)
+		if err != nil {
+			base64Str = repository.DefaultFaviconBase64
+		}
+
+		update["Icon"] = base64Str
 	}
 	if req.File != nil {
-		update["Icon"] = getIconBase64ByFormFile(req)
+		base64Str, err := tools.ResizeMultipartImgToBase64(req.File, FaviconWidth, FaviconHeight)
+		if err != nil {
+			base64Str = repository.DefaultFaviconBase64
+		}
+
+		update["Icon"] = base64Str
 	}
 	if req.Description != "" {
 		update["Description"] = req.Description
diff --git a/pkg/tools/img.go b/pkg/tools/img.go
@@ -0,0 +1,75 @@
+/**
+ * @Author: chentong
+ * @Date: 2025/02/08 12:37
+ */
+
+package tools
+
+import (
+	"bytes"
+	"crypto/tls"
+	"encoding/base64"
+	"io"
+	"mime/multipart"
+	"net/http"
+
+	"github.com/disintegration/imaging"
+)
+
+func resizeImg2Base64(r io.Reader, width, height int) (base64Str string, err error) {
+	img, err := imaging.Decode(r, imaging.AutoOrientation(true))
+	if err != nil {
+		return
+	}
+
+	var buf bytes.Buffer
+	resize := imaging.Resize(img, width, height, imaging.Lanczos)
+	if err = imaging.Encode(&buf, resize, imaging.PNG); err != nil {
+		return
+	}
+
+	base64Str = base64.StdEncoding.EncodeToString(buf.Bytes())
+
+	return
+}
+
+// ResizeMultipartImgToBase64 将multipart.FileHeader表示的图片文件调整大小，并以base64编码字符串的形式返回。
+// 参数f是包含图片文件信息的multipart.FileHeader指针；
+// 参数width和height分别是目标图片的宽度和高度。
+// 返回值base64Str是调整大小后的图片的base64编码字符串；err是错误信息，如果执行过程中发生错误则不为nil。
+func ResizeMultipartImgToBase64(f *multipart.FileHeader, width, height int) (base64Str string, err error) {
+	file, err := f.Open()
+	if err != nil {
+		return
+	}
+	defer file.Close()
+
+	return resizeImg2Base64(file, width, height)
+}
+
+// ResizeURLImgToBase64 从指定的URL获取图像，并将其调整为指定的宽度和高度后，转换为Base64编码的字符串。
+// 参数:
+//
+//	url - 图像的URL地址。
+//	width - 调整后图像的宽度。
+//	height - 调整后图像的高度。
+//
+// 返回值:
+//
+//	base64Str - 转换后的Base64编码字符串。
+//	err - 错误信息，如果执行过程中遇到任何错误，则返回该错误。
+func ResizeURLImgToBase64(url string, width, height int) (base64Str string, err error) {
+	client := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		},
+	}
+
+	resp, err := client.Get(url)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	return resizeImg2Base64(resp.Body, width, height)
+}
