Merge branch 'main' of http://leonmmcoset.jjxmm.win:2000/LeonMMcoset/leonpan

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "assets"]
 	path = assets
-	url = http://leonmmcoset.jjxmm.win:2000/MiaoStars/cloudreve-assets.git
+	url = http://leonmmcoset.jjxmm.win:2000/leonmmcoset/leonpan-assets.git

application/constants/constants.go

@@ -6,7 +6,7 @@ package constants
 var BackendVersion = "4.7.0"
 
 // IsPro 是否为Pro版本
-var IsPro = "false"
+var IsPro = "true"
 
 var IsProBool = IsPro == "true"
 

inventory/setting.go

@@ -70,10 +70,18 @@ func (c *settingClient) Gets(ctx context.Context, names []string) (map[string]st
 
 func (c *settingClient) Set(ctx context.Context, settings map[string]string) error {
 	for k, v := range settings {
-		if err := c.client.Setting.Update().Where(setting.Name(k)).SetValue(v).Exec(ctx); err != nil {
+		// 尝试更新现有记录
-			return fmt.Errorf("failed to create setting %q: %w", k, err)
+		affected, err := c.client.Setting.Update().Where(setting.Name(k)).SetValue(v).Save(ctx)
+		if err != nil {
+			return fmt.Errorf("failed to update setting %q: %w", k, err)
+		}
+		
+		// 如果没有记录被更新，创建新记录
+		if affected == 0 {
+			if err := c.client.Setting.Create().SetName(k).SetValue(v).Exec(ctx); err != nil {
+				return fmt.Errorf("failed to create setting %q: %w", k, err)
+			}
 		}
-
 	}
 
 	return nil

pkg/cache/driver_test.go

@@ -1,8 +1,9 @@
 package cache
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSet(t *testing.T) {

pkg/setting/provider.go

@@ -22,6 +22,10 @@ type (
 		SiteBasic(ctx context.Context) *SiteBasic
 		// PWA related settings
 		PWA(ctx context.Context) *PWASetting
+		// AnnouncementEnabled returns true if announcement is enabled.
+		AnnouncementEnabled(ctx context.Context) bool
+		// Announcement returns the site announcement content.
+		Announcement(ctx context.Context) string
 		// RegisterEnabled returns true if public sign-up is enabled.
 		RegisterEnabled(ctx context.Context) bool
 		// AuthnEnabled returns true if Webauthn is enabled.
@@ -776,6 +780,16 @@ func (s *settingProvider) PWA(ctx context.Context) *PWASetting {
 	}
 }
 
+// AnnouncementEnabled returns true if announcement is enabled.
+func (s *settingProvider) AnnouncementEnabled(ctx context.Context) bool {
+	return s.getBoolean(ctx, "announcement_enabled", false)
+}
+
+// Announcement returns the site announcement content.
+func (s *settingProvider) Announcement(ctx context.Context) string {
+	return s.getString(ctx, "announcement", "")
+}
+
 func IsTrueValue(val string) bool {
 	return val == "1" || val == "true"
 }

service/admin/response.go

@@ -90,6 +90,15 @@ type GetStoragePolicyResponse struct {
 	EntitiesSize  int `json:"entities_size,omitempty"`
 }
 
+// StoragePolicySpace 存储策略空间使用情况
+type StoragePolicySpace struct {
+	ID    int64  `json:"id"`
+	Name  string `json:"name"`
+	Type  string `json:"type"`
+	Used  int64  `json:"used"`
+	Total int64  `json:"total"`
+}
+
 type ListNodeResponse struct {
 	Pagination *inventory.PaginationResults `json:"pagination"`
 	Nodes      []*ent.Node                  `json:"nodes"`
@@ -115,9 +124,10 @@ type ListGroupResponse struct {
 }
 
 type HomepageSummary struct {
-	MetricsSummary *MetricsSummary `json:"metrics_summary"`
+	MetricsSummary  *MetricsSummary       `json:"metrics_summary"`
-	SiteURls       []string        `json:"site_urls"`
+	SiteURls        []string              `json:"site_urls"`
-	Version        *Version        `json:"version"`
+	Version         *Version              `json:"version"`
+	StoragePolicies []*StoragePolicySpace `json:"storage_policies"`
 }
 
 type MetricsSummary struct {

service/admin/site.go

@@ -93,6 +93,34 @@ func (s *SummaryService) Summary(c *gin.Context) (*HomepageSummary, error) {
 		SiteURls: lo.Map(dep.SettingProvider().AllSiteURLs(c), func(item *url.URL, index int) string {
 			return item.String()
 		}),
+		StoragePolicies: make([]*StoragePolicySpace, 0),
+	}
+
+	// 无论是否从缓存加载或生成新统计，都需要获取存储策略空间使用情况
+	policyClient := dep.StoragePolicyClient()
+	policyResult, policyErr := policyClient.ListPolicies(c, &inventory.ListPolicyParameters{
+		PaginationArgs: &inventory.PaginationArgs{PageSize: 1000, Page: 0}, // 获取所有策略
+	})
+	if policyErr == nil {
+		// 收集存储策略空间使用情况
+		res.StoragePolicies = make([]*StoragePolicySpace, 0, len(policyResult.Policies))
+		entityClient := dep.FileClient()
+
+		for _, policy := range policyResult.Policies {
+			// 获取该存储策略的已使用空间
+			_, usedSpace, err := entityClient.CountEntityByStoragePolicyID(c, policy.ID)
+			if err != nil {
+				continue
+			}
+
+			res.StoragePolicies = append(res.StoragePolicies, &StoragePolicySpace{
+				ID:    int64(policy.ID),
+				Name:  policy.Name,
+				Type:  policy.Type,
+				Used:  int64(usedSpace),
+				Total: int64(policy.MaxSize), // 确保类型一致
+			})
+		}
 	}
 
 	if summary, ok := kv.Get(MetricCacheKey); ok {

service/basic/site.go

@@ -60,6 +60,10 @@ type SiteConfig struct {
 	// App settings
 	AppPromotion bool `json:"app_promotion,omitempty"`
 
+	// Announcement settings
+	AnnouncementEnabled bool   `json:"announcement_enabled,omitempty"`
+	Announcement        string `json:"announcement,omitempty"`
+
 	//EmailActive          bool      `json:"emailActive"`
 	//QQLogin              bool      `json:"QQLogin"`
 	//ScoreEnabled         bool      `json:"score_enabled"`
@@ -183,22 +187,24 @@ func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) {
 	customNavItems := settings.CustomNavItems(c)
 	customHTML := settings.CustomHTML(c)
 	return &SiteConfig{
-		InstanceID:      siteBasic.ID,
+		InstanceID:          siteBasic.ID,
-		SiteName:        siteBasic.Name,
+		SiteName:            siteBasic.Name,
-		Themes:          themes.Themes,
+		Themes:              themes.Themes,
-		DefaultTheme:    themes.DefaultTheme,
+		DefaultTheme:        themes.DefaultTheme,
-		User:            &userRes,
+		User:                &userRes,
-		Logo:            logo.Normal,
+		Logo:                logo.Normal,
-		LogoLight:       logo.Light,
+		LogoLight:           logo.Light,
-		CaptchaType:     settings.CaptchaType(c),
+		CaptchaType:         settings.CaptchaType(c),
-		TurnstileSiteID: settings.TurnstileCaptcha(c).Key,
+		TurnstileSiteID:     settings.TurnstileCaptcha(c).Key,
-		ReCaptchaKey:    reCaptcha.Key,
+		ReCaptchaKey:        reCaptcha.Key,
-		CapInstanceURL:  capCaptcha.InstanceURL,
+		CapInstanceURL:      capCaptcha.InstanceURL,
-		CapSiteKey:      capCaptcha.SiteKey,
+		CapSiteKey:          capCaptcha.SiteKey,
-		CapAssetServer:  capCaptcha.AssetServer,
+		CapAssetServer:      capCaptcha.AssetServer,
-		AppPromotion:    appSetting.Promotion,
+		AppPromotion:        appSetting.Promotion,
-		CustomNavItems:  customNavItems,
+		CustomNavItems:      customNavItems,
-		CustomHTML:      customHTML,
+		CustomHTML:          customHTML,
+		AnnouncementEnabled: settings.AnnouncementEnabled(c),
+		Announcement:        settings.Announcement(c),
 	}, nil
 }