From 52d1d9dd4b94ff5eb94e99f99a483365d20e30b2 Mon Sep 17 00:00:00 2001 From: ywlmac Date: Wed, 13 May 2026 11:28:34 +0800 Subject: [PATCH] Make SDK importable from module root --- .gitignore | 1 + README.md | 2 +- SDK_USAGE.md | 3 +- .../certificate.go => certificate.go | 0 ...certificate_flow.go => certificate_flow.go | 72 ++++++------- pkg/zxchainsdk/client.go => client.go | 0 pkg/zxchainsdk/error.go => error.go | 0 test.go => examples/manual/main.go | 2 +- go.mod | 25 ++--- go.sum | 1 - pkg/zxchainsdk/model.go => model.go | 0 pkg/zxchainsdk/sdk_client.go => sdk_client.go | 4 +- .../official/gosdk_demo/zxsdk/ev_sdk.go | 10 +- third_party/official/gosdk_demo/zxsdk/go.mod | 24 ----- third_party/official/gosdk_demo/zxsdk/go.sum | 101 ------------------ .../official/gosdk_demo/zxsdk/kv_sdk.go | 10 +- .../gosdk_demo/zxsdk/tools/http_tool.go | 4 +- .../gosdk_demo/zxsdk/wallet_sdk/go.mod | 11 -- .../gosdk_demo/zxsdk/wallet_sdk/go.sum | 94 ---------------- .../gosdk_demo/zxsdk/wallet_sdk/hdw.go | 4 +- .../gosdk_demo/zxsdk/wallet_sdk/hdw_mobile.go | 2 +- .../zxsdk/wallet_sdk/mnemonics/mnemonics.go | 2 +- .../gosdk_demo/zxsdk/zxchain_client.go | 6 +- 23 files changed, 72 insertions(+), 306 deletions(-) rename pkg/zxchainsdk/certificate.go => certificate.go (100%) rename pkg/zxchainsdk/certificate_flow.go => certificate_flow.go (83%) rename pkg/zxchainsdk/client.go => client.go (100%) rename pkg/zxchainsdk/error.go => error.go (100%) rename test.go => examples/manual/main.go (99%) rename pkg/zxchainsdk/model.go => model.go (100%) rename pkg/zxchainsdk/sdk_client.go => sdk_client.go (96%) delete mode 100644 third_party/official/gosdk_demo/zxsdk/go.mod delete mode 100644 third_party/official/gosdk_demo/zxsdk/go.sum delete mode 100644 third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.mod delete mode 100644 third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.sum diff --git a/.gitignore b/.gitignore index 5492163..6239154 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .env.* .gocache/ +.gomodcache/ out/ .idea/ diff --git a/README.md b/README.md index c880f35..dafd187 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ## 保留内容 ```text -pkg/zxchainsdk/ # SDK 源码 +./ # SDK 源码 third_party/official/gosdk_demo/zxsdk/ # 官方 Go SDK 本地依赖 go.mod go.sum diff --git a/SDK_USAGE.md b/SDK_USAGE.md index 6397f03..d64216f 100644 --- a/SDK_USAGE.md +++ b/SDK_USAGE.md @@ -5,6 +5,8 @@ SDK 不主动读取 `.env`，需要自己管理配置，并把凭据传给 SDK。 ```go +import "git.yuanzoo.cn/zhangzhengqiang/popi-zxl" + client, err := zxchainsdk.NewSDKClient( os.Getenv("ZXCHAIN_SECRET_ID"), os.Getenv("ZXCHAIN_SECRET_KEY"), @@ -139,4 +141,3 @@ fmt.Println("extendInfo:", result.ExtendInfo) - `BlockHeight`：上链区块高度。 - `TxTime`：官方返回的上链时间。 - `ExtendInfo`：存证时写入的业务场景信息。 - diff --git a/pkg/zxchainsdk/certificate.go b/certificate.go similarity index 100% rename from pkg/zxchainsdk/certificate.go rename to certificate.go diff --git a/pkg/zxchainsdk/certificate_flow.go b/certificate_flow.go similarity index 83% rename from pkg/zxchainsdk/certificate_flow.go rename to certificate_flow.go index ed8b8da..6c6c57c 100644 --- a/pkg/zxchainsdk/certificate_flow.go +++ b/certificate_flow.go @@ -12,8 +12,8 @@ import ( "strings" "time" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk" "github.com/tencentyun/cos-go-sdk-v5" - "wallet_sdk" ) var ( @@ -55,12 +55,12 @@ func downloadAndHashFromURL(ctx context.Context, url string) (string, error) { // SimpleHashAttestationCertificateRequest 是简化的一站式证书请求，只需要最少的业务字段。 type SimpleHashAttestationCertificateRequest struct { - UserName string `json:"user_name"` // UserName 表示申请用户名称 - UserID string `json:"user_id"` // UserID 表示申请用户 ID - WorkName string `json:"work_name"` // WorkName 表示作品名称 - TaskID string `json:"task_id"` // TaskID 表示生成任务 ID - CompletedAt string `json:"completed_at"` // CompletedAt 表示作品完成时间 - WorkPreviewURL string `json:"work_preview_url"` // WorkPreviewURL 表示作品预览图 URL + UserName string `json:"user_name"` // UserName 表示申请用户名称 + UserID string `json:"user_id"` // UserID 表示申请用户 ID + WorkName string `json:"work_name"` // WorkName 表示作品名称 + TaskID string `json:"task_id"` // TaskID 表示生成任务 ID + CompletedAt string `json:"completed_at"` // CompletedAt 表示作品完成时间 + WorkPreviewURL string `json:"work_preview_url"` // WorkPreviewURL 表示作品预览图 URL EvidenceHash string `json:"evidence_hash,omitempty"` // EvidenceHash 表示作品文件哈希，可选。如果不传，SDK 将从 WorkPreviewURL 下载并计算哈希 // 可选：如果不传，将使用内置默认值 @@ -77,15 +77,15 @@ type HashAttestationCertificateRequest struct { TaskID string `json:"task_id"` // TaskID 表示生成任务 ID CompletedAt string `json:"completed_at"` // CompletedAt 表示作品完成时间 - WorkPreviewURL string `json:"work_preview_url"` // WorkPreviewURL 表示作品预览图 URL - WorkPreviewBytes []byte `json:"-"` // WorkPreviewBytes 表示作品预览图二进制数据 - EvidenceHash string `json:"evidence_hash"` // EvidenceHash 表示作品文件哈希 + WorkPreviewURL string `json:"work_preview_url"` // WorkPreviewURL 表示作品预览图 URL + WorkPreviewBytes []byte `json:"-"` // WorkPreviewBytes 表示作品预览图二进制数据 + EvidenceHash string `json:"evidence_hash"` // EvidenceHash 表示作品文件哈希 - BackgroundURL string `json:"background_url"` // BackgroundURL 表示证书背景图 URL - LogoURL string `json:"logo_url"` // LogoURL 表示证书 logo URL - FontPath string `json:"font_path"` // FontPath 表示用于绘制证书的字体路径 - HTTPClient *http.Client `json:"-"` // HTTPClient 表示证书生成时使用的 HTTP 客户端 - CertBucketBase string `json:"cert_bucket_base"`// CertBucketBase 表示证书对象 URL 的基础 Bucket URL + BackgroundURL string `json:"background_url"` // BackgroundURL 表示证书背景图 URL + LogoURL string `json:"logo_url"` // LogoURL 表示证书 logo URL + FontPath string `json:"font_path"` // FontPath 表示用于绘制证书的字体路径 + HTTPClient *http.Client `json:"-"` // HTTPClient 表示证书生成时使用的 HTTP 客户端 + CertBucketBase string `json:"cert_bucket_base"` // CertBucketBase 表示证书对象 URL 的基础 Bucket URL CertificateStorage *COSCertificateStorage `json:"certificate_storage"` // CertificateStorage 表示 COS 上传配置 } @@ -107,7 +107,7 @@ type HashAttestationCertificateResult struct { UserID string `json:"user_id"` // UserID 表示申请用户 ID WorkName string `json:"work_name"` // WorkName 表示作品名称 TaskID string `json:"task_id"` // TaskID 表示生成任务 ID - CompletedAt string `json:"completed_at"` // CompletedAt 表示作品完成时间 + CompletedAt string `json:"completed_at"` // CompletedAt 表示作品完成时间 WorkPreviewURL string `json:"work_preview_url,omitempty"` // WorkPreviewURL 表示作品预览图 URL EvidenceHash string `json:"evidence_hash,omitempty"` // EvidenceHash 表示作品哈希 @@ -117,13 +117,13 @@ type HashAttestationCertificateResult struct { TxTime string `json:"tx_time,omitempty"` // TxTime 表示上链时间 SM3Hash string `json:"sm3_hash,omitempty"` // SM3Hash 表示本次上链内容的 SM3 哈希 - PopiCertificateCertNo string `json:"popi_certificate_cert_no,omitempty"` // PopiCertificateCertNo 表示 popiart 证书编号 - PopiCertificateVerifyURL string `json:"popi_certificate_verify_url,omitempty"` // PopiCertificateVerifyURL 表示 popiart 证书二维码映射地址 + PopiCertificateCertNo string `json:"popi_certificate_cert_no,omitempty"` // PopiCertificateCertNo 表示 popiart 证书编号 + PopiCertificateVerifyURL string `json:"popi_certificate_verify_url,omitempty"` // PopiCertificateVerifyURL 表示 popiart 证书二维码映射地址 PopiCertificateCertificateImageURL string `json:"popi_certificate_certificate_image_url,omitempty"` // PopiCertificateCertificateImageURL 表示 popiart 证书地址 ZXChainCertURL string `json:"zxchain_cert_url"` // ZXChainCertURL 表示至信链官方证书 URL - Attestation *AttestationResult `json:"attestation,omitempty"` // Attestation 表示链上存证返回结果 + Attestation *AttestationResult `json:"attestation,omitempty"` // Attestation 表示链上存证返回结果 PopiCertificate PopiCertificateFields `json:"popi_certificate,omitempty"` // PopiCertificate 表示 Popi 证书字段 } @@ -136,11 +136,11 @@ type PopiCertificateFields struct { } type evidencePackage struct { - UserName string `json:"user_name"` // UserName 表示申请用户名称 - UserID string `json:"user_id"` // UserID 表示申请用户 ID - WorkName string `json:"work_name"` // WorkName 表示作品名称 - TaskID string `json:"task_id"` // TaskID 表示生成任务 ID - CompletedAt string `json:"completed_at"` // CompletedAt 表示作品完成时间 + UserName string `json:"user_name"` // UserName 表示申请用户名称 + UserID string `json:"user_id"` // UserID 表示申请用户 ID + WorkName string `json:"work_name"` // WorkName 表示作品名称 + TaskID string `json:"task_id"` // TaskID 表示生成任务 ID + CompletedAt string `json:"completed_at"` // CompletedAt 表示作品完成时间 WorkPreviewURL string `json:"work_preview_url"` // WorkPreviewURL 表示作品预览图 URL WorkFileHash string `json:"work_file_hash"` // WorkFileHash 表示作品文件哈希 } @@ -194,16 +194,16 @@ func (c *SDKClient) CreateSimpleHashAttestationCertificate(ctx context.Context, // 转换为完整的请求结构体，使用默认值 fullReq := HashAttestationCertificateRequest{ HashAttestationRequest: HashAttestationRequest{ - BizID: req.TaskID, // 使用 TaskID 作为 BizID - Scene: "simple-popi-work-hash", + BizID: req.TaskID, // 使用 TaskID 作为 BizID + Scene: "simple-popi-work-hash", }, - UserName: req.UserName, - UserID: req.UserID, - WorkName: req.WorkName, - TaskID: req.TaskID, - CompletedAt: req.CompletedAt, - WorkPreviewURL: req.WorkPreviewURL, - EvidenceHash: evidenceHash, + UserName: req.UserName, + UserID: req.UserID, + WorkName: req.WorkName, + TaskID: req.TaskID, + CompletedAt: req.CompletedAt, + WorkPreviewURL: req.WorkPreviewURL, + EvidenceHash: evidenceHash, CertificateStorage: req.CertificateStorage, } @@ -311,10 +311,10 @@ func (c *SDKClient) CreateHashAttestationCertificate(ctx context.Context, req Ha TxTime: attestation.TxTime, SM3Hash: attestation.SM3Hash, - PopiCertificateCertNo: cert.CertNo, - PopiCertificateVerifyURL: cert.VerifyURL, + PopiCertificateCertNo: cert.CertNo, + PopiCertificateVerifyURL: cert.VerifyURL, PopiCertificateCertificateImageURL: cert.CertificateImageURL, - ZXChainCertURL: zxCert.CertURL, + ZXChainCertURL: zxCert.CertURL, Attestation: attestation, PopiCertificate: PopiCertificateFields{ diff --git a/pkg/zxchainsdk/client.go b/client.go similarity index 100% rename from pkg/zxchainsdk/client.go rename to client.go diff --git a/pkg/zxchainsdk/error.go b/error.go similarity index 100% rename from pkg/zxchainsdk/error.go rename to error.go diff --git a/test.go b/examples/manual/main.go similarity index 99% rename from test.go rename to examples/manual/main.go index 4fb2ad7..03b4c1f 100644 --- a/test.go +++ b/examples/manual/main.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/pkg/zxchainsdk" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl" ) // loadDotEnv 加载当前目录下的 .env，方便本地测试。 diff --git a/go.mod b/go.mod index 640205a..13d8794 100644 --- a/go.mod +++ b/go.mod @@ -2,26 +2,21 @@ module git.yuanzoo.cn/zhangzhengqiang/popi-zxl go 1.26 -require zxsdk v1.0.0 +require ( + github.com/fogleman/gg v1.3.0 + github.com/google/uuid v1.1.1 + github.com/mitchellh/mapstructure v1.4.3 + github.com/sirupsen/logrus v1.9.3 + github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e + github.com/tencentyun/cos-go-sdk-v5 v0.7.7 + github.com/tjfoc/gmsm v1.4.0 + golang.org/x/image v0.40.0 +) require ( - github.com/fogleman/gg v1.3.0 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/google/go-querystring v1.0.0 // indirect - github.com/google/uuid v1.1.1 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/mozillazg/go-httpheader v0.2.1 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect - github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - github.com/tencentyun/cos-go-sdk-v5 v0.7.7 // indirect - github.com/tjfoc/gmsm v1.4.0 // indirect golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee // indirect - golang.org/x/image v0.40.0 // indirect golang.org/x/sys v0.22.0 // indirect - wallet_sdk v1.0.0 // indirect -) - -replace ( - wallet_sdk => ./third_party/official/gosdk_demo/zxsdk/wallet_sdk - zxsdk => ./third_party/official/gosdk_demo/zxsdk ) diff --git a/go.sum b/go.sum index ca5e317..c49ed05 100644 --- a/go.sum +++ b/go.sum @@ -46,7 +46,6 @@ github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tencentyun/cos-go-sdk-v5 v0.7.7 h1:7YI5nNwLEhseUoWzzz1CDAwQMeJyJfD3Tj0XnQRzqO8= diff --git a/pkg/zxchainsdk/model.go b/model.go similarity index 100% rename from pkg/zxchainsdk/model.go rename to model.go diff --git a/pkg/zxchainsdk/sdk_client.go b/sdk_client.go similarity index 96% rename from pkg/zxchainsdk/sdk_client.go rename to sdk_client.go index f9488ef..1436133 100644 --- a/pkg/zxchainsdk/sdk_client.go +++ b/sdk_client.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "wallet_sdk" - "zxsdk" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk" ) // SDKClient 基于官方至信链 Go SDK 实现 Client。 diff --git a/third_party/official/gosdk_demo/zxsdk/ev_sdk.go b/third_party/official/gosdk_demo/zxsdk/ev_sdk.go index bc9d162..63ab836 100644 --- a/third_party/official/gosdk_demo/zxsdk/ev_sdk.go +++ b/third_party/official/gosdk_demo/zxsdk/ev_sdk.go @@ -1,11 +1,11 @@ package zxsdk import ( - "wallet_sdk" - "zxsdk/constant" - "zxsdk/log" - model2 "zxsdk/model" - "zxsdk/tools" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/constant" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/log" + model2 "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/model" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/tools" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk" ) func (zx ZxChainClient) EvSave(data []byte, extendInfo string) (*model2.EvSaveResp, error) { diff --git a/third_party/official/gosdk_demo/zxsdk/go.mod b/third_party/official/gosdk_demo/zxsdk/go.mod deleted file mode 100644 index db3fad8..0000000 --- a/third_party/official/gosdk_demo/zxsdk/go.mod +++ /dev/null @@ -1,24 +0,0 @@ -module zxsdk - -go 1.18 - -require ( - github.com/google/uuid v1.1.1 - github.com/mitchellh/mapstructure v1.4.3 - github.com/sirupsen/logrus v1.9.3 - wallet_sdk v1.0.0 -) - -require ( - github.com/google/go-querystring v1.0.0 // indirect - github.com/mozillazg/go-httpheader v0.2.1 // indirect - github.com/tencentyun/cos-go-sdk-v5 v0.7.7 // indirect - github.com/tjfoc/gmsm v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee // indirect - golang.org/x/sys v0.22.0 // indirect -) - -replace ( - github.com/tencentyun/cos-go-sdk-v5 => github.com/tencentyun/cos-go-sdk-v5 v0.7.7 - wallet_sdk => ./wallet_sdk -) diff --git a/third_party/official/gosdk_demo/zxsdk/go.sum b/third_party/official/gosdk_demo/zxsdk/go.sum deleted file mode 100644 index 7e1bfe8..0000000 --- a/third_party/official/gosdk_demo/zxsdk/go.sum +++ /dev/null @@ -1,101 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mozillazg/go-httpheader v0.2.1 h1:geV7TrjbL8KXSyvghnFm+NyTux/hxwueTSrwhe88TQQ= -github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tencentyun/cos-go-sdk-v5 v0.7.7 h1:7YI5nNwLEhseUoWzzz1CDAwQMeJyJfD3Tj0XnQRzqO8= -github.com/tencentyun/cos-go-sdk-v5 v0.7.7/go.mod h1:wQBO5HdAkLjj2q6XQiIfDSP8DXDNrppDRw2Kp/1BODA= -github.com/tjfoc/gmsm v1.4.0 h1:8nbaiZG+iVdh+fXVw0DZoZZa7a4TGm3Qab+xdrdzj8s= -github.com/tjfoc/gmsm v1.4.0/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee h1:4yd7jl+vXjalO5ztz6Vc1VADv+S/80LGJmyl1ROJ2AI= -golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/third_party/official/gosdk_demo/zxsdk/kv_sdk.go b/third_party/official/gosdk_demo/zxsdk/kv_sdk.go index 724b980..d709adc 100644 --- a/third_party/official/gosdk_demo/zxsdk/kv_sdk.go +++ b/third_party/official/gosdk_demo/zxsdk/kv_sdk.go @@ -2,11 +2,11 @@ package zxsdk import ( "fmt" - wallet "wallet_sdk" - "zxsdk/constant" - "zxsdk/log" - model2 "zxsdk/model" - "zxsdk/tools" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/constant" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/log" + model2 "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/model" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/tools" + wallet "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk" ) func (zx ZxChainClient) KvSave(kvKey, kvValue, operateId string) error { diff --git a/third_party/official/gosdk_demo/zxsdk/tools/http_tool.go b/third_party/official/gosdk_demo/zxsdk/tools/http_tool.go index acc1757..3b6c8a7 100644 --- a/third_party/official/gosdk_demo/zxsdk/tools/http_tool.go +++ b/third_party/official/gosdk_demo/zxsdk/tools/http_tool.go @@ -5,13 +5,13 @@ import ( "encoding/json" "errors" "fmt" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/constant" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/log" "github.com/mitchellh/mapstructure" "io" "net/http" "net/url" "time" - "zxsdk/constant" - "zxsdk/log" ) var DefaultHttpClient = &http.Client{ diff --git a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.mod b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.mod deleted file mode 100644 index e6016f9..0000000 --- a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.mod +++ /dev/null @@ -1,11 +0,0 @@ -module wallet_sdk - -go 1.15 - -require ( - github.com/stretchr/testify v1.6.1 - github.com/tencentyun/cos-go-sdk-v5 v0.7.7 - github.com/tjfoc/gmsm v1.4.0 -) - -replace github.com/tencentyun/cos-go-sdk-v5 => github.com/tencentyun/cos-go-sdk-v5 v0.7.7 diff --git a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.sum b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.sum deleted file mode 100644 index 210d7ca..0000000 --- a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/go.sum +++ /dev/null @@ -1,94 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/mozillazg/go-httpheader v0.2.1 h1:geV7TrjbL8KXSyvghnFm+NyTux/hxwueTSrwhe88TQQ= -github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tencentyun/cos-go-sdk-v5 v0.7.7 h1:7YI5nNwLEhseUoWzzz1CDAwQMeJyJfD3Tj0XnQRzqO8= -github.com/tencentyun/cos-go-sdk-v5 v0.7.7/go.mod h1:wQBO5HdAkLjj2q6XQiIfDSP8DXDNrppDRw2Kp/1BODA= -github.com/tjfoc/gmsm v1.4.0 h1:8nbaiZG+iVdh+fXVw0DZoZZa7a4TGm3Qab+xdrdzj8s= -github.com/tjfoc/gmsm v1.4.0/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee h1:4yd7jl+vXjalO5ztz6Vc1VADv+S/80LGJmyl1ROJ2AI= -golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw.go b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw.go index 175ebf3..3d51935 100644 --- a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw.go +++ b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw.go @@ -5,11 +5,11 @@ import ( "encoding/hex" "encoding/pem" "fmt" + hds "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdsignature" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk/mnemonics" "math/big" "strconv" "time" - hds "wallet_sdk/hdsignature" - "wallet_sdk/mnemonics" ) const ( diff --git a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw_mobile.go b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw_mobile.go index 25f10c8..cbbddc2 100644 --- a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw_mobile.go +++ b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdw_mobile.go @@ -2,10 +2,10 @@ package wallet_sdk import ( "encoding/hex" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk/hdsignature" "math/rand" "strconv" "time" - "wallet_sdk/hdsignature" ) func SM3Hash(data []byte) (string, error) { diff --git a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/mnemonics/mnemonics.go b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/mnemonics/mnemonics.go index 7976062..9a308a7 100644 --- a/third_party/official/gosdk_demo/zxsdk/wallet_sdk/mnemonics/mnemonics.go +++ b/third_party/official/gosdk_demo/zxsdk/wallet_sdk/mnemonics/mnemonics.go @@ -4,9 +4,9 @@ import ( "crypto/rand" "encoding/binary" "fmt" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk/mnemonics/wordlists" "math/big" "strings" - "wallet_sdk/mnemonics/wordlists" "github.com/tjfoc/gmsm/sm3" ) diff --git a/third_party/official/gosdk_demo/zxsdk/zxchain_client.go b/third_party/official/gosdk_demo/zxsdk/zxchain_client.go index f5015f0..b5a6bf5 100644 --- a/third_party/official/gosdk_demo/zxsdk/zxchain_client.go +++ b/third_party/official/gosdk_demo/zxsdk/zxchain_client.go @@ -1,12 +1,12 @@ package zxsdk import ( + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/constant" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/tools" + "git.yuanzoo.cn/zhangzhengqiang/popi-zxl/third_party/official/gosdk_demo/zxsdk/wallet_sdk" "github.com/google/uuid" "net/http" "strconv" - "wallet_sdk" - "zxsdk/constant" - "zxsdk/tools" ) type ZxChainClient struct {