diff --git a/utils/basics.go b/utils/basics.go index d737ba1..ffe7a73 100644 --- a/utils/basics.go +++ b/utils/basics.go @@ -180,6 +180,12 @@ func (this *AsciiStruct) ToString(params map[string]any) (result string) { } } + // 去除最后一个 & + text := item.String() + if len(text) > 0 { + text = text[:len(text)-1] + } + // 返回排序后的字符串 - return item.String() + return text } \ No newline at end of file diff --git a/utils/cipher.go b/utils/cipher.go index 46e28eb..e7c69e8 100644 --- a/utils/cipher.go +++ b/utils/cipher.go @@ -328,8 +328,8 @@ func (this *RSAStruct) Decrypt(privateKey, text string) (result *RSAResponse) { return result } -// PemPublicKey - 输出完整的 PEM 格式公钥证书 -func (this *RSAStruct) PemPublicKey(key string) (string, error) { +// PublicPem - 输出完整的 PEM 格式公钥证书 +func (this *RSAStruct) PublicPem(key string) (cert string) { // 创建 PEM 格式块 block := &pem.Block{ @@ -338,16 +338,14 @@ func (this *RSAStruct) PemPublicKey(key string) (string, error) { } // 生成完整的 PEM 证书字符串 - var pemBuf bytes.Buffer - if err := pem.Encode(&pemBuf, block); err != nil { - return "", err - } + var PEM bytes.Buffer + if err := pem.Encode(&PEM, block); err != nil { return "" } - return pemBuf.String(), nil + return PEM.String() } -// PemPrivateKey - 输出完整的 PEM 格式私钥证书 -func (this *RSAStruct) PemPrivateKey(key string) (string, error) { +// PrivatePem - 输出完整的 PEM 格式私钥证书 +func (this *RSAStruct) PrivatePem(key string) (cert string) { // 创建 PEM 格式块 block := &pem.Block{ @@ -356,10 +354,8 @@ func (this *RSAStruct) PemPrivateKey(key string) (string, error) { } // 生成完整的 PEM 证书字符串 - var pemBuf bytes.Buffer - if err := pem.Encode(&pemBuf, block); err != nil { - return "", err - } + var PEM bytes.Buffer + if err := pem.Encode(&PEM, block); err != nil { return "" } - return pemBuf.String(), nil + return PEM.String() } \ No newline at end of file diff --git a/utils/struct.go b/utils/struct.go index 538d34c..ec8bd14 100644 --- a/utils/struct.go +++ b/utils/struct.go @@ -177,3 +177,8 @@ func (this *StructStruct) Slice(obj any) (slice []any) { } return s } + +// ToStringMap - 将结构体转换为map[string]any +func (this *StructStruct) ToStringMap(obj any) (result map[string]any) { + return cast.ToStringMap(Json.Encode(obj)) +} \ No newline at end of file