From 8f3062d16385ca758d9d13b7b264711bf2ba4154 Mon Sep 17 00:00:00 2001 From: Sydonian <794346190@qq.com> Date: Thu, 9 May 2024 09:19:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4EC?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdks/storage/models.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/storage/models.go b/sdks/storage/models.go index 74128f4..2597cae 100644 --- a/sdks/storage/models.go +++ b/sdks/storage/models.go @@ -71,7 +71,7 @@ func (b *RepRedundancy) Value() (driver.Value, error) { return serder.ObjectToJSONEx[Redundancy](b) } -var DefaultECRedundancy = *NewECRedundancy(3, 5, 1024*1024*5) +var DefaultECRedundancy = *NewECRedundancy(2, 3, 1024*1024*5) type ECRedundancy struct { serder.Metadata `union:"ec"` From 941f3eb6221bf260f74d3227d05271deb1d995bb Mon Sep 17 00:00:00 2001 From: Sydonian <794346190@qq.com> Date: Sat, 11 May 2024 10:22:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consts/errorcode/error_code.go | 1 + pkgs/cmdtrie/command_trie.go | 4 +++- pkgs/mq/client.go | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/consts/errorcode/error_code.go b/consts/errorcode/error_code.go index 4c7bc59..fc9e00c 100644 --- a/consts/errorcode/error_code.go +++ b/consts/errorcode/error_code.go @@ -3,6 +3,7 @@ package errorcode const ( OK = "OK" OperationFailed = "OperationFailed" + DataNotFound = "DataNotFound" BadArgument = "BadArgument" TaskNotFound = "TaskNotFound" ) diff --git a/pkgs/cmdtrie/command_trie.go b/pkgs/cmdtrie/command_trie.go index db6c821..5f86407 100644 --- a/pkgs/cmdtrie/command_trie.go +++ b/pkgs/cmdtrie/command_trie.go @@ -10,6 +10,8 @@ import ( "gitlink.org.cn/cloudream/common/utils/reflect2" ) +var ErrCommandNotFound = fmt.Errorf("command not found") + type ExecuteOption struct { ReplaceEmptyArrayWithNil bool // 如果最后一个参数是空数组,则调用命令的时候传递nil参数 } @@ -178,7 +180,7 @@ func (t *anyCommandTrie) findCommand(cmdWords []string, argWords []string) (*com }) if cmd == nil { - return nil, nil, fmt.Errorf("command not found") + return nil, nil, ErrCommandNotFound } return cmd, argWords, nil } diff --git a/pkgs/mq/client.go b/pkgs/mq/client.go index db68963..8d6f090 100644 --- a/pkgs/mq/client.go +++ b/pkgs/mq/client.go @@ -22,12 +22,12 @@ const ( var ErrWaitResponseTimeout = fmt.Errorf("wait response timeout") type CodeMessageError struct { - code string - message string + Code string + Message string } func (e *CodeMessageError) Error() string { - return fmt.Sprintf("code: %s, message: %s", e.code, e.message) + return fmt.Sprintf("code: %s, message: %s", e.Code, e.Message) } type SendOption struct { @@ -315,8 +315,8 @@ func Request[TSvc any, TReq MessageBody, TResp MessageBody](_ func(svc TSvc, msg errCode, errMsg := resp.GetCodeMessage() if errCode != errorcode.OK { return defRet, &CodeMessageError{ - code: errCode, - message: errMsg, + Code: errCode, + Message: errMsg, } }