TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2025-11-03 12:20:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化错误提示相关代码

Browse Source
This commit is contained in:
GoEdgeLab
2023-08-11 15:26:59 +08:00
parent d2e80ef475
commit 8356622c84
7 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/nodeutils/aes_utils.go
View File

@@ -6,6 +6,7 @@ import (
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"github.com/iwind/TeaGo/maps"
"time"
)
@@ -26,7 +27,7 @@ func EncryptMap(nodeUniqueId string, nodeSecret string, data maps.Map, timeout i
"data": data,
})
if err != nil {
return "", errors.New("marshal data to json failed: " + err.Error())
return "", fmt.Errorf("marshal data to json failed: %w", err)
}
var method = &AES256CFBMethod{}
@@ -52,7 +53,7 @@ func DecryptMap(nodeUniqueId string, nodeSecret string, encodedString string) (m
encodedData, err := base64.StdEncoding.DecodeString(encodedString)
if err != nil {
return nil, errors.New("base64 decode failed: " + err.Error())
return nil, fmt.Errorf("base64 decode failed: %w", err)
}
dataJSON, err := method.Decrypt(encodedData)
@@ -63,7 +64,7 @@ func DecryptMap(nodeUniqueId string, nodeSecret string, encodedString string) (m
var result = maps.Map{}
err = json.Unmarshal(dataJSON, &result)
if err != nil {
return nil, errors.New("unmarshal data failed: " + err.Error())
return nil, fmt.Errorf("unmarshal data failed: %w", err)
}
var expiresAt = result.GetInt64("expiresAt")
@@ -107,7 +108,7 @@ func DecryptData(nodeUniqueId string, nodeSecret string, encodedString string) (
encodedData, err := base64.StdEncoding.DecodeString(encodedString)
if err != nil {
return nil, errors.New("base64 decode failed: " + err.Error())
return nil, fmt.Errorf("base64 decode failed: %w", err)
}
return method.Decrypt(encodedData)