feat: 合并 develop 至 main，发布首页改版与用量隐私控制

backend/internal/handler/admin/setting_handler.go

@@ -348,7 +348,10 @@ func (h *SettingHandler) GetSettings(c *gin.Context) {
 
 		AffiliateEnabled: settings.AffiliateEnabled,
 
-		AllowUserViewErrorRequests: settings.AllowUserViewErrorRequests,
+		AllowUserViewErrorRequests:    settings.AllowUserViewErrorRequests,
+		UsageDetailShowUnitPrices:     settings.UsageDetailShowUnitPrices,
+		UsageDetailShowRateMultiplier: settings.UsageDetailShowRateMultiplier,
+		UsageDetailShowOriginalCost:   settings.UsageDetailShowOriginalCost,
 	}
 
 	// OpenAI fast policy (stored under a dedicated setting key)

backend/internal/handler/admin/setting_handler_update.go

@@ -335,7 +335,10 @@ type UpdateSettingsRequest struct {
 	AuthSourceGooglePlatformQuotas   map[string]*service.DefaultPlatformQuotaSetting `json:"auth_source_default_google_platform_quotas"`
 	AuthSourceDingTalkPlatformQuotas map[string]*service.DefaultPlatformQuotaSetting `json:"auth_source_default_dingtalk_platform_quotas"`
 
-	AllowUserViewErrorRequests *bool `json:"allow_user_view_error_requests"`
+	AllowUserViewErrorRequests    *bool `json:"allow_user_view_error_requests"`
+	UsageDetailShowUnitPrices     *bool `json:"usage_detail_show_unit_prices"`
+	UsageDetailShowRateMultiplier *bool `json:"usage_detail_show_rate_multiplier"`
+	UsageDetailShowOriginalCost   *bool `json:"usage_detail_show_original_cost"`
 }
 
 // UpdateSettings 更新系统设置
@@ -1385,6 +1388,24 @@ func (h *SettingHandler) UpdateSettings(c *gin.Context) {
 			}
 			return previousSettings.AllowUserViewErrorRequests
 		}(),
