fix file redirect status code

Add thumb quality for third party storage policy.

docker-compose.yml

@@ -1,5 +1,14 @@
 version: "3.8"
 services:
+  redis:
+    container_name: redis
+    image: bitnami/redis:latest
+    restart: unless-stopped
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    volumes:
+      - redis_data:/bitnami/redis/data
+
   cloudreve:
     container_name: cloudreve
     image: cloudreve/cloudreve:latest
@@ -14,6 +23,7 @@ services:
       - ./cloudreve/avatar:/cloudreve/avatar
     depends_on:
       - aria2
+
   aria2:
     container_name: aria2
     image: p3terx/aria2-pro # third party image, please keep notice what you are doing
@@ -25,9 +35,11 @@ services:
       - ./aria2/config:/config
       - temp_data:/data
 volumes:
+  redis_data:
+    driver: local
   temp_data:
     driver: local
     driver_opts:
       type: none
       device: $PWD/data
-      o: bind
+      o: bind

go.mod

@@ -173,3 +173,5 @@ require (
 	sigs.k8s.io/yaml v1.2.0 // indirect
 
 )
+
+replace github.com/gomodule/redigo v2.0.0+incompatible => github.com/gomodule/redigo v1.8.9

go.sum

@@ -362,8 +362,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
-github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
+github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=

pkg/cache/driver.go

@@ -21,6 +21,7 @@ func Init() {
 			10,
 			conf.RedisConfig.Network,
 			conf.RedisConfig.Server,
+			conf.RedisConfig.User,
 			conf.RedisConfig.Password,
 			conf.RedisConfig.DB,
 		)

pkg/cache/redis.go

@@ -44,7 +44,7 @@ func deserializer(value []byte) (interface{}, error) {
 }
 
 // NewRedisStore 创建新的redis存储
-func NewRedisStore(size int, network, address, password, database string) *RedisStore {
+func NewRedisStore(size int, network, address, user, password, database string) *RedisStore {
 	return &RedisStore{
 		pool: &redis.Pool{
 			MaxIdle:     size,
@@ -63,6 +63,7 @@ func NewRedisStore(size int, network, address, password, database string) *Redis
 					network,
 					address,
 					redis.DialDatabase(db),
+					redis.DialUsername(user),
 					redis.DialPassword(password),
 				)
 				if err != nil {

pkg/cache/redis_test.go

@@ -13,7 +13,7 @@ import (
 func TestNewRedisStore(t *testing.T) {
 	asserts := assert.New(t)
 
-	store := NewRedisStore(10, "tcp", "", "", "0")
+	store := NewRedisStore(10, "tcp", "", "", "", "0")
 	asserts.NotNil(store)
 
 	asserts.Panics(func() {

pkg/conf/conf.go

@@ -53,6 +53,7 @@ type slave struct {
 type redis struct {
 	Network  string
 	Server   string
+	User	 string
 	Password string
 	DB       string
 }

pkg/filesystem/driver/cos/handler.go

@@ -234,9 +234,12 @@ func (handler Driver) Thumb(ctx context.Context, file *model.File) (*response.Co
 		ok        = false
 	)
 	if thumbSize, ok = ctx.Value(fsctx.ThumbSizeCtx).([2]uint); !ok {
-		return nil, errors.New("无法获取缩略图尺寸设置")
+		return nil, errors.New("failed to get thumbnail size")
 	}
-	thumbParam := fmt.Sprintf("imageMogr2/thumbnail/%dx%d", thumbSize[0], thumbSize[1])
+
+	thumbEncodeQuality := model.GetIntSetting("thumb_encode_quality", 85)
+
+	thumbParam := fmt.Sprintf("imageMogr2/thumbnail/%dx%d/quality/%d", thumbSize[0], thumbSize[1], thumbEncodeQuality)
 
 	source, err := handler.signSourceURL(
 		ctx,

pkg/filesystem/driver/oss/handler.go

@@ -312,7 +312,9 @@ func (handler *Driver) Thumb(ctx context.Context, file *model.File) (*response.C
 		return nil, errors.New("failed to get thumbnail size")
 	}
 
-	thumbParam := fmt.Sprintf("image/resize,m_lfit,h_%d,w_%d", thumbSize[1], thumbSize[0])
+	thumbEncodeQuality := model.GetIntSetting("thumb_encode_quality", 85)
+
+	thumbParam := fmt.Sprintf("image/resize,m_lfit,h_%d,w_%d/quality,q_%d", thumbSize[1], thumbSize[0], thumbEncodeQuality)
 	ctx = context.WithValue(ctx, fsctx.ThumbSizeCtx, thumbParam)
 	thumbOption := []oss.Option{oss.Process(thumbParam)}
 	thumbURL, err := handler.signSourceURL(

pkg/filesystem/driver/qiniu/handler.go

@@ -242,10 +242,12 @@ func (handler *Driver) Thumb(ctx context.Context, file *model.File) (*response.C
 		ok        = false
 	)
 	if thumbSize, ok = ctx.Value(fsctx.ThumbSizeCtx).([2]uint); !ok {
-		return nil, errors.New("无法获取缩略图尺寸设置")
+		return nil, errors.New("failed to get thumbnail size")
 	}
 
-	thumb := fmt.Sprintf("%s?imageView2/1/w/%d/h/%d", file.SourceName, thumbSize[0], thumbSize[1])
+	thumbEncodeQuality := model.GetIntSetting("thumb_encode_quality", 85)
+
+	thumb := fmt.Sprintf("%s?imageView2/1/w/%d/h/%d/q/%d", file.SourceName, thumbSize[0], thumbSize[1], thumbEncodeQuality)
 	return &response.ContentResponse{
 		Redirect: true,
 		URL: handler.signSourceURL(

pkg/filesystem/driver/upyun/handler.go

@@ -235,7 +235,9 @@ func (handler Driver) Thumb(ctx context.Context, file *model.File) (*response.Co
 		return nil, errors.New("failed to get thumbnail size")
 	}
 
-	thumbParam := fmt.Sprintf("!/fwfh/%dx%d", thumbSize[0], thumbSize[1])
+	thumbEncodeQuality := model.GetIntSetting("thumb_encode_quality", 85)
+
+	thumbParam := fmt.Sprintf("!/fwfh/%dx%d/quality/%d", thumbSize[0], thumbSize[1], thumbEncodeQuality)
 	thumbURL, err := handler.Source(ctx, file.SourceName+thumbParam, int64(model.GetIntSetting("preview_timeout", 60)), false, 0)
 	if err != nil {
 		return nil, err

pkg/filesystem/image.go

@@ -134,7 +134,7 @@ func (fs *FileSystem) generateThumbnail(ctx context.Context, file *model.File) e
 
 	// Provide file source path for local policy files
 	src := ""
-	if file.GetPolicy().Type == "local" {
+	if conf.SystemConfig.Mode == "slave" || file.GetPolicy().Type == "local" {
 		src = file.SourceName
 	}
 

pkg/webdav/webdav.go

@@ -279,7 +279,7 @@ func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request, fs *
 		return 0, nil
 	}
 
-	http.Redirect(w, r, rs.URL, 301)
+	http.Redirect(w, r, rs.URL, 302)
 
 	return 0, nil
 }

routers/router.go

@@ -225,7 +225,7 @@ func InitMasterRouter() *gin.Engine {
 					middleware.StaticResourceCache(),
 					controllers.AnonymousGetContent,
 				)
-				// 文件外链(301跳转)
+				// 文件外链(302跳转)
 				file.GET("source/:id/:name", controllers.AnonymousPermLinkDeprecated)
 				// 下载文件
 				file.GET("download/:id",