Refactor sys config

Author: bbbbbbbbbbbbba

bbs-go.code-workspace

@@ -26,7 +26,9 @@
       "admin/src/views/dashboard/workplace/locale"
     ],
     "cSpell.words": [
+      "bbsurls",
       "favorited",
+      "gjson",
       "gorm",
       "iconfont",
       "iplocator",

server/internal/cache/sys_config_cache.go

@@ -2,10 +2,13 @@ package cache
 
 import (
 	"errors"
+	"log/slog"
 	"time"
 
 	"github.com/goburrow/cache"
+	"github.com/mlogclub/simple/common/jsons"
 	"github.com/mlogclub/simple/sqls"
+	"github.com/spf13/cast"
 
 	"bbs-go/internal/models"
 	"bbs-go/internal/repositories"
@@ -21,8 +24,9 @@ func newSysConfigCache() *sysConfigCache {
 	return &sysConfigCache{
 		cache: cache.NewLoadingCache(
 			func(key cache.Key) (value cache.Value, e error) {
-				value = repositories.SysConfigRepository.GetByKey(sqls.DB(), key.(string))
-				if value == nil {
+				if ret := repositories.SysConfigRepository.GetByKey(sqls.DB(), key.(string)); ret != nil {
+					value = ret
+				} else {
 					e = errors.New("数据不存在")
 				}
 				return
@@ -44,12 +48,34 @@ func (c *sysConfigCache) Get(key string) *models.SysConfig {
 	return nil
 }
 
-func (c *sysConfigCache) GetValue(key string) string {
-	sysConfig := c.Get(key)
-	if sysConfig == nil {
-		return ""
+func (c *sysConfigCache) GetStr(key string) string {
+	if t := c.Get(key); t != nil {
+		return t.Value
 	}
-	return sysConfig.Value
+	return ""
+}
+
+func (c *sysConfigCache) GetBool(key string) bool {
+	str := c.GetStr(key)
+	return cast.ToBool(str)
+}
+
+func (c *sysConfigCache) GetInt(key string) int {
+	str := c.GetStr(key)
+	return cast.ToInt(str)
+}
+
+func (c *sysConfigCache) GetInt64(key string) int64 {
+	str := c.GetStr(key)
+	return cast.ToInt64(str)
+}
+
+func (c *sysConfigCache) GetStrArr(key string) (ret []string) {
+	str := c.GetStr(key)
+	if err := jsons.Parse(str, &ret); err != nil {
+		slog.Warn("config value error", slog.Any("key", key), slog.Any("err", err))
+	}
+	return
 }
 
 func (c *sysConfigCache) Invalidate(key string) {

server/internal/models/data.go server/internal/models/dto/config_dto.go

@@ -1,10 +1,4 @@
-package models
-
-// 站点导航
-type ActionLink struct {
-	Title string `json:"title"`
-	Url   string `json:"url"`
-}
+package dto
 
 // 积分配置
 type ScoreConfig struct {

server/internal/models/dto/dto.go

@@ -1,7 +1,13 @@
 package dto
 
+// 站点导航
+type ActionLink struct {
+	Title string `json:"title"`
+	Url   string `json:"url"`
+}
+
 type ApiRoute struct {
-	Method string
-	Path   string
-	Name   string
+	Method string `json:"method"`
+	Path   string `json:"path"`
+	Name   string `json:"name"`
 }

server/internal/pkg/email/email.go

@@ -2,6 +2,7 @@ package email
 
 import (
 	"bbs-go/internal/models"
+	"bbs-go/internal/models/dto"
 	"bbs-go/internal/pkg/bbsurls"
 	"bytes"
 	"crypto/tls"
@@ -42,14 +43,14 @@ var emailTemplate = `
 `
 
 // SendTemplateEmail 发送模版邮件
-func SendTemplateEmail(from *models.User, to, subject, title, content, quote string, link *models.ActionLink) error {
+func SendTemplateEmail(from *models.User, to, subject, title, content, quote string, link *dto.ActionLink) error {
 	tpl, err := template.New("emailTemplate").Parse(emailTemplate)
 	if err != nil {
 		return err
 	}
-	var fromLink *models.ActionLink
+	var fromLink *dto.ActionLink
 	if from != nil {
-		fromLink = &models.ActionLink{
+		fromLink = &dto.ActionLink{
 			Title: from.Nickname,
 			Url:   bbsurls.UserUrl(from.Id),
 		}

server/internal/services/message_service.go

@@ -4,6 +4,7 @@ import (
 	"bbs-go/internal/cache"
 	"bbs-go/internal/models"
 	"bbs-go/internal/models/constants"
+	"bbs-go/internal/models/dto"
 	"bbs-go/internal/pkg/bbsurls"
 	"bbs-go/internal/pkg/email"
 	"bbs-go/internal/pkg/msg"
@@ -116,7 +117,7 @@ func (s *messageService) SendEmailNotice(t *models.Message) {
 		return
 	}
 	var (
-		siteTitle  = cache.SysConfigCache.GetValue(constants.SysConfigSiteTitle)
+		siteTitle  = cache.SysConfigCache.GetStr(constants.SysConfigSiteTitle)
 		emailTitle = siteTitle + " - 新消息提醒"
 	)
 
@@ -141,7 +142,7 @@ func (s *messageService) SendEmailNotice(t *models.Message) {
 		from = cache.UserCache.Get(t.FromId)
 	}
 	err := email.SendTemplateEmail(from, user.Email.String, emailTitle, emailTitle, t.Content,
-		t.QuoteContent, &models.ActionLink{
+		t.QuoteContent, &dto.ActionLink{
 			Title: "点击查看详情",
 			Url:   bbsurls.AbsUrl("/user/messages"),
 		})