+		UsageDetailShowUnitPrices: func() bool {
+			if req.UsageDetailShowUnitPrices != nil {
+				return *req.UsageDetailShowUnitPrices
+			}
+			return previousSettings.UsageDetailShowUnitPrices
+		}(),
+		UsageDetailShowRateMultiplier: func() bool {
+			if req.UsageDetailShowRateMultiplier != nil {
+				return *req.UsageDetailShowRateMultiplier
+			}
+			return previousSettings.UsageDetailShowRateMultiplier
+		}(),
+		UsageDetailShowOriginalCost: func() bool {
+			if req.UsageDetailShowOriginalCost != nil {
+				return *req.UsageDetailShowOriginalCost
+			}
+			return previousSettings.UsageDetailShowOriginalCost
+		}(),
 		OpsMonitoringEnabled: func() bool {
 			if req.OpsMonitoringEnabled != nil {
 				return *req.OpsMonitoringEnabled

backend/internal/handler/dto/settings.go

@@ -303,7 +303,10 @@ type SystemSettings struct {
 	DefaultPlatformQuotas map[string]*service.DefaultPlatformQuotaSetting `json:"default_platform_quotas,omitempty"`
 
 	// 允许终端用户在用量页查看自己的失败请求
-	AllowUserViewErrorRequests bool `json:"allow_user_view_error_requests"`
+	AllowUserViewErrorRequests    bool `json:"allow_user_view_error_requests"`
+	UsageDetailShowUnitPrices     bool `json:"usage_detail_show_unit_prices"`
+	UsageDetailShowRateMultiplier bool `json:"usage_detail_show_rate_multiplier"`
+	UsageDetailShowOriginalCost   bool `json:"usage_detail_show_original_cost"`
 }
 
 type DefaultSubscriptionSetting struct {
@@ -373,7 +376,10 @@ type PublicSettings struct {
 
 	RiskControlEnabled bool `json:"risk_control_enabled"`
 
-	AllowUserViewErrorRequests bool `json:"allow_user_view_error_requests"`
+	AllowUserViewErrorRequests    bool `json:"allow_user_view_error_requests"`
+	UsageDetailShowUnitPrices     bool `json:"usage_detail_show_unit_prices"`
+	UsageDetailShowRateMultiplier bool `json:"usage_detail_show_rate_multiplier"`
+	UsageDetailShowOriginalCost   bool `json:"usage_detail_show_original_cost"`
 }
 
 type LoginAgreementDocument struct {

backend/internal/handler/dto/usage_visibility.go

@@ -0,0 +1,62 @@
+package dto
+
+import (
+	"encoding/json"
+
+	"github.com/Wei-Shaw/sub2api/internal/service"
+)
+
+var userUsageUnitPriceFields = []string{
+	"input_cost",
+	"output_cost",
+	"cache_creation_cost",
+	"cache_read_cost",
+	"image_input_cost",
+	"image_output_cost",
+}
+
+// UsageLogFromServiceWithVisibility converts a service usage record and removes
+// disabled billing-calculation fields before the payload reaches JSON encoding.
+// Admin endpoints continue using UsageLogFromServiceAdmin and remain unaffected.
+func UsageLogFromServiceWithVisibility(log *service.UsageLog, visibility service.UsageDetailVisibility) map[string]any {
+	return RedactUsageLogForUser(UsageLogFromService(log), visibility)
+}
+
+// RedactUsageLogForUser performs response-level redaction rather than UI-only
+// hiding. The omitted keys therefore cannot be recovered through DevTools.
+func RedactUsageLogForUser(log *UsageLog, visibility service.UsageDetailVisibility) map[string]any {
+	if log == nil {
+		return nil
+	}
+	raw, err := json.Marshal(log)
+	if err != nil {
+		return map[string]any{}
+	}
+	payload := make(map[string]any)
+	if err := json.Unmarshal(raw, &payload); err != nil {
+		return map[string]any{}
+	}
+
+	if !visibility.ShowUnitPrices {
+		for _, field := range userUsageUnitPriceFields {
+			delete(payload, field)
+		}
+	}
+	if !visibility.ShowRateMultiplier {
+		delete(payload, "rate_multiplier")
+		redactNestedGroupRate(payload["group"])
+		if apiKey, ok := payload["api_key"].(map[string]any); ok {
+			redactNestedGroupRate(apiKey["group"])
+		}
+	}
+	if !visibility.ShowOriginalCost {
+		delete(payload, "total_cost")
+	}
+	return payload
+}
+
+func redactNestedGroupRate(value any) {
+	if group, ok := value.(map[string]any); ok {
+		delete(group, "rate_multiplier")
+	}
+}

backend/internal/handler/dto/usage_visibility_test.go

@@ -0,0 +1,83 @@
+package dto
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/Wei-Shaw/sub2api/internal/service"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRedactUsageLogForUserOmitsDisabledBillingFields(t *testing.T) {
+	log := &UsageLog{
+		ID:                1,
+		InputCost:         1.25,
+		OutputCost:        2.5,
+		CacheCreationCost: 0.5,
+		CacheReadCost:     0.25,
+		ImageInputCost:    0.75,
+		ImageOutputCost:   1.75,
+		TotalCost:         7,
+		ActualCost:        0.42,
+		RateMultiplier:    0.06,
+		Group:             &Group{ID: 1, RateMultiplier: 0.06},
+		APIKey: &APIKey{
+			ID:    2,
+			Group: &Group{ID: 1, RateMultiplier: 0.06},
+		},
+	}
+
+	payload := RedactUsageLogForUser(log, service.UsageDetailVisibility{})
+	raw, err := json.Marshal(payload)
+	require.NoError(t, err)
+	encoded := string(raw)
+
+	for _, key := range append(append([]string{}, userUsageUnitPriceFields...), "rate_multiplier", "total_cost") {
+		require.NotContains(t, encoded, `"`+key+`"`)
+	}
+	require.Contains(t, encoded, `"actual_cost":0.42`)
+}
+
+func TestRedactUsageLogForUserKeepsEnabledBillingFields(t *testing.T) {
+	log := &UsageLog{
+		ID:             1,
+		InputCost:      1.25,
+		OutputCost:     2.5,
+		TotalCost:      3.75,
+		ActualCost:     0.225,
+		RateMultiplier: 0.06,
+	}
+
+	payload := RedactUsageLogForUser(log, service.UsageDetailVisibility{
+		ShowUnitPrices:     true,
+		ShowRateMultiplier: true,
+		ShowOriginalCost:   true,
+	})
+	require.Equal(t, 1.25, payload["input_cost"])
+	require.Equal(t, 2.5, payload["output_cost"])
+	require.Equal(t, 3.75, payload["total_cost"])
+	require.Equal(t, 0.06, payload["rate_multiplier"])
+}
+
+func TestRedactUsageLogForUserSupportsIndependentSwitches(t *testing.T) {
+	log := &UsageLog{
+		ID:             1,
+		InputCost:      1.25,
+		OutputCost:     2.5,
+		TotalCost:      3.75,
+		ActualCost:     0.225,
+		RateMultiplier: 0.06,
+	}
+
+	payload := RedactUsageLogForUser(log, service.UsageDetailVisibility{
+		ShowUnitPrices:     true,
+		ShowRateMultiplier: false,
+		ShowOriginalCost:   true,
+	})
+
+	require.Equal(t, 1.25, payload["input_cost"])
+	require.Equal(t, 2.5, payload["output_cost"])
+	require.Equal(t, 3.75, payload["total_cost"])
+	require.NotContains(t, payload, "rate_multiplier")
+	require.Equal(t, 0.225, payload["actual_cost"])
+}

backend/internal/handler/setting_handler.go

@@ -102,7 +102,10 @@ func (h *SettingHandler) GetPublicSettings(c *gin.Context) {
 
 		RiskControlEnabled: settings.RiskControlEnabled,
 
-		AllowUserViewErrorRequests: settings.AllowUserViewErrorRequests,
+		AllowUserViewErrorRequests:    settings.AllowUserViewErrorRequests,
+		UsageDetailShowUnitPrices:     settings.UsageDetailShowUnitPrices,
+		UsageDetailShowRateMultiplier: settings.UsageDetailShowRateMultiplier,
+		UsageDetailShowOriginalCost:   settings.UsageDetailShowOriginalCost,
 	})
 }
 

backend/internal/handler/usage_handler.go

@@ -241,9 +241,17 @@ func (h *UsageHandler) List(c *gin.Context) {
 		return
 	}
 
-	out := make([]dto.UsageLog, 0, len(records))
+	visibility := service.UsageDetailVisibility{
+		ShowUnitPrices:     true,
+		ShowRateMultiplier: true,
+		ShowOriginalCost:   true,
+	}
+	if h.settingService != nil {
+		visibility = h.settingService.GetUsageDetailVisibility(c.Request.Context())
+	}
+	out := make([]map[string]any, 0, len(records))
 	for i := range records {
-		out = append(out, *dto.UsageLogFromService(&records[i]))
+		out = append(out, dto.UsageLogFromServiceWithVisibility(&records[i], visibility))
 	}
 	response.Paginated(c, out, result.Total, page, pageSize)
 }
@@ -389,7 +397,15 @@ func (h *UsageHandler) GetByID(c *gin.Context) {
 		return
 	}
 
-	response.Success(c, dto.UsageLogFromService(record))
+	visibility := service.UsageDetailVisibility{
+		ShowUnitPrices:     true,
+		ShowRateMultiplier: true,
+		ShowOriginalCost:   true,
+	}
+	if h.settingService != nil {
+		visibility = h.settingService.GetUsageDetailVisibility(c.Request.Context())
+	}
+	response.Success(c, dto.UsageLogFromServiceWithVisibility(record, visibility))
 }
 
 // Stats handles getting usage statistics

backend/internal/server/api_contract_test.go

@@ -973,7 +973,10 @@ func TestAPIContracts(t *testing.T) {
 					"wechat_connect_redirect_url": "",
 					"wechat_connect_frontend_redirect_url": "/auth/wechat/callback",
 					"wechat_connect_scopes": "snsapi_login",
-					"allow_user_view_error_requests": false
+					"allow_user_view_error_requests": false,
+					"usage_detail_show_unit_prices": true,
+					"usage_detail_show_rate_multiplier": true,
+					"usage_detail_show_original_cost": true
 				}
 			}`,
 		},
@@ -1289,7 +1292,10 @@ func TestAPIContracts(t *testing.T) {
 					"auth_source_default_dingtalk_grant_on_signup": false,
 					"auth_source_default_dingtalk_grant_on_first_bind": false,
 					"force_email_on_third_party_signup": false,
-					"allow_user_view_error_requests": false
+					"allow_user_view_error_requests": false,
+					"usage_detail_show_unit_prices": true,
+					"usage_detail_show_rate_multiplier": true,
+					"usage_detail_show_original_cost": true
 				}
 			}`,
 		},

backend/internal/service/domain_constants.go

@@ -549,3 +549,11 @@ const AdminAPIKeyPrefix = "admin-"
 // SettingKeyAllowUserViewErrorRequests controls whether end users can view
 // their own failed requests on the usage page. Default false (opt-in).
 const SettingKeyAllowUserViewErrorRequests = "allow_user_view_error_requests"
+
+// User usage cost-detail visibility. These are opt-out settings so existing
+// installations preserve their current UI and API behavior after upgrading.
+const (
+	SettingKeyUsageDetailShowUnitPrices     = "usage_detail_show_unit_prices"
+	SettingKeyUsageDetailShowRateMultiplier = "usage_detail_show_rate_multiplier"
+	SettingKeyUsageDetailShowOriginalCost   = "usage_detail_show_original_cost"
+)

backend/internal/service/setting_parse.go

@@ -242,6 +242,12 @@ func (s *SettingService) InitializeDefaultSettings(ctx context.Context) error {
 		SettingKeyOpenAIAdvancedSchedulerWeightSessionSticky:         "",
 
 		SettingKeyAllowUserViewErrorRequests: "false",
+
+		SettingKeyUsageDetailShowUnitPrices: "true",
+
+		SettingKeyUsageDetailShowRateMultiplier: "true",
+
+		SettingKeyUsageDetailShowOriginalCost: "true",
 	}
 
 	return s.settingRepo.SetMultiple(ctx, defaults)
@@ -892,6 +898,9 @@ func (s *SettingService) parseSettings(settings map[string]string) *SystemSettin
 	}
 
 	result.AllowUserViewErrorRequests = settings[SettingKeyAllowUserViewErrorRequests] == "true" // default false
+	result.UsageDetailShowUnitPrices = !isFalseSettingValue(settings[SettingKeyUsageDetailShowUnitPrices])
+	result.UsageDetailShowRateMultiplier = !isFalseSettingValue(settings[SettingKeyUsageDetailShowRateMultiplier])
+	result.UsageDetailShowOriginalCost = !isFalseSettingValue(settings[SettingKeyUsageDetailShowOriginalCost])
 
 	return result
 }