feat(assets): 文件夹主题 - 新增多主题皮肤并同步主线
This commit is contained in:
@@ -590,11 +590,19 @@ func RegisterAdminRoutes(r *gin.RouterGroup, svc *service.Service) {
|
||||
failService(c, err)
|
||||
return
|
||||
}
|
||||
stream, err := svc.OpenAdminAPICallLogMediaRange(user, c.Param("id"), c.GetHeader("Range"))
|
||||
delivery, err := svc.PrepareAdminAPICallLogMediaDelivery(user, c.Param("id"), c.GetHeader("Range"))
|
||||
if err != nil {
|
||||
failService(c, err)
|
||||
return
|
||||
}
|
||||
if delivery.RedirectURL != "" {
|
||||
c.Header("Cache-Control", "private, no-store")
|
||||
c.Header("Referrer-Policy", "no-referrer")
|
||||
c.Header("X-Content-Type-Options", "nosniff")
|
||||
c.Redirect(http.StatusTemporaryRedirect, delivery.RedirectURL)
|
||||
return
|
||||
}
|
||||
stream := delivery.Stream
|
||||
defer stream.Body.Close()
|
||||
resource := stream.Resource
|
||||
mimeType := resource.MimeType
|
||||
@@ -707,8 +715,10 @@ func proxySystemRequest(c *gin.Context, svc *service.Service, user *model.User,
|
||||
modelName := proxyRequestModelForPath(path, c.GetHeader("Content-Type"), body)
|
||||
protocol := model.ChannelInterfaceType("")
|
||||
capability := "text"
|
||||
var channelModel *model.ChannelModel
|
||||
if !(c.Request.Method == http.MethodGet && path == "/models") {
|
||||
channelModel, modelErr := svc.SystemChannelModel(channel.ID, modelName)
|
||||
var modelErr error
|
||||
channelModel, modelErr = svc.SystemChannelModel(channel.ID, modelName)
|
||||
if modelErr != nil || channelModel.Protocol == "" {
|
||||
fail(c, http.StatusForbidden, errors.New("当前系统渠道未授权该模型或模型协议尚未配置"))
|
||||
return
|
||||
@@ -720,6 +730,13 @@ func proxySystemRequest(c *gin.Context, svc *service.Service, user *model.User,
|
||||
fail(c, http.StatusForbidden, err)
|
||||
return
|
||||
}
|
||||
if channelModel != nil && channelModel.BillingMode == "token" && protocol == model.ChannelInterfaceChatCompletion {
|
||||
body, err = service.EnsureChatCompletionStreamUsageRequest(body)
|
||||
if err != nil {
|
||||
fail(c, http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
billingOrderID := ""
|
||||
query := c.Request.URL.Query()
|
||||
for _, key := range []string{"key", "api_key", "access_token", "token"} {
|
||||
|
||||
@@ -78,11 +78,21 @@ func RegisterCanvasShareRoutes(r *gin.RouterGroup, svc *service.Service) {
|
||||
if !enforceRateLimit(c, "public-canvas-resource:"+c.ClientIP(), 300, time.Minute) {
|
||||
return
|
||||
}
|
||||
stream, err := svc.OpenSharedCanvasResourceRange(c.Param("token"), c.Param("resourceId"), c.GetHeader("Range"))
|
||||
delivery, err := svc.PrepareSharedCanvasResourceDelivery(c.Param("token"), c.Param("resourceId"), c.GetHeader("Range"))
|
||||
if err != nil {
|
||||
fail(c, http.StatusNotFound, errors.New("分享资源不存在"))
|
||||
return
|
||||
}
|
||||
if delivery.RedirectURL != "" {
|
||||
c.Header("Cache-Control", "no-store")
|
||||
c.Header("Content-Security-Policy", "sandbox")
|
||||
c.Header("Referrer-Policy", "no-referrer")
|
||||
c.Header("X-Content-Type-Options", "nosniff")
|
||||
c.Header("X-Robots-Tag", "noindex, nofollow")
|
||||
c.Redirect(http.StatusTemporaryRedirect, delivery.RedirectURL)
|
||||
return
|
||||
}
|
||||
stream := delivery.Stream
|
||||
defer stream.Body.Close()
|
||||
resource := stream.Resource
|
||||
mimeType := resource.MimeType
|
||||
|
||||
@@ -214,24 +214,23 @@ func RegisterUserDataRoutes(r *gin.RouterGroup, svc *service.Service) {
|
||||
failService(c, err)
|
||||
return
|
||||
}
|
||||
resource, err := svc.Resource(user.ID, c.Param("id"))
|
||||
delivery, err := svc.PrepareResourceDelivery(user.ID, c.Param("id"), service.ResourceDeliveryOptions{
|
||||
ForceDirect: c.Query("direct") == "1",
|
||||
ForceProxy: c.Query("proxy") == "1",
|
||||
})
|
||||
if err != nil {
|
||||
fail(c, http.StatusNotFound, err)
|
||||
failService(c, err)
|
||||
return
|
||||
}
|
||||
if c.Query("direct") == "1" && resource.Provider != "local" {
|
||||
directURL, err := svc.DirectResourceURL(user.ID, resource.ID)
|
||||
if err != nil {
|
||||
failService(c, err)
|
||||
return
|
||||
}
|
||||
// 签名 URL 不进入应用、代理或浏览器缓存,也不作为后续请求的 Referer 泄露。
|
||||
if delivery.RedirectURL != "" {
|
||||
// CDN 或对象存储直连地址不进入应用缓存,也不作为后续请求的 Referer 泄露。
|
||||
c.Header("Cache-Control", "private, no-store")
|
||||
c.Header("Referrer-Policy", "no-referrer")
|
||||
c.Header("X-Content-Type-Options", "nosniff")
|
||||
c.Redirect(http.StatusTemporaryRedirect, directURL)
|
||||
c.Redirect(http.StatusTemporaryRedirect, delivery.RedirectURL)
|
||||
return
|
||||
}
|
||||
resource := delivery.Resource
|
||||
etag := resourceResponseETag(resource)
|
||||
// 私有资源允许浏览器保存响应,但每次复用前必须重新鉴权;304 会在读取 OSS 前返回。
|
||||
c.Header("Cache-Control", "private, no-cache")
|
||||
|
||||
Reference in New Issue
Block a user