From 6f76dd871e23b9dd76d80ca0a6ed2307627b4c1e Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Wed, 13 Dec 2023 15:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/controller/dci.go | 2 --
 internal/logic/file.go     | 9 +++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/internal/controller/dci.go b/internal/controller/dci.go
index c1f032a..8cbe228 100644
--- a/internal/controller/dci.go
+++ b/internal/controller/dci.go
@@ -24,8 +24,6 @@ func (d *DciProvider) GetUploadUrl(_ context.Context, req *dci.GetUploadUrlReque
 	}
 
 	res, err = d.file.Upload(req)
-	res.ResultMsg = "WORK_CATEGORY_INVALID"
-	res.ResultCode = "BAD_REQUEST"
 	return
 }
 
diff --git a/internal/logic/file.go b/internal/logic/file.go
index 4dfe234..9af50ef 100644
--- a/internal/logic/file.go
+++ b/internal/logic/file.go
@@ -9,7 +9,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"github.com/alibabacloud-go/tea/tea"
 	bccrClient "github.com/antchain-openapi-sdk-go/bccr/client"
 	"github.com/jinzhu/copier"
 	"strings"
@@ -93,16 +92,18 @@ func (f *File) Upload(req *dci.GetUploadUrlRequest) (res *dci.GetUploadUrlRespon
 
 	fmt.Println("====== =========== ===================     1   ===============")
 	if res.ResultCode != "OK" {
-		return res, errCommon.ReturnError(errors.New(res.ResultMsg), res.ResultMsg, "获取授权访问OSS链接 错误:")
+		errCommon.NoReturnError(errors.New(res.ResultMsg), "获取授权访问OSS链接 错误:")
+		return res, nil
 	}
 
 	fmt.Println("====== =========== ===================     2   ===============")
 	if res.Url == "" || res.FileId == "" {
-		return res, errCommon.ReturnError(errors.New(res.ResultMsg), res.ResultMsg, "获取授权访问OSS链接 错误:")
+		errCommon.NoReturnError(errors.New(res.ResultMsg), "获取授权访问OSS链接 错误:")
+		return res, nil
 	}
 
 	fmt.Println("====== =========== ===================     3   ===============")
-	code, result := utils.PutFromFileUrlWithStream(tea.ToString(res.Url), fileName, req.FileName)
+	code, result := utils.PutFromFileUrlWithStream(res.Url, fileName, req.FileName)
 	if code != 200 {
 		return res, errCommon.ReturnError(errors.New(result), result, "上传文件 错误:")
 	}