Browse Source

补充import

xuzhiheng 4 years ago
parent
commit
e14df30b68

+ 3 - 4
rpc/internal/logic/getfilemetalogic.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"strings"
 
-	"app.yhyue.com/moapp/jyfs/rpc/internal/redis"
-
 	"fmt"
 
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
@@ -40,10 +38,11 @@ func (l *GetFileMetaLogic) GetFileMeta(in *filesystem.LoadFileReq) (*filesystem.
 	if err != nil {
 		return &filesystem.LoadFileMetaResp{}, err
 	}
+	metaMap := map[string]string{}
 	fmt.Println("Object Meta:", props)
 	for k, v := range props {
 		vs := strings.Join(v, ",")
-		props[k] = vs
+		metaMap[k] = vs
 	}
-	return &filesystem.LoadFileMetaResp{Meta: props}, nil
+	return &filesystem.LoadFileMetaResp{Meta: metaMap}, nil
 }

+ 4 - 3
rpc/internal/logic/savefilelogic.go

@@ -5,11 +5,12 @@ import (
 	"errors"
 	"strings"
 
+	"bytes"
+
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
+	"app.yhyue.com/moapp/jyfs/rpc/internal/redis"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 
-	"bytes"
-
 	// "app.yhyue.com/moapp/jyfs/rpc/internal/redis"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/tal-tech/go-zero/core/logx"
@@ -37,7 +38,7 @@ func (l *SaveFileLogic) SaveFile(in *filesystem.SaveFileReq) (*filesystem.FileOp
 		return &filesystem.FileOpResp{State: false}, err
 	}
 	meta := redis.GetStr("jyfs", "jyfs_"+in.Domain)
-	if meta != nil {
+	if meta != "" {
 		for k, _ := range in.Meta {
 			if !strings.Contains(meta, k) {
 				return &filesystem.FileOpResp{}, errors.New("缺少元信息")

+ 4 - 1
rpc/internal/logic/updatefilemetalogic.go

@@ -3,9 +3,12 @@ package logic
 import (
 	"context"
 
+	"errors"
 	"fmt"
+	"strings"
 
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
+	"app.yhyue.com/moapp/jyfs/rpc/internal/redis"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/tal-tech/go-zero/core/logx"
@@ -34,7 +37,7 @@ func (l *UpdateFileMetaLogic) UpdateFileMeta(in *filesystem.UpdateFileMetaReq) (
 		return &filesystem.FileOpResp{}, err
 	}
 	meta := redis.GetStr("jyfs", "jyfs_"+in.Domain)
-	if meta != nil {
+	if meta != "" {
 		for k, _ := range in.Meta {
 			if !strings.Contains(meta, k) {
 				return &filesystem.FileOpResp{}, errors.New("缺少元信息")