diff --git a/admin/go.sum b/admin/go.sum index 2da91dc..89637dc 100644 --- a/admin/go.sum +++ b/admin/go.sum @@ -51,6 +51,8 @@ github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= diff --git a/admin/internal/logic/addlogic.go b/admin/internal/logic/addlogic.go index b086b9b..c0abf3d 100644 --- a/admin/internal/logic/addlogic.go +++ b/admin/internal/logic/addlogic.go @@ -8,6 +8,7 @@ import ( "admin/internal/svc" "github.com/zeromicro/go-zero/core/logx" + "pkg.local/utils" validateService "pkg.local/validate" ) @@ -27,8 +28,8 @@ func NewAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AddLogic { func (l *AddLogic) Add(in *admin.AddRequest) (*admin.Response, error) { var req validator.AdminAddValidator - if resp := validateService.ValidateFromProto(in, &req); resp != "" { - return &admin.Response{Code: 111, Msg: resp}, nil + if resp := validateService.ValidateFromProto(in, &req); resp != utils.StringEmpty { + return &admin.Response{Code: utils.Ok.Code, Msg: resp}, nil } return &admin.Response{}, nil diff --git a/pkg/go.mod b/pkg/go.mod index 99ba190..08c1b8d 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -4,9 +4,20 @@ go 1.26 require ( buf.build/go/protovalidate v0.14.0 + github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4 + github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6 + github.com/alibabacloud-go/tea v1.5.3 + github.com/fsnotify/fsnotify v1.10.1 + github.com/gin-gonic/gin v1.12.0 github.com/go-playground/validator/v10 v10.30.3 + github.com/golang-jwt/jwt/v4 v4.5.2 + github.com/joho/godotenv v1.5.1 + github.com/json-iterator/go v1.1.12 github.com/redis/go-redis/v9 v9.19.0 + github.com/spf13/viper v1.21.0 + github.com/xuri/excelize/v2 v2.11.0 go.uber.org/zap v1.24.0 + golang.org/x/crypto v0.53.0 google.golang.org/grpc v1.80.0 google.golang.org/protobuf v1.36.11 gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -19,24 +30,65 @@ require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250717165733-d22d418d82d8.1 // indirect cel.dev/expr v0.25.1 // indirect filippo.io/edwards25519 v1.1.0 // indirect + github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect + github.com/alibabacloud-go/debug v1.0.1 // indirect + github.com/alibabacloud-go/endpoint-util v1.1.0 // indirect + github.com/alibabacloud-go/openapi-util v0.1.0 // indirect + github.com/alibabacloud-go/tea-utils v1.3.1 // indirect + github.com/alibabacloud-go/tea-utils/v2 v2.0.9 // indirect + github.com/aliyun/credentials-go v1.4.5 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect + github.com/bytedance/gopkg v0.1.3 // indirect + github.com/bytedance/sonic v1.15.0 // indirect + github.com/bytedance/sonic/loader v0.5.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/clbanning/mxj/v2 v2.7.0 // indirect + github.com/cloudwego/base64x v0.1.6 // indirect github.com/gabriel-vasile/mimetype v1.4.13 // indirect + github.com/gin-contrib/sse v1.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect + github.com/go-viper/mapstructure/v2 v2.4.0 // indirect + github.com/goccy/go-json v0.10.5 // indirect + github.com/goccy/go-yaml v1.19.2 // indirect github.com/google/cel-go v0.25.0 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect + github.com/quic-go/qpack v0.6.0 // indirect + github.com/quic-go/quic-go v0.59.0 // indirect + github.com/richardlehane/mscfb v1.0.7 // indirect + github.com/richardlehane/msoleps v1.0.6 // indirect + github.com/sagikazarmark/locafero v0.11.0 // indirect + github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect + github.com/spf13/afero v1.15.0 // indirect + github.com/spf13/cast v1.10.0 // indirect + github.com/spf13/pflag v1.0.10 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/tiendc/go-deepcopy v1.7.2 // indirect + github.com/tjfoc/gmsm v1.4.1 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.3.1 // indirect + github.com/xuri/efp v0.0.1 // indirect + github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect + go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.52.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/arch v0.22.0 // indirect golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect - golang.org/x/net v0.54.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect + golang.org/x/net v0.56.0 // indirect + golang.org/x/sys v0.46.0 // indirect + golang.org/x/text v0.38.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect ) diff --git a/pkg/go.sum b/pkg/go.sum index 7efd763..0ea7e16 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -4,8 +4,63 @@ buf.build/go/protovalidate v0.14.0 h1:kr/rC/no+DtRyYX+8KXLDxNnI1rINz0imk5K44ZpZ3 buf.build/go/protovalidate v0.14.0/go.mod h1:+F/oISho9MO7gJQNYC2VWLzcO1fTPmaTA08SDYJZncA= cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4= cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6 h1:eIf+iGJxdU4U9ypaUfbtOWCsZSbTb8AUHvyPrxu6mAA= +github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6/go.mod h1:4EUIoxs/do24zMOGGqYVWgw0s9NtiylnJglOeEB5UJo= +github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4/go.mod h1:sCavSAvdzOjul4cEqeVtvlSaSScfNsTQ+46HwlTL1hc= +github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 h1:zE8vH9C7JiZLNJJQ5OwjU9mSi4T9ef9u3BURT6LCLC8= +github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5/go.mod h1:tWnyE9AjF8J8qqLk645oUmVUnFybApTQWklQmi5tY6g= +github.com/alibabacloud-go/darabonba-array v0.1.0 h1:vR8s7b1fWAQIjEjWnuF0JiKsCvclSRTfDzZHTYqfufY= +github.com/alibabacloud-go/darabonba-array v0.1.0/go.mod h1:BLKxr0brnggqOJPqT09DFJ8g3fsDshapUD3C3aOEFaI= +github.com/alibabacloud-go/darabonba-encode-util v0.0.2 h1:1uJGrbsGEVqWcWxrS9MyC2NG0Ax+GpOM5gtupki31XE= +github.com/alibabacloud-go/darabonba-encode-util v0.0.2/go.mod h1:JiW9higWHYXm7F4PKuMgEUETNZasrDM6vqVr/Can7H8= +github.com/alibabacloud-go/darabonba-map v0.0.2 h1:qvPnGB4+dJbJIxOOfawxzF3hzMnIpjmafa0qOTp6udc= +github.com/alibabacloud-go/darabonba-map v0.0.2/go.mod h1:28AJaX8FOE/ym8OUFWga+MtEzBunJwQGceGQlvaPGPc= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.2/go.mod h1:5JHVmnHvGzR2wNdgaW1zDLQG8kOC4Uec8ubkMogW7OQ= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4 h1:o6veen0IZ/Fe1JawwhwQMZcbw67CVDY1pQwXcNWPyQo= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4/go.mod h1:eHjVxrT9g8uVYN/nyAwOFQEfkVA154ChiqRc2XnNKYU= +github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg= +github.com/alibabacloud-go/darabonba-signature-util v0.0.7/go.mod h1:oUzCYV2fcCH797xKdL6BDH8ADIHlzrtKVjeRtunBNTQ= +github.com/alibabacloud-go/darabonba-string v1.0.2 h1:E714wms5ibdzCqGeYJ9JCFywE5nDyvIXIIQbZVFkkqo= +github.com/alibabacloud-go/darabonba-string v1.0.2/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA= +github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6pb/Qy8c+lqua8cFpEy7g39NRRqOWc3rOwAy8m5Y2BY= +github.com/alibabacloud-go/debug v1.0.0/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc= +github.com/alibabacloud-go/debug v1.0.1 h1:MsW9SmUtbb1Fnt3ieC6NNZi6aEwrXfDksD4QA6GSbPg= +github.com/alibabacloud-go/debug v1.0.1/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc= +github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6 h1:UTl97mt2qfavxveqCkaVg4tKaZUPzA9RKbFIRaIdtdg= +github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6/go.mod h1:UWpcGrWwTbES9QW7OQ7xDffukMJ/l7lzioixIz8+lgY= +github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgTSHBbVfZlzf6b5Q= +github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE= +github.com/alibabacloud-go/openapi-util v0.0.11/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws= +github.com/alibabacloud-go/openapi-util v0.1.0 h1:0z75cIULkDrdEhkLWgi9tnLe+KhAFE/r5Pb3312/eAY= +github.com/alibabacloud-go/openapi-util v0.1.0/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws= +github.com/alibabacloud-go/tea v1.1.0/go.mod h1:IkGyUSX4Ba1V+k4pCtJUc6jDpZLFph9QMy2VUPTwukg= +github.com/alibabacloud-go/tea v1.1.7/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= +github.com/alibabacloud-go/tea v1.1.8/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= +github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= +github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= +github.com/alibabacloud-go/tea v1.1.19/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= +github.com/alibabacloud-go/tea v1.1.20/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= +github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk= +github.com/alibabacloud-go/tea v1.5.2/go.mod h1:hgSs82CkOiehSQMoiFN79dL6zsGX7pVGvnn9SIEs8/0= +github.com/alibabacloud-go/tea v1.5.3 h1:UMJTBcO48w7Zz1nlFe9bmRsHwgB7AjF8DBQzcvHhIp8= +github.com/alibabacloud-go/tea v1.5.3/go.mod h1:hgSs82CkOiehSQMoiFN79dL6zsGX7pVGvnn9SIEs8/0= +github.com/alibabacloud-go/tea-utils v1.3.1 h1:iWQeRzRheqCMuiF3+XkfybB3kTgUXkXX+JMrqfLeB2I= +github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= +github.com/alibabacloud-go/tea-utils/v2 v2.0.0/go.mod h1:U5MTY10WwlquGPS34DOeomUGBB0gXbLueiq5Trwu0C4= +github.com/alibabacloud-go/tea-utils/v2 v2.0.3/go.mod h1:sj1PbjPodAVTqGTA3olprfeeqqmwD0A5OQz94o9EuXQ= +github.com/alibabacloud-go/tea-utils/v2 v2.0.5/go.mod h1:dL6vbUT35E4F4bFTHL845eUloqaerYBYPsdWR2/jhe4= +github.com/alibabacloud-go/tea-utils/v2 v2.0.9 h1:y6pUIlhjxbZl9ObDAcmA1H3c21eaAxADHTDQmBnAIgA= +github.com/alibabacloud-go/tea-utils/v2 v2.0.9/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I= +github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= +github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= +github.com/aliyun/credentials-go v1.3.1/go.mod h1:8jKYhQuDawt8x2+fusqa1Y6mPxemTsBEN04dgcAcYz0= +github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmPrib8NVePL3fxM= +github.com/aliyun/credentials-go v1.4.5 h1:O76WYKgdy1oQYYiJkERjlA2dxGuvLRrzuO2ScrtGWSk= +github.com/aliyun/credentials-go v1.4.5/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -14,13 +69,38 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M= +github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM= +github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE= +github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k= +github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE= +github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= +github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME= +github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= +github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= +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/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= +github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= +github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= +github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8= +github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -35,43 +115,149 @@ github.com/go-playground/validator/v10 v10.30.3 h1:4MU6YkEwx7GbcPJOZxrtbu+QfF3pJ github.com/go-playground/validator/v10 v10.30.3/go.mod h1:4Axh7oCNGcoGkqLoE4YWt6n20mcEIsPRlB7vPk3lpyc= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= +github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= +github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= +github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +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/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY= github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI= +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-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= -github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= +github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= +github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw= +github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= github.com/redis/go-redis/v9 v9.19.0 h1:XPVaaPSnG6RhYf7p+rmSa9zZfeVAnWsH5h3lxthOm/k= github.com/redis/go-redis/v9 v9.19.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/richardlehane/mscfb v1.0.7 h1:oeoiM0WE79vHwE8RpIYYvIAc8ajTH2mb6UZm55/+EB0= +github.com/richardlehane/mscfb v1.0.7/go.mod h1:pe0+IUIc0AHh0+teNzBlJCtSyZdFOGgV4ZK9bsoV+Jo= +github.com/richardlehane/msoleps v1.0.6 h1:9BvkpjvD+iUBalUY4esMwv6uBkfOip/Lzvd93jvR9gg= +github.com/richardlehane/msoleps v1.0.6/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= +github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= +github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= +github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= +github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= +github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= +github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44= +github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ= +github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= +github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= +github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= +github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8= +github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI= +github.com/xuri/excelize/v2 v2.11.0 h1:HxaEFl6sRN2+8J5a8HaKq+0M4FsjBGMnWWtjOCPSG88= +github.com/xuri/excelize/v2 v2.11.0/go.mod h1:jxFLbzaIwGQ5ufFNvYfUOHqXhfPaNmP14KWfmNz2Uak= +github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE= +github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= +go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE= +go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48= @@ -89,33 +275,176 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI= +golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto= +golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= -golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= -golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE= +golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= +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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= +golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= +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/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +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-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= +golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE= +golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4= +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-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= +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/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 h1:vmC/ws+pLzWjj/gzApyoZuSVrDtF1aod4u/+bbj8hgM= google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:p3MLuOwURrGBRoEyFHBT3GjUwaCQVKeNqqWxlcISGdw= google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU= google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= +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/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM= google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4= +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= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -127,3 +456,5 @@ gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gorm.io/plugin/dbresolver v1.6.2 h1:F4b85TenghUeITqe3+epPSUtHH7RIk3fXr5l83DF8Pc= gorm.io/plugin/dbresolver v1.6.2/go.mod h1:tctw63jdrOezFR9HmrKnPkmig3m5Edem9fdxk9bQSzM= +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/utils/config.go b/pkg/utils/config.go similarity index 100% rename from utils/config.go rename to pkg/utils/config.go diff --git a/utils/cronLog.go b/pkg/utils/cronLog.go similarity index 100% rename from utils/cronLog.go rename to pkg/utils/cronLog.go diff --git a/utils/crypto.go b/pkg/utils/crypto.go similarity index 100% rename from utils/crypto.go rename to pkg/utils/crypto.go diff --git a/utils/curl.go b/pkg/utils/curl.go similarity index 100% rename from utils/curl.go rename to pkg/utils/curl.go diff --git a/utils/encrypt.go b/pkg/utils/encrypt.go similarity index 100% rename from utils/encrypt.go rename to pkg/utils/encrypt.go diff --git a/utils/errno.go b/pkg/utils/errno.go similarity index 100% rename from utils/errno.go rename to pkg/utils/errno.go diff --git a/utils/jwt.go b/pkg/utils/jwt.go similarity index 100% rename from utils/jwt.go rename to pkg/utils/jwt.go diff --git a/utils/my.go b/pkg/utils/my.go similarity index 100% rename from utils/my.go rename to pkg/utils/my.go diff --git a/utils/sms.go b/pkg/utils/sms.go similarity index 100% rename from utils/sms.go rename to pkg/utils/sms.go diff --git a/utils/status.go b/pkg/utils/status.go similarity index 97% rename from utils/status.go rename to pkg/utils/status.go index 80328e2..fffbaa8 100644 --- a/utils/status.go +++ b/pkg/utils/status.go @@ -1,7 +1,7 @@ package utils type Status struct { - Code int `json:"code"` + Code int32 `json:"code"` Msg string `json:"message"` } @@ -30,6 +30,7 @@ const ( DecollatorComma = "," //逗号分割符 CentralHorizontalLine = " - " DecollatorEqual = "=" + StringEmpty = "" ) const ( @@ -50,9 +51,10 @@ const ( ) var ( - // 基础类 + //新使用方法 + Ok = Status{Code: 10000, Msg: "OK"} - OK = NewError(10000, "OK") + // 基础类 Fail = NewError(999, "fail") ErrorExist = NewError(998, "已存在") ErrorOvertime = NewError(997, "请求已超时") diff --git a/utils/time.go b/pkg/utils/time.go similarity index 100% rename from utils/time.go rename to pkg/utils/time.go diff --git a/utils/tools.go b/pkg/utils/tools.go similarity index 100% rename from utils/tools.go rename to pkg/utils/tools.go diff --git a/pkg/validate/validator_util.go b/pkg/validate/validator_util.go index d97d257..af188ea 100644 --- a/pkg/validate/validator_util.go +++ b/pkg/validate/validator_util.go @@ -5,6 +5,7 @@ import ( "reflect" "github.com/go-playground/validator/v10" + "pkg.local/utils" ) // ValidatorMessages 自定义错误消息 @@ -53,7 +54,7 @@ func CopySameField(src interface{}, dst interface{}) { func ValidateStruct(obj IValidator) string { err := v.Struct(obj) if err == nil { - return "" + return utils.StringEmpty } customMsg := obj.GetMessage() diff --git a/utils/queue.go b/utils/queue.go deleted file mode 100644 index 8e0243e..0000000 --- a/utils/queue.go +++ /dev/null @@ -1,17 +0,0 @@ -package utils - -import ( - "base-service/pkg/queue" -) - -const ( - WecomStream = "stream:wecom" - WecomGroup = "group:wecom" - WecomConsumer = "consumer:wecom" -) - -// 不能自动启动，有 redis 生命周期顺序问题 -func InitQueue() { - go queue.StartWorker(WecomStream, WecomGroup, WecomConsumer) - // go queue.StartWorker(email.Stream, email.Group, email.Consumer) -} diff --git a/utils/transit/base.go b/utils/transit/base.go deleted file mode 100644 index f02663e..0000000 --- a/utils/transit/base.go +++ /dev/null @@ -1,31 +0,0 @@ -package transit - -import "base-service/app/dao" - -type TransitResult struct { - ErrorCode string `json:"error_code"` - ApiErrorMsg string `json:"api_error_msg,omitempty"` - ApiResponseID string `json:"api_response_id,omitempty"` - RequestID string `json:"request_id"` - WaybillNo []string `json:"waybill_no,omitempty"` - PostInfo string `json:"post_info,omitempty"` - RequestInfo string `json:"request_info,omitempty"` - RequestQuery map[string]interface{} `json:"request_query,omitempty"` - OrderSn string `json:"order_sn,omitempty"` - Files []TransitFiles `json:"files,omitempty"` -} - -type TransitFiles struct { - File string `json:"file"` - Url string `json:"url"` - Token string `json:"token"` - WaybillNo string `json:"waybill_no"` -} - -type Transit interface { - Create(order dao.DeliverGoodsPrint) (TransitResult, error) - Query(orderId string) (TransitResult, error) // 改这里！ - Cancel(orderId string) (TransitResult, error) // 改这里！ - Estimated(orderId, card string) (TransitResult, error) - DownSheet(orders []string, info dao.DeliverGoodsPrint) (TransitResult, error) // 改这里！ -} diff --git a/utils/transit/jd.go b/utils/transit/jd.go deleted file mode 100644 index b207c2e..0000000 --- a/utils/transit/jd.go +++ /dev/null @@ -1,554 +0,0 @@ -package transit - -import ( - "base-service/app/dao" - "base-service/utils" - "bytes" - "crypto/hmac" - "crypto/md5" - "crypto/sha1" - "crypto/sha256" - "crypto/sha512" - "encoding/base64" - "encoding/json" - "fmt" - "io" - "net/http" - "strconv" - "strings" - "time" - "unicode/utf8" -) - -// JdClient 顺丰快递客户端 -type JdClient struct { - config dao.TransitSend - accessToken string - customerCode string -} - -const ( - JdServicePrecheckOrder = "/ecap/v1/orders/precheck" //预处理创建订单 - JdServiceOrder = "/ecap/v1/orders/create" //下订单 - JdServiceOrderConfirm = "/ecap/v1/orders/cancel" //取消订单 - JdServiceOrderQueryByMailNo = "/ecap/v1/orders/trace/query" //路由查询-通过运单号-通过订单号 - JdServiceOrderEstimated = "/ecap/v1/orders/info/query" //预计派送时间 - JdServiceOrderWaybills = "/cloud/print/render" //快递单下载 - JdServiceBackUrl = "/jd/tracking/subscribe" //回调订阅地址 - - JdAlgorithm = "md5-salt" //加密方式 - JdVersion = "2.0" - JdBtoC = 1 - JdCtoB = 2 - JdSettleType = 3 //付款方式-月结 - JdCodeFail = "fail" //失败标识 - JdMaxOrderNumber = 8 //最多箱子数 - JdProductCode = "ed-m-0001" //京东标快 支持 0-C2C；1-B2C；2-C2B - JdRemarkMaxLength = 200 //最大备注长度 - JdSheet76x130 = "jdkd76x130" - - // 以下是签收code - JdStatusDeliverySign = "10034" - JdStatusPartialDelivery = "10042" - JdStatusDeliveryBigSign = "300015" - - JdLopDNBackECAP = "Tracking_JD" - JdOrderECAP = "ECAP" - JdPrintECAP = "jdcloudprint" -) - -// JdSingedCodeMap 已签收CODE https://open.sf-express.com/developSupport/734349?activeIndex=589678 -var JdSingedCodeMap = map[string]bool{ - JdStatusDeliverySign: true, - JdStatusPartialDelivery: true, - JdStatusDeliveryBigSign: true, -} - -// NewJdClient 初始化顺丰客户端 -func NewJdClient(info dao.TransitSend) *JdClient { - other := utils.StrToStrArr(info.Other, "|") - var accessToken, customerCode string - for i := utils.NumberZero; i < len(other); i++ { - tmp := strings.Split(other[i], ":") - if len(tmp) != utils.NumberTwo { - continue - } - switch tmp[0] { - case "token": - accessToken = tmp[1] - break - case "code": - customerCode = tmp[1] - break - } - } - return &JdClient{info, accessToken, customerCode} -} - -func (c *JdClient) Create(order dao.DeliverGoodsPrint) (TransitResult, error) { - result, err := c.getCheck(order) - if err != nil { - return result, err - } - if result.ErrorCode != dao.StatusOkString { - return result, nil - } - - info := c.getCreateData(order, order.ProductItems) - //发送请求 - result, err = c.send(JdServiceOrder, info) - if err != nil { - utils.Logger.Error("Jd Create Order:", err) - return result, err - } - if result.ErrorCode != dao.StatusOkString { - utils.Logger.Error("Jd Create Order:", err) - return result, nil - } - c.subscribe(result.WaybillNo[utils.NumberZero]) - result.PostInfo = utils.StructToJson(info) - return result, nil -} - -// Query 查询物流 -func (c *JdClient) Query(waybillCode string) (TransitResult, error) { - data := map[string]interface{}{ - //1:根据顺丰运单号查询,trackingNumber将被当作顺丰运单号处理 - //2:根据客户订单号查询,trackingNumber将被当作客户订单号处理 - //"trackingType": JdTrackingType, - "waybillCode": waybillCode, - "orderOrigin": JdBtoC, - } - //发送请求 - result, err := c.send(JdServiceOrderQueryByMailNo, data) - if err != nil { - utils.Logger.Error("Jd Query Order:", err) - return result, err - } - return result, nil -} - -// DownSheet 下载面单 -func (c *JdClient) DownSheet(orders []string, info dao.DeliverGoodsPrint) (TransitResult, error) { - data := map[string]interface{}{ - "customerCode": c.customerCode, - "templateCode": JdSheet76x130, - "operator": info.AdminName, //自定义操作人 - "taskId": strconv.FormatInt(time.Now().UnixMilli(), 10), //自定义任务ID - "printData": map[string]interface{}{ - "orderNumber": info.OrderSn, //订单号 - "carrierCode": "JD", - "billCodeValue": orders[0], - "billCodeType": "waybillCode", - "customerPrintData": map[string]interface{}{ - "productCode": JdProductCode, - }, - }, - "outputConfig": map[string]interface{}{ - "outputType": "1", //文件 - "dataFormat": "1", //当fileFormat=1时，枚举值填1（1代表URL） - "fileFormat": "1", //PDF - }, - } - //生成需要提交的数据 - //发送请求 - result, err := c.sendDown(JdServiceOrderWaybills, data, orders[0]) - if err != nil { - utils.Logger.Error("Jd Create Order:", err) - return result, err - } - result.PostInfo = utils.StructToJson(data) - - return result, nil -} - -// Estimated 获取预计时间 -func (c *JdClient) Estimated(orderId, card string) (TransitResult, error) { - data := map[string]interface{}{ - "customerCode": c.customerCode, - "deliveryId": orderId, - } - utils.Logger.Error(data) - //发送请求 - result, err := c.send(JdServiceOrderEstimated, data) - if err != nil { - utils.Logger.Error("Jd estimated Order:", err) - return result, err - } - utils.Logger.Error(result) - result.PostInfo = utils.StructToJson(data) - return result, nil -} - -// Cancel 取消订单 -func (c *JdClient) Cancel(waybillCode string) (TransitResult, error) { - data := map[string]interface{}{ - "waybillCode": waybillCode, - "orderOrigin": JdBtoC, - "cancelReason": "快递数据同步失败", - "cancelReasonCode": "1", - } - //发送请求 - result, err := c.send(JdServiceOrderConfirm, data) - if err != nil { - utils.Logger.Error("Jd cancel Order:", err) - return result, err - } - result.PostInfo = utils.StructToJson(data) - return result, nil -} - -// Edit 修改订单 -func (c *JdClient) Edit(waybillCode string) (TransitResult, error) { - data := map[string]interface{}{ - "waybillCode": waybillCode, - "orderOrigin": JdBtoC, - "cancelReason": "快递数据同步失败", - "cancelReasonCode": "1", - } - //发送请求 - result, err := c.send(JdServiceOrderConfirm, data) - if err != nil { - utils.Logger.Error("Jd cancel Order:", err) - return result, err - } - result.PostInfo = utils.StructToJson(data) - return result, nil -} - -func (c *JdClient) sendPost(apiUri, lop string, postData map[string]interface{}) (string, error) { - client := http.Client{} - baseUri := c.config.AppUrl - - bodyArr := []map[string]interface{}{ - postData, - } - body := utils.StructToJson(bodyArr) - timestamp := time.Now().Format(time.DateTime) - content := strings.Join([]string{ - c.config.AppSecretKey, - "access_token", c.accessToken, - "app_key", c.config.AppCode, - "method", apiUri, - "param_json", body, - "timestamp", timestamp, - "v", JdVersion, - c.config.AppSecretKey, - }, "") - sign, err := c.sign(JdAlgorithm, []byte(content), c.config.AppSecretKey) - if err != nil { - utils.Logger.Error("Jd:", err) - return "", err - } - postUrl := baseUri + apiUri - httpRequest, err := http.NewRequest("POST", postUrl, bytes.NewReader([]byte(body))) - if err != nil { - utils.Logger.Error("Jd:", err) - return "", err - } - query := httpRequest.URL.Query() - query.Add("LOP-DN", lop) - query.Add("access_token", c.accessToken) - query.Add("app_key", c.config.AppCode) - query.Add("timestamp", timestamp) - query.Add("v", JdVersion) - query.Add("sign", sign) - query.Add("algorithm", JdAlgorithm) - httpRequest.URL.RawQuery = query.Encode() - _, offset := time.Now().Zone() - // lop-tz代表时区，为接口调用当地的时区；删去后默认为东八区 - httpRequest.Header.Add("lop-tz", fmt.Sprintf("%d", offset/3600)) - // 用于开放平台识别客户调用API方式，客户无需修改 - httpRequest.Header.Add("User-Agent", "lop-http/go") - httpRequest.Header.Add("content-type", "application/json;charset=utf-8") - httpResponse, err := client.Do(httpRequest) - if err != nil { - utils.Logger.Error("Jd:", err) - return "", err - } - defer func(Body io.ReadCloser) { - err := Body.Close() - if err != nil { - utils.Logger.Error(err) - } - }(httpResponse.Body) - - b, err := io.ReadAll(httpResponse.Body) - if err != nil { - utils.Logger.Error("Jd:", err) - return "", err - } - - return string(b), nil -} - -func (c *JdClient) sign(algorithm string, data []byte, secret string) (string, error) { - if algorithm == "md5-salt" { - h := md5.New() - if _, err := h.Write(data); err != nil { - return "", err - } - return fmt.Sprintf("%x", h.Sum(nil)), nil - } else if algorithm == "HMacMD5" { - h := hmac.New(md5.New, []byte(secret)) - if _, err := h.Write(data); err != nil { - return "", err - } - return base64.StdEncoding.EncodeToString(h.Sum(nil)), nil - } else if algorithm == "HMacSHA1" { - h := hmac.New(sha1.New, []byte(secret)) - if _, err := h.Write(data); err != nil { - return "", err - } - return base64.StdEncoding.EncodeToString(h.Sum(nil)), nil - } else if algorithm == "HMacSHA256" { - h := hmac.New(sha256.New, []byte(secret)) - if _, err := h.Write(data); err != nil { - return "", err - } - return base64.StdEncoding.EncodeToString(h.Sum(nil)), nil - } else if algorithm == "HMacSHA512" { - h := hmac.New(sha512.New, []byte(secret)) - if _, err := h.Write(data); err != nil { - return "", err - } - return base64.StdEncoding.EncodeToString(h.Sum(nil)), nil - } - return "", fmt.Errorf("algorithm %s not supported yet", algorithm) -} - -func (c *JdClient) getCreateData(order dao.DeliverGoodsPrint, products []dao.DeliverGoodsProduct) map[string]interface{} { - var weight, length, width, hight, volume float32 - var remark []string - - for _, item := range products { - weight += item.ProductWeight * float32(item.ProductNumber) - length += item.ProductLength * float32(item.ProductNumber) - width += item.ProductWidth * float32(item.ProductNumber) - hight += item.ProductHeight * float32(item.ProductNumber) - volume += item.ProductCubage * float32(item.ProductNumber) - remark = append(remark, fmt.Sprintf("%s×%d", item.ProductName, item.ProductNumber)) - } - - remarkStr := strings.Join(remark, ",") - if utf8.RuneCountInString(remarkStr) > JdRemarkMaxLength { - remarkStr = remarkStr[:JdRemarkMaxLength] - } - - name := utils.GetConfigString("transit.name") - if name == "" { - name = "化妆品" - } - - // 生成顺丰标准请求参数 - data := map[string]interface{}{ - "orderId": order.OrderSn, //订单号 - "senderContact": map[string]interface{}{ //发货人信息 - "name": c.config.Contact, - "mobile": c.config.Mobile, - "fullAddress": c.config.Address, - }, - "receiverContact": map[string]interface{}{ //收货人信息 - "name": order.Addressee, - "mobile": order.Mobile, - "fullAddress": order.Address, - }, - "orderOrigin": JdBtoC, - "customerCode": c.customerCode, // - "productsReq": map[string]interface{}{ - "productCode": JdProductCode, - }, - "settleType": JdSettleType, - "cargoes": []map[string]interface{}{ - { - "name": name, - "quantity": order.Number, - "weight": weight, - "length": length, - "width": width, - "hight": hight, - "volume": volume, - }, - }, - "extendProps": map[string]interface{}{ - "autoSubscribe": "1", //1为订阅推送，0为不订阅推送 - }, - "remark": remarkStr, - } - return data -} - -func (c *JdClient) getCheck(order dao.DeliverGoodsPrint) (TransitResult, error) { - //生成map对象 - info := c.getCheckCreateData(order, utils.NumberOne, order.ProductItems[:1]) - //发送请求 - result, err := c.send(JdServicePrecheckOrder, info) - result.PostInfo = utils.StructToJson(info) - return result, err -} - -func (c *JdClient) getCheckCreateData(order dao.DeliverGoodsPrint, number int, products []dao.DeliverGoodsProduct) map[string]interface{} { - var weight, length, width, hight, volume float32 - for _, item := range products { - weight += item.ProductWeight - length += item.ProductLength - width += item.ProductWidth - hight += item.ProductHeight - volume += item.ProductCubage - } - - name := utils.GetConfigString("transit.name") - if name == "" { - name = "化妆品" - } - - // 生成顺丰标准请求参数 - data := map[string]interface{}{ - "senderContact": map[string]interface{}{ - "name": c.config.Contact, - "mobile": c.config.Mobile, - "fullAddress": c.config.Address, - }, - "receiverContact": map[string]interface{}{ - "name": order.Addressee, - "mobile": order.Mobile, - "fullAddress": order.Address, - }, - "orderOrigin": JdBtoC, - "customerCode": c.customerCode, // 你的订单号 - "settleType": JdSettleType, - "cargoes": []map[string]interface{}{ - { - "name": name, - "quantity": number, - "weight": weight, - "length": length, - "width": width, - "hight": hight, - "volume": volume, - }, - }, - } - return data -} - -func (c *JdClient) send(uri string, postData map[string]interface{}) (TransitResult, error) { - res := TransitResult{} - // 发送请求 - resultStr, err := c.sendPost(uri, JdOrderECAP, postData) - if err != nil { - utils.Logger.Error(err) - return res, err - } - var result map[string]interface{} - if err = json.Unmarshal([]byte(resultStr), &result); err != nil { - utils.Logger.Error(err) - return res, err - } - res.RequestInfo = resultStr - res.ErrorCode = JdCodeFail - if _, ok := result["code"]; ok { - if result["success"].(bool) { - res.ErrorCode = dao.StatusOkString - } - - res.ApiErrorMsg = utils.GetStringByMap(result, "subMsg") - if _, ok := postData["requestId"]; ok { - res.RequestID = postData["requestId"].(string) - } - - // 成功 → 提取运单号 - if res.ErrorCode == dao.StatusOkString { - res.WaybillNo = append(res.WaybillNo, utils.GetStringByMap(result["data"].(map[string]interface{}), "waybillCode")) - } - } else if _, ok := result["statusCode"]; ok { - if result["statusCode"].(float64) == utils.NumberZero { - res.ErrorCode = dao.StatusOkString - } - res.ApiErrorMsg = utils.GetStringByMap(result, "statusMessage") - } - if msgData, ok := result["data"].(map[string]interface{}); ok { - res.RequestQuery = msgData - } - utils.Logger.Error(res) - utils.Logger.Error(result) - return res, nil -} - -func (c *JdClient) subscribe(referenceNumber string) bool { - data := map[string]interface{}{ - "referenceNumber": referenceNumber, - "referenceType": "20000", - } - res := TransitResult{} - // 发送请求 - resultStr, err := c.sendPost(JdServiceBackUrl, JdLopDNBackECAP, data) - utils.Logger.Error(data) - if err != nil { - utils.Logger.Error(err) - return false - } - var result map[string]interface{} - if err = json.Unmarshal([]byte(resultStr), &result); err != nil { - utils.Logger.Error(err) - return false - } - res.RequestInfo = resultStr - res.ErrorCode = JdCodeFail - if _, ok := result["code"]; ok { - if result["code"].(float64) == 1000 { - res.ErrorCode = dao.StatusOkString - } else { - utils.Logger.Error(result) - } - - res.ApiErrorMsg = utils.GetStringByMap(result, "msg") - } - utils.Logger.Error(resultStr) - - return true -} - -func (c *JdClient) sendDown(uri string, postData map[string]interface{}, billCodeValue string) (TransitResult, error) { - res := TransitResult{} - // 发送请求 - resultStr, err := c.sendPost(uri, JdPrintECAP, postData) - if err != nil { - return res, err - } - - var result map[string]interface{} - if err = json.Unmarshal([]byte(resultStr), &result); err != nil { - return res, err - } - res.RequestInfo = resultStr - res.ErrorCode = JdCodeFail - if _, ok := result["code"]; ok { - if result["code"].(float64) == 1000 { - res.ErrorCode = dao.StatusOkString - } - - res.ApiErrorMsg = utils.GetStringByMap(result, "msg") - - // 成功 → 获取内容 - if res.ErrorCode == dao.StatusOkString { - resultArr, ok := result["result"].([]interface{}) - if ok && len(resultArr) > utils.NumberZero { - firstItem, ok := resultArr[utils.NumberZero].(map[string]interface{}) - if ok { - // 3. 从第一条数据里取出 url - url := utils.GetStringByMap(firstItem, "url") - res.Files = append(res.Files, TransitFiles{ - Url: url, - WaybillNo: billCodeValue, - }) - } - } - } - } - if msgData, ok := result["data"].(map[string]interface{}); ok { - res.RequestQuery = msgData - } - - return res, nil -} diff --git a/utils/transit/sf.go b/utils/transit/sf.go deleted file mode 100644 index 87274e2..0000000 --- a/utils/transit/sf.go +++ /dev/null @@ -1,458 +0,0 @@ -package transit - -import ( - "base-service/app/dao" - "base-service/utils" - "crypto/md5" - "encoding/base64" - "encoding/json" - "fmt" - "io" - "math/rand" - "net/http" - "net/url" - "strings" - "time" -) - -// SfClient 顺丰快递客户端 -type SfClient struct { - config dao.TransitSend -} - -const ( - SfServiceOrder = "EXP_RECE_CREATE_ORDER" //下订单 - SfServiceOrderConfirm = "EXP_RECE_UPDATE_ORDER" //取消订单 - SfServiceOrderQueryByMailNo = "EXP_RECE_SEARCH_ROUTES" //路由查询-通过运单号-通过订单号 - SfServiceOrderEstimated = "EXP_RECE_SEARCH_PROMITM" //预计派送时间 - SfServiceOrderWaybills = "COM_RECE_CLOUD_PRINT_WAYBILLS" //快递单下载 - - SfContactTypeA = 1 //发货方 - SfContactTypeB = 2 //收货方 - SfCN = "CN" - SfLanguage = "zh-CN" - SfWaybillTypeMaster = 1 //母订单 - SfWaybillTypeSublevel = 2 //子订单 - SfTrackingType = 2 //顾客订单号 - - SfServiceOrderConfirmKey = 2 //取消订单 - SfServiceCheckTypeCard = 2 //月结卡 - - // 以下是签收code - sfStatusThirdPartySign = "980" - sfStatusArriveHoldLost = "8000" - sfStatusExternalSign = "935" - sfStatusMultiPieceTakePhoto = "701" - sfStatusPartnerDelivered = "658" - sfStatusCustomerPickUp = "128" - sfStatusSigned = "80" -) - -// SfSingedCodeMap 已签收CODE https://open.sf-express.com/developSupport/734349?activeIndex=589678 -var SfSingedCodeMap = map[string]bool{ - sfStatusThirdPartySign: true, - sfStatusArriveHoldLost: true, - sfStatusExternalSign: true, - sfStatusMultiPieceTakePhoto: true, - sfStatusPartnerDelivered: true, - sfStatusCustomerPickUp: true, - sfStatusSigned: true, -} - -// NewSfClient 初始化顺丰客户端 -func NewSfClient(info dao.TransitSend) *SfClient { - return &SfClient{info} -} - -func (c *SfClient) Create(order dao.DeliverGoodsPrint) (TransitResult, error) { - //生成map对象 - info := c.getCreateData(order) - //生成需要提交的数据 - postData := c.getPostData(SfServiceOrder, info) - //发送请求 - result, err := c.send(postData) - if err != nil { - utils.Logger.Error("SF Create Order:", err) - return result, nil - } - result.PostInfo = info - return result, nil -} - -// Query 查询物流 -func (c *SfClient) Query(orderId string) (TransitResult, error) { - data := map[string]interface{}{ - //1:根据顺丰运单号查询,trackingNumber将被当作顺丰运单号处理 - //2:根据客户订单号查询,trackingNumber将被当作客户订单号处理 - "trackingType": SfTrackingType, - "trackingNumber": orderId, - } - bytes, _ := json.Marshal(data) - //生成需要提交的数据 - postData := c.getPostData(SfServiceOrderQueryByMailNo, string(bytes)) - //发送请求 - result, err := c.send(postData) - if err != nil { - utils.Logger.Error("SF Query Order:", err) - return result, err - } - return result, nil -} - -// DownSheet 下载面单 -func (c *SfClient) DownSheet(orders []string, info dao.DeliverGoodsPrint) (TransitResult, error) { - var documents []map[string]interface{} - sum := len(orders) - for key, order := range orders { - tmp := make(map[string]interface{}) - tmp["masterWaybillNo"] = order - if sum > 1 { - tmp["branchWaybillNo"] = order - tmp["sum"] = sum - tmp["seq"] = key + 1 - } - documents = append(documents, tmp) - if utils.GetConfigBool("transit.sf_test") { - break - } - } - - data := map[string]interface{}{ - "templateCode": c.config.PdfCode, - "documents": documents, - "version": "2.0", - "sync": true, - } - bytes, _ := json.Marshal(data) - //生成需要提交的数据 - postData := c.getPostData(SfServiceOrderWaybills, string(bytes)) - //发送请求 - result, err := c.sendDown(postData) - if err != nil { - utils.Logger.Error("SF Create Order:", err) - return result, err - } - result.PostInfo = string(bytes) - - return result, nil -} - -// Estimated 获取预计时间 -func (c *SfClient) Estimated(orderId, card string) (TransitResult, error) { - data := map[string]interface{}{ - "checkType": SfServiceCheckTypeCard, - "searchNo": orderId, - "checkNos": []string{card}, - } - bytes, _ := json.Marshal(data) - //生成需要提交的数据 - postData := c.getPostData(SfServiceOrderEstimated, string(bytes)) - //发送请求 - result, err := c.send(postData) - if err != nil { - utils.Logger.Error("SF estimated Order:", err) - return result, err - } - result.PostInfo = string(bytes) - return result, nil -} - -// Cancel 取消订单 -func (c *SfClient) Cancel(orderId string) (TransitResult, error) { - data := map[string]interface{}{ - "dealType": SfServiceOrderConfirmKey, - "orderId": orderId, - } - bytes, _ := json.Marshal(data) - //生成需要提交的数据 - postData := c.getPostData(SfServiceOrderConfirm, string(bytes)) - //发送请求 - result, err := c.send(postData) - if err != nil { - utils.Logger.Error("SF cancel Order:", err) - return result, err - } - result.PostInfo = string(bytes) - return result, nil -} - -func (c *SfClient) createUUID() string { - r := rand.New(rand.NewSource(time.Now().UnixNano())) - uniq := fmt.Sprintf("%d%d", r.Int(), time.Now().UnixNano()) - chars := fmt.Sprintf("%x", md5.Sum([]byte(uniq))) - - // 格式：8-4-4-4-12 - return fmt.Sprintf("%s-%s-%s-%s-%s", - chars[0:8], - chars[8:12], - chars[12:16], - chars[16:20], - chars[20:32], - ) -} - -func (c *SfClient) sendPost(apiUrl string, postData map[string]interface{}) (string, error) { - values := make(url.Values) - for k, v := range postData { - values.Set(k, fmt.Sprintf("%v", v)) - } - - client := &http.Client{Timeout: time.Duration(15*60) * time.Second} - req, _ := http.NewRequest("POST", apiUrl, strings.NewReader(values.Encode())) - req.Header.Set("Content-Type", "application/x-www-form-urlencoded;charset=utf-8") - - resp, err := client.Do(req) - if err != nil { - utils.Logger.Error("Sf:", err) - return "", err - } - defer func(Body io.ReadCloser) { - err := Body.Close() - if err != nil { - utils.Logger.Error(err) - } - }(resp.Body) - - body, _ := io.ReadAll(resp.Body) - return string(body), nil -} - -func (c *SfClient) getCreateData(order dao.DeliverGoodsPrint) string { - name := utils.GetConfigString("transit.name") - if name == "" { - name = "化妆品" - } - // 生成顺丰标准请求参数 - data := map[string]interface{}{ - "cargoDesc": name, - "expressTypeId": dao.NumberTwo, //顺丰顺丰标快 - "monthlyCard": c.config.CardNumber, // 你的月结卡号 - "orderId": order.OrderSn, // 你的订单号 - "language": SfLanguage, - "parcelQty": order.Number, - "isDocall": utils.GetConfigInt("transit.sf_call_type"), - "isReturnRoutelabel": dao.NumberOne, //是否返回路由标签： 默认1， 1：返回路由标签， 0：不返回；除部分特殊用户外，其余用户都默认返回 - "payMethod": dao.NumberOne, //付款方式，支持以下值： 1:寄方付 2:收方付 3:第三方付 - "waybillNoInfoList": []map[string]interface{}{}, - "cargoDetails": []map[string]interface{}{}, - // 寄件 + 收件 - "contactInfoList": []map[string]interface{}{ - // 寄件方 contactType=1 - { - "country": SfCN, - "company": c.config.CompanyName, - "province": c.config.Province, - "city": c.config.City, - "county": c.config.County, - "address": c.config.Address, - "contact": c.config.Contact, - "mobile": c.config.Mobile, - "contactType": SfContactTypeA, - }, - // 收件方 contactType=2 - { - "country": SfCN, - "province": order.Province, - "city": order.City, - "county": order.County, - "address": order.Address, - "contact": order.Addressee, - "mobile": order.Mobile, - "contactType": SfContactTypeB, - }, - }, - "totalWeight": order.Weight, // 用你的真实重量 - } - var nameInfo []string - if order.Number > dao.NumberZero { - num := utils.NumberZero - for _, item := range order.ProductItems { - nameInfo = append(nameInfo, fmt.Sprintf("%s*%d", item.ProductName, item.ProductNumber)) - for i := utils.NumberZero; i < item.ProductNumber; i++ { - Type := SfWaybillTypeMaster - if num > utils.NumberZero { - Type = SfWaybillTypeSublevel - } - info := make(map[string]interface{}) - info["waybillType"] = Type - if utils.GetConfigBool("transit.sf_test") { - info["waybillNo"] = "SF3191177193750" - } - info["boxNo"] = "Box" + fmt.Sprintf("%03d", num+1) - info["width"] = item.ProductWidth - info["height"] = item.ProductHeight - info["weight"] = item.ProductWeight - info["volume"] = item.ProductCubage - info["length"] = item.ProductLength - data["waybillNoInfoList"] = append(data["waybillNoInfoList"].([]map[string]interface{}), info) - num++ - if utils.GetConfigBool("transit.sf_test") { - break - } - } - if utils.GetConfigBool("transit.sf_test") { - break - } - } - } - cargoDetails := make(map[string]interface{}) - cargoDetails["name"] = name - if len(nameInfo) > dao.NumberZero { - cargoDetails["name"] = strings.Join(nameInfo, ",") - data["remark"] = strings.Join(nameInfo, ",") - } - cargoDetails["count"] = order.Number - data["cargoDetails"] = append(data["cargoDetails"].([]map[string]interface{}), cargoDetails) - - bytes, _ := json.Marshal(data) - return string(bytes) -} - -func (c *SfClient) getPostData(serviceCode string, msgData string) map[string]interface{} { - requestID := c.createUUID() - timestamp := fmt.Sprintf("%d", time.Now().Unix()) - - // 签名逻辑：md5( urlencode(msgData + timestamp + code ) ) → base64 - raw := url.QueryEscape(msgData + timestamp + c.config.AppSecretKey) - md5Val := md5.Sum([]byte(raw)) - msgDigest := base64.StdEncoding.EncodeToString(md5Val[:]) - - return map[string]interface{}{ - "partnerID": c.config.AppCode, - "requestID": requestID, - "serviceCode": serviceCode, - "timestamp": timestamp, - "msgDigest": msgDigest, - "msgData": msgData, - } -} - -func (c *SfClient) send(postData map[string]interface{}) (TransitResult, error) { - res := TransitResult{} - // 发送请求 - resultStr, err := c.sendPost(c.config.AppUrl, postData) - if err != nil { - return res, err - } - - // 解析第一层JSON - var result map[string]interface{} - if err := json.Unmarshal([]byte(resultStr), &result); err != nil { - return res, err - } - - res.RequestID = postData["requestID"].(string) - res.RequestInfo = resultStr - // 读取 apiResultData - if apiResultData, ok := result["apiResultData"].(string); ok && apiResultData != "" { - var dataMap map[string]interface{} - if err := json.Unmarshal([]byte(apiResultData), &dataMap); err != nil { - return res, err - } - - res.ErrorCode = dataMap["errorCode"].(string) - res.ApiErrorMsg = utils.GetStringByMap(dataMap, "errorMsg") - res.ApiResponseID = utils.GetStringByMap(result, "apiResponseID") - // 成功 → 提取运单号 - if res.ErrorCode == "S0000" { - res.ErrorCode = dao.StatusOkString - if msgData, ok := dataMap["msgData"].(map[string]interface{}); ok { - res.RequestQuery = msgData - if list, ok := msgData["waybillNoInfoList"].([]interface{}); ok { - for _, item := range list { - if m, ok := item.(map[string]interface{}); ok { - no := utils.GetStringByMap(m, "waybillNo") - if no != "" { - res.WaybillNo = append(res.WaybillNo, no) - } - } - } - } - } - } - } else { - // 错误情况 - res.ErrorCode = utils.GetStringByMap(result, "apiResultCode") - if res.ErrorCode == "" { - res.ErrorCode = "A11111" - } - res.ApiErrorMsg = utils.GetStringByMap(result, "apiErrorMsg") - res.ApiResponseID = utils.GetStringByMap(result, "apiResponseID") - } - - return res, nil -} - -func (c *SfClient) sendDown(postData map[string]interface{}) (TransitResult, error) { - res := TransitResult{} - // 发送请求 - resultStr, err := c.sendPost(c.config.AppUrl, postData) - - if err != nil { - return res, err - } - - var result map[string]interface{} - if err := json.Unmarshal([]byte(resultStr), &result); err != nil { - return res, err - } - - res.RequestID = utils.GetStringByMap(postData, "requestID") - res.RequestInfo = resultStr - res.ApiResponseID = utils.GetStringByMap(result, "apiResponseID") - res.ApiErrorMsg = utils.GetStringByMap(result, "apiErrorMsg") - - // 外层状态 - apiResultCode := utils.GetStringByMap(result, "apiResultCode") - if apiResultCode == "A1000" { - // 接口调用成功 - res.ErrorCode = dao.StatusOkString - } else { - res.ErrorCode = apiResultCode - return res, nil - } - - apiResultData := utils.GetStringByMap(result, "apiResultData") - if apiResultData == "" { - return res, nil - } - - var dataMap map[string]interface{} - if err := json.Unmarshal([]byte(apiResultData), &dataMap); err != nil { - return res, err - } - - // ====================== - // 正确解析顺丰云打印结构 - // ====================== - success := false - if val, ok := dataMap["success"].(bool); ok { - success = val - } - if success { - res.ErrorCode = dao.StatusOkString - // 读取 obj -> files - if obj, ok := dataMap["obj"].(map[string]interface{}); ok { - if files, ok := obj["files"].([]interface{}); ok { - for _, item := range files { - if m, ok := item.(map[string]interface{}); ok { - - waybillNo := utils.GetStringByMap(m, "waybillNo") - res.Files = append(res.Files, TransitFiles{ - File: utils.GetStringByMap(m, "waybillNo"), - Url: utils.GetStringByMap(m, "url"), - Token: utils.GetStringByMap(m, "token"), - WaybillNo: waybillNo, - }) - - res.WaybillNo = append(res.WaybillNo, waybillNo) - } - } - } - } - } else { - res.ErrorCode = "FAIL" - } - - return res, nil -}