From 9b93db80944fbf7a24e8bb8562a6bdb6bf35cdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B3=A2?= Date: Tue, 22 Feb 2022 13:08:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/api/third/tencent_cloud_storage_credential.go | 6 +----- script/build_all_service.sh | 0 2 files changed, 1 insertion(+), 5 deletions(-) mode change 100644 => 100755 script/build_all_service.sh diff --git a/internal/api/third/tencent_cloud_storage_credential.go b/internal/api/third/tencent_cloud_storage_credential.go index a8a16d5cf..26ad0ec0f 100644 --- a/internal/api/third/tencent_cloud_storage_credential.go +++ b/internal/api/third/tencent_cloud_storage_credential.go @@ -6,14 +6,10 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" -<<<<<<< HEAD -======= + "github.com/fatih/structs" //"github.com/fatih/structs" - "github.com/gin-gonic/gin" - sts "github.com/tencentyun/qcloud-cos-sts-sdk/go" ->>>>>>> 17954df (Refactoring code) "net/http" "time" diff --git a/script/build_all_service.sh b/script/build_all_service.sh old mode 100644 new mode 100755