diff --git a/go.mod b/go.mod index c2b178c9..a6fff593 100644 --- a/go.mod +++ b/go.mod @@ -25,13 +25,6 @@ require ( github.com/sirupsen/logrus v1.8.1 github.com/tencentyun/cos-go-sdk-v5 v0.7.35 github.com/upyun/go-sdk/v3 v3.0.2 - go.dtapp.net/goip v1.0.16 - go.dtapp.net/gojson v1.0.0 - go.dtapp.net/golog v1.0.13 - go.dtapp.net/gomongo v1.0.8 - go.dtapp.net/goredis v1.0.0 - go.dtapp.net/gostring v1.0.3 - go.dtapp.net/gotime v1.0.2 go.etcd.io/etcd/client/v3 v3.5.4 go.mongodb.org/mongo-driver v1.9.1 go.uber.org/zap v1.21.0 @@ -46,6 +39,7 @@ require ( require ( github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect + github.com/bitly/go-simplejson v0.5.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/clbanning/mxj v1.8.4 // indirect github.com/coreos/go-semver v0.3.0 // indirect @@ -83,6 +77,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mozillazg/go-httpheader v0.3.1 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/saracen/go7z-fixtures v0.0.0-20190623165746-aa6b8fba1d2f // indirect github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f // indirect github.com/ugorji/go/codec v1.2.7 // indirect github.com/ulikunitz/xz v0.5.10 // indirect @@ -90,7 +85,6 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - go.dtapp.net/gorequest v1.0.19 // indirect go.etcd.io/etcd/api/v3 v3.5.4 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect go.uber.org/atomic v1.9.0 // indirect diff --git a/go.sum b/go.sum index 9603a204..a99c4cee 100644 --- a/go.sum +++ b/go.sum @@ -35,6 +35,7 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= +github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -104,7 +105,6 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-playground/validator/v10 v10.8.0 h1:1kAa0fCrnpv+QYdkdcRzrRM7AyYs5o8+jZdJCz9xj6k= github.com/go-playground/validator/v10 v10.8.0/go.mod h1:9JhgTzTaE31GZDpH/HSvHiRJrJ3iKAgqqH0Bl/Ocjdk= github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw= github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= @@ -126,7 +126,6 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0kt github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 h1:+eHOFJl1BaXrQxKX+T06f78590z4qA2ZzBTqahsKSE4= github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -156,8 +155,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= @@ -242,7 +241,6 @@ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/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= @@ -280,7 +278,6 @@ github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcncea github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= @@ -295,7 +292,6 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ 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 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= 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= @@ -355,6 +351,7 @@ github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThC github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda h1:h+YpzUB/bGVJcLqW+d5GghcCmE/A25KbzjXvWJQi/+o= github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda/go.mod h1:MSotTrCv1PwoR8QgU1JurEx+lNNbtr25I+m0zbLyAGw= github.com/saracen/go7z-fixtures v0.0.0-20190623165746-aa6b8fba1d2f h1:PF9WV5j/x6MT+x/sauUHd4objCvJbZb0wdxZkHSdd5A= +github.com/saracen/go7z-fixtures v0.0.0-20190623165746-aa6b8fba1d2f/go.mod h1:6Ff0ADODZ6S3gYepgZ2w7OqFrTqtFcfwDUhmm8jsUhs= github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f h1:1cJITU3JUI8qNS5T0BlXwANsVdyoJQHQ4hvOxbunPCw= github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f/go.mod h1:LyBTue+RWeyIfN3ZJ4wVxvDuvlGJtDgCLgCb6HCPgps= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= @@ -388,7 +385,6 @@ github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= -github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= @@ -411,24 +407,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -go.dtapp.net/goip v1.0.16 h1:jJoXeLVc8BmlKEc+4T9mL2BFK63RJFd4B9xTMYhFRqg= -go.dtapp.net/goip v1.0.16/go.mod h1:BY2Xo5clizPZFQ8CYOlgg91fHMZR1Ll54f3P0sNHxbg= -go.dtapp.net/gojson v1.0.0 h1:jmRjeWChRyv2tKEByHvnW3kXh1jUcL8B7VurV0Zbygc= -go.dtapp.net/gojson v1.0.0/go.mod h1:TkkpTNxHBKxul0e7gC5MrL1K4ICFB9mQ7wHzjBah3/k= -go.dtapp.net/golog v1.0.13 h1:SnU6G4onDYZPOfZ9cgmj5rHdtGGOWP/Qee31aM49Wj0= -go.dtapp.net/golog v1.0.13/go.mod h1:6w5Lt1x6/yUN3iptAi59irm4kqDJHaolDsrZ9ApsZUQ= -go.dtapp.net/gomongo v1.0.8 h1:tuWHIpCVGIw/JFspczwOZRyeOEyl4zOcauZO6tgKbes= -go.dtapp.net/gomongo v1.0.8/go.mod h1:QlYy1xEY48BBxwuRVV3TAzMn+OwgKp8NXWIF5Z4X70k= -go.dtapp.net/goredis v1.0.0 h1:IvoOvdPeQlT2UR6lbumr+zN0x7ikTz9ro7od7jydD2U= -go.dtapp.net/goredis v1.0.0/go.mod h1:Wmrgb5yfbV7SiIK0NLdBOFWKnrQs+5g8p3t5+cjQkMM= -go.dtapp.net/gorequest v1.0.18 h1:NAogmkEbz4Sln4tt6Li8tF99d3WnHMkbPuYFdNz/xTE= -go.dtapp.net/gorequest v1.0.18/go.mod h1:EwOfdfxsWPszOWrphCWHTN4DbYtU6fyQ/fuWQyQwSnk= -go.dtapp.net/gorequest v1.0.19 h1:ZBkXb/oD59aChfzHfReK6M3M4eu3dwpaPTefe1c8P90= -go.dtapp.net/gorequest v1.0.19/go.mod h1:EwOfdfxsWPszOWrphCWHTN4DbYtU6fyQ/fuWQyQwSnk= -go.dtapp.net/gostring v1.0.3 h1:KSOq4D77/g5yZN/bqWfZ0kOOaPr/P1240vg03+XdENI= -go.dtapp.net/gostring v1.0.3/go.mod h1:+ggrOvgQDQturi1QGsXEpyRN/ZPoRDaqhMujIk5lrgQ= -go.dtapp.net/gotime v1.0.2 h1:CFIJHQXC/4t9bsJhk2cLhjHd6rpdPcJXr8BcHKHDuQo= -go.dtapp.net/gotime v1.0.2/go.mod h1:Gq7eNLr2iMLP18UNWONRq4V3Uhf/ADp4bIrS+Tc6ktY= go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg= @@ -603,7 +581,6 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20220526192754-51939a95c655 h1:56rmjc5LUAanErbiNrY+s/Nd47wDQEJkpqS7i43M1I0= google.golang.org/genproto v0.0.0-20220526192754-51939a95c655/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= @@ -613,7 +590,6 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= @@ -627,7 +603,6 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= diff --git a/service/dingdanxia/app.go b/service/dingdanxia/app.go index f0a85e09..de9b012d 100644 --- a/service/dingdanxia/app.go +++ b/service/dingdanxia/app.go @@ -1,7 +1,7 @@ package dingdanxia import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" diff --git a/service/dingdanxia/mongo.go b/service/dingdanxia/mongo.go index 21b0b293..9060bac5 100644 --- a/service/dingdanxia/mongo.go +++ b/service/dingdanxia/mongo.go @@ -1,7 +1,7 @@ package dingdanxia import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/dingdanxia/pgsql.go b/service/dingdanxia/pgsql.go index e03bff17..42e9d505 100644 --- a/service/dingdanxia/pgsql.go +++ b/service/dingdanxia/pgsql.go @@ -1,8 +1,8 @@ package dingdanxia import ( - "go.dtapp.net/golog" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/dingtalk/app.go b/service/dingtalk/app.go index 108e5784..861ab112 100644 --- a/service/dingtalk/app.go +++ b/service/dingtalk/app.go @@ -1,7 +1,7 @@ package dingtalk import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/dingtalk/pgsql.go b/service/dingtalk/pgsql.go index fc9fc7ae..7ab9147e 100644 --- a/service/dingtalk/pgsql.go +++ b/service/dingtalk/pgsql.go @@ -1,8 +1,8 @@ package dingtalk import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/douyin/app.go b/service/douyin/app.go index 787c1f0b..69666757 100644 --- a/service/douyin/app.go +++ b/service/douyin/app.go @@ -2,7 +2,7 @@ package douyin import ( "errors" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" "net/http" diff --git a/service/douyin/pgsql.go b/service/douyin/pgsql.go index 5f86f31e..57f12fa3 100644 --- a/service/douyin/pgsql.go +++ b/service/douyin/pgsql.go @@ -1,8 +1,8 @@ package douyin import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/eastiot/app.go b/service/eastiot/app.go index 0f971ffb..4946bee1 100644 --- a/service/eastiot/app.go +++ b/service/eastiot/app.go @@ -1,8 +1,8 @@ package eastiot import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" "time" diff --git a/service/eastiot/mongo.go b/service/eastiot/mongo.go index 9fe05482..53330713 100644 --- a/service/eastiot/mongo.go +++ b/service/eastiot/mongo.go @@ -1,7 +1,7 @@ package eastiot import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/eastiot/pgsql.go b/service/eastiot/pgsql.go index 5c5bf93c..1a182091 100644 --- a/service/eastiot/pgsql.go +++ b/service/eastiot/pgsql.go @@ -1,8 +1,8 @@ package eastiot import ( - "go.dtapp.net/golog" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/ejiaofei/app.go b/service/ejiaofei/app.go index 07f6bf39..42a8216b 100644 --- a/service/ejiaofei/app.go +++ b/service/ejiaofei/app.go @@ -2,9 +2,9 @@ package ejiaofei import ( "fmt" - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gomd5" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/ejiaofei/mongo.go b/service/ejiaofei/mongo.go index 85dc66a6..a668041f 100644 --- a/service/ejiaofei/mongo.go +++ b/service/ejiaofei/mongo.go @@ -1,7 +1,7 @@ package ejiaofei import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/ejiaofei/pgsql.go b/service/ejiaofei/pgsql.go index bde70bcc..7953f43e 100644 --- a/service/ejiaofei/pgsql.go +++ b/service/ejiaofei/pgsql.go @@ -1,9 +1,9 @@ package ejiaofei import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/feishu/app.go b/service/feishu/app.go index 66962a34..03b7601d 100644 --- a/service/feishu/app.go +++ b/service/feishu/app.go @@ -1,7 +1,7 @@ package feishu import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/feishu/pgsql.go b/service/feishu/pgsql.go index 39411f09..b313ed92 100644 --- a/service/feishu/pgsql.go +++ b/service/feishu/pgsql.go @@ -1,8 +1,8 @@ package feishu import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/jd/app.go b/service/jd/app.go index 62527687..38575bf6 100644 --- a/service/jd/app.go +++ b/service/jd/app.go @@ -1,9 +1,9 @@ package jd import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" - "go.dtapp.net/gostring" + "go.dtapp.net/library/utils/gostring" "gorm.io/gorm" ) diff --git a/service/jd/pgsql.go b/service/jd/pgsql.go index 83e55317..39a439a2 100644 --- a/service/jd/pgsql.go +++ b/service/jd/pgsql.go @@ -1,8 +1,8 @@ package jd import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/kashangwl/app.go b/service/kashangwl/app.go index 8f740c9e..a6e62c38 100644 --- a/service/kashangwl/app.go +++ b/service/kashangwl/app.go @@ -1,7 +1,7 @@ package kashangwl import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" "time" diff --git a/service/kashangwl/pgsql.go b/service/kashangwl/pgsql.go index 77ecb339..b0f1a24a 100644 --- a/service/kashangwl/pgsql.go +++ b/service/kashangwl/pgsql.go @@ -1,9 +1,9 @@ package kashangwl import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/kuaishou/app.go b/service/kuaishou/app.go index 61b9d357..a527c29b 100644 --- a/service/kuaishou/app.go +++ b/service/kuaishou/app.go @@ -1,8 +1,8 @@ package kuaishou import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/kuaishou/mongo.go b/service/kuaishou/mongo.go index d9264b9a..b85c82fe 100644 --- a/service/kuaishou/mongo.go +++ b/service/kuaishou/mongo.go @@ -1,7 +1,7 @@ package kuaishou import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/kuaishou/pgsql.go b/service/kuaishou/pgsql.go index 53e28eca..01464062 100644 --- a/service/kuaishou/pgsql.go +++ b/service/kuaishou/pgsql.go @@ -1,8 +1,8 @@ package kuaishou import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/leshuazf/app.go b/service/leshuazf/app.go index 3df291de..e4160e46 100644 --- a/service/leshuazf/app.go +++ b/service/leshuazf/app.go @@ -1,10 +1,10 @@ package leshuazf import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" - "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorandom" + "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gotime" "gorm.io/gorm" ) diff --git a/service/leshuazf/mongo.go b/service/leshuazf/mongo.go index b96692c4..b020187e 100644 --- a/service/leshuazf/mongo.go +++ b/service/leshuazf/mongo.go @@ -1,7 +1,7 @@ package leshuazf import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/leshuazf/pgsql.go b/service/leshuazf/pgsql.go index c15f5a14..046f2409 100644 --- a/service/leshuazf/pgsql.go +++ b/service/leshuazf/pgsql.go @@ -1,8 +1,8 @@ package leshuazf import ( - "go.dtapp.net/golog" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/meituan/app.go b/service/meituan/app.go index 35fe189c..3f140a2d 100644 --- a/service/meituan/app.go +++ b/service/meituan/app.go @@ -1,7 +1,7 @@ package meituan import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/meituan/pgsql.go b/service/meituan/pgsql.go index 8b5d732d..97e9464f 100644 --- a/service/meituan/pgsql.go +++ b/service/meituan/pgsql.go @@ -1,8 +1,8 @@ package meituan import ( - "go.dtapp.net/golog" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/pconline/app.go b/service/pconline/app.go index 1a1f6791..ff8c427d 100644 --- a/service/pconline/app.go +++ b/service/pconline/app.go @@ -1,8 +1,8 @@ package pconline import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/pconline/mongo.go b/service/pconline/mongo.go index f9f7fb36..bc500bc0 100644 --- a/service/pconline/mongo.go +++ b/service/pconline/mongo.go @@ -1,7 +1,7 @@ package pconline import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/pconline/pgsql.go b/service/pconline/pgsql.go index 17ade96b..3acee624 100644 --- a/service/pconline/pgsql.go +++ b/service/pconline/pgsql.go @@ -1,9 +1,9 @@ package pconline import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/pinduoduo/app.go b/service/pinduoduo/app.go index 2c3bb57d..d6e1dc1b 100644 --- a/service/pinduoduo/app.go +++ b/service/pinduoduo/app.go @@ -2,9 +2,9 @@ package pinduoduo import ( "fmt" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" - "go.dtapp.net/gostring" + "go.dtapp.net/library/utils/gostring" "gorm.io/gorm" "regexp" "strconv" diff --git a/service/pinduoduo/pgsql.go b/service/pinduoduo/pgsql.go index f4338bf6..e4e2ffd5 100644 --- a/service/pinduoduo/pgsql.go +++ b/service/pinduoduo/pgsql.go @@ -1,8 +1,8 @@ package pinduoduo import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/pintoto/app.go b/service/pintoto/app.go index 1c4b4e51..9427d8b7 100644 --- a/service/pintoto/app.go +++ b/service/pintoto/app.go @@ -1,8 +1,8 @@ package pintoto import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" "math" diff --git a/service/pintoto/mongo.go b/service/pintoto/mongo.go index 32125079..5d640275 100644 --- a/service/pintoto/mongo.go +++ b/service/pintoto/mongo.go @@ -1,7 +1,7 @@ package pintoto import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/pintoto/pgsql.go b/service/pintoto/pgsql.go index 12ad8f95..be5b1bbb 100644 --- a/service/pintoto/pgsql.go +++ b/service/pintoto/pgsql.go @@ -1,8 +1,8 @@ package pintoto import ( - "go.dtapp.net/golog" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/sendcloud/app.go b/service/sendcloud/app.go index 08de8c6f..9195a752 100644 --- a/service/sendcloud/app.go +++ b/service/sendcloud/app.go @@ -1,8 +1,8 @@ package sendcloud import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) @@ -14,7 +14,7 @@ type App struct { mongo *gomongo.Client // 日志数据库 pgsql *gorm.DB // pgsql数据库 client *gorequest.App // 请求客户端 - log *golog.Client // 日志服务 + log *golog.Api // 日志服务 logTableName string // 日志表名 logStatus bool // 日志状态 } @@ -26,7 +26,10 @@ func NewApp(apiUser string, apiKey string, pgsql *gorm.DB) *App { app.pgsql = pgsql app.logStatus = true app.logTableName = "sendcloud" - app.log = golog.NewClientApi(pgsql, app.logTableName) + app.log = golog.NewApi(&golog.ApiConfig{ + Db: pgsql, + TableName: app.logTableName, + }) } return app } @@ -60,9 +63,6 @@ func (app *App) request(url string, params map[string]interface{}, method string } // 日志 - if app.mongo != nil && app.mongo.Db != nil { - go app.mongoLog(request) - } if app.logStatus == true { go app.postgresqlLog(request) } diff --git a/service/sendcloud/mongo.go b/service/sendcloud/mongo.go index 2fefc9e8..a7fe3dab 100644 --- a/service/sendcloud/mongo.go +++ b/service/sendcloud/mongo.go @@ -1,7 +1,7 @@ package sendcloud import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/sendcloud/pgsql.go b/service/sendcloud/pgsql.go index 86bcc79c..bf747561 100644 --- a/service/sendcloud/pgsql.go +++ b/service/sendcloud/pgsql.go @@ -1,15 +1,15 @@ package sendcloud import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) // 记录日志 func (app *App) postgresqlLog(request gorequest.Response) { - app.log.Api.Record(golog.ApiPostgresqlLog{ + app.log.Record(golog.ApiPostgresqlLog{ RequestTime: request.RequestTime, //【请求】时间 RequestUri: request.RequestUri, //【请求】链接 RequestUrl: gorequest.UriParse(request.RequestUri).Url, //【请求】链接 diff --git a/service/taobao/app.go b/service/taobao/app.go index 9064213b..2329fa47 100644 --- a/service/taobao/app.go +++ b/service/taobao/app.go @@ -2,9 +2,9 @@ package taobao import ( "fmt" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" - "go.dtapp.net/gostring" + "go.dtapp.net/library/utils/gostring" "gorm.io/gorm" "regexp" "strconv" diff --git a/service/taobao/pgsql.go b/service/taobao/pgsql.go index d2ea2de3..aecccdd2 100644 --- a/service/taobao/pgsql.go +++ b/service/taobao/pgsql.go @@ -1,8 +1,8 @@ package taobao import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatminiprogram/app.go b/service/wechatminiprogram/app.go index 50cbb391..f8d5d2aa 100644 --- a/service/wechatminiprogram/app.go +++ b/service/wechatminiprogram/app.go @@ -1,9 +1,9 @@ package wechatminiprogram import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/goredis" + "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wechatminiprogram/pgsql.go b/service/wechatminiprogram/pgsql.go index 0dec1504..a7dcc8fb 100644 --- a/service/wechatminiprogram/pgsql.go +++ b/service/wechatminiprogram/pgsql.go @@ -1,9 +1,9 @@ package wechatminiprogram import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatoffice/app.go b/service/wechatoffice/app.go index 0d7766e5..b07d9431 100644 --- a/service/wechatoffice/app.go +++ b/service/wechatoffice/app.go @@ -1,9 +1,9 @@ package wechatoffice import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/goredis" + "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wechatoffice/pgsql.go b/service/wechatoffice/pgsql.go index 325f772e..4b1ca70d 100644 --- a/service/wechatoffice/pgsql.go +++ b/service/wechatoffice/pgsql.go @@ -1,9 +1,9 @@ package wechatoffice import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatopen/app.go b/service/wechatopen/app.go index 5072d057..9ca8854a 100644 --- a/service/wechatopen/app.go +++ b/service/wechatopen/app.go @@ -1,9 +1,9 @@ package wechatopen import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/goredis" + "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wechatopen/pgsql.go b/service/wechatopen/pgsql.go index 3d859da7..651f56df 100644 --- a/service/wechatopen/pgsql.go +++ b/service/wechatopen/pgsql.go @@ -1,9 +1,9 @@ package wechatopen import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatpayapiv2/app.go b/service/wechatpayapiv2/app.go index 693bd5c8..5bf50bdc 100644 --- a/service/wechatpayapiv2/app.go +++ b/service/wechatpayapiv2/app.go @@ -2,8 +2,8 @@ package wechatpayapiv2 import ( "crypto/tls" - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wechatpayapiv2/mongodb.go b/service/wechatpayapiv2/mongodb.go index 576fd6af..95aab8be 100644 --- a/service/wechatpayapiv2/mongodb.go +++ b/service/wechatpayapiv2/mongodb.go @@ -1,7 +1,7 @@ package wechatpayapiv2 import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/wechatpayapiv2/pgsql.go b/service/wechatpayapiv2/pgsql.go index c069a27a..a7657a34 100644 --- a/service/wechatpayapiv2/pgsql.go +++ b/service/wechatpayapiv2/pgsql.go @@ -1,10 +1,10 @@ package wechatpayapiv2 import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatpayapiv3/app.go b/service/wechatpayapiv3/app.go index ecf0f8ac..e85fd8d7 100644 --- a/service/wechatpayapiv3/app.go +++ b/service/wechatpayapiv3/app.go @@ -1,8 +1,8 @@ package wechatpayapiv3 import ( - "go.dtapp.net/golog" - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" "net/http" diff --git a/service/wechatpayapiv3/mongo.go b/service/wechatpayapiv3/mongo.go index c37a3559..bb944894 100644 --- a/service/wechatpayapiv3/mongo.go +++ b/service/wechatpayapiv3/mongo.go @@ -1,7 +1,7 @@ package wechatpayapiv3 import ( - "go.dtapp.net/gomongo" + "go.dtapp.net/library/utils/gomongo" "go.dtapp.net/library/utils/gorequest" "net/http" ) diff --git a/service/wechatpayapiv3/pgsql.go b/service/wechatpayapiv3/pgsql.go index 49f06da5..a35e6f3b 100644 --- a/service/wechatpayapiv3/pgsql.go +++ b/service/wechatpayapiv3/pgsql.go @@ -1,9 +1,9 @@ package wechatpayapiv3 import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatpayopen/app.go b/service/wechatpayopen/app.go index c3da61a9..fa860a00 100644 --- a/service/wechatpayopen/app.go +++ b/service/wechatpayopen/app.go @@ -1,7 +1,7 @@ package wechatpayopen import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wechatpayopen/pgsql.go b/service/wechatpayopen/pgsql.go index 64967cd8..af6038e7 100644 --- a/service/wechatpayopen/pgsql.go +++ b/service/wechatpayopen/pgsql.go @@ -1,9 +1,9 @@ package wechatpayopen import ( - "go.dtapp.net/golog" - "go.dtapp.net/library/utils/gorequest" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatqy/app.go b/service/wechatqy/app.go index 79308b98..218ac66a 100644 --- a/service/wechatqy/app.go +++ b/service/wechatqy/app.go @@ -1,7 +1,7 @@ package wechatqy import ( - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wechatqy/pgsql.go b/service/wechatqy/pgsql.go index 79f8aa77..c804d438 100644 --- a/service/wechatqy/pgsql.go +++ b/service/wechatqy/pgsql.go @@ -1,8 +1,8 @@ package wechatqy import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/wechatunion/app.go b/service/wechatunion/app.go index 791db038..3a8aeec0 100644 --- a/service/wechatunion/app.go +++ b/service/wechatunion/app.go @@ -1,8 +1,8 @@ package wechatunion import ( - "go.dtapp.net/golog" - "go.dtapp.net/goredis" + "go.dtapp.net/library/utils/golog" + "go.dtapp.net/library/utils/goredis" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wechatunion/pgsql.go b/service/wechatunion/pgsql.go index 543d812e..875f0fdb 100644 --- a/service/wechatunion/pgsql.go +++ b/service/wechatunion/pgsql.go @@ -1,8 +1,8 @@ package wechatunion import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/weishi/pgsql.go b/service/weishi/pgsql.go index e30afed4..3d16c999 100644 --- a/service/weishi/pgsql.go +++ b/service/weishi/pgsql.go @@ -1,8 +1,8 @@ package weishi import ( - "go.dtapp.net/gojson" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/service/weishi/weishi.go b/service/weishi/weishi.go index d117c4f8..14c3e5a8 100644 --- a/service/weishi/weishi.go +++ b/service/weishi/weishi.go @@ -2,7 +2,7 @@ package weishi import ( "errors" - "go.dtapp.net/golog" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" "net/http" diff --git a/service/wikeyun/app.go b/service/wikeyun/app.go index ac28a5de..db22b06b 100644 --- a/service/wikeyun/app.go +++ b/service/wikeyun/app.go @@ -2,8 +2,8 @@ package wikeyun import ( "fmt" - "go.dtapp.net/golog" "go.dtapp.net/library/utils/goip" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/gorm" ) diff --git a/service/wikeyun/pgsql.go b/service/wikeyun/pgsql.go index cf59d940..95666340 100644 --- a/service/wikeyun/pgsql.go +++ b/service/wikeyun/pgsql.go @@ -1,8 +1,8 @@ package wikeyun import ( - "go.dtapp.net/golog" "go.dtapp.net/library/utils/gojson" + "go.dtapp.net/library/utils/golog" "go.dtapp.net/library/utils/gorequest" "gorm.io/datatypes" ) diff --git a/utils/goip/goip.go b/utils/goip/goip.go index 818d6290..2ebb7a3d 100644 --- a/utils/goip/goip.go +++ b/utils/goip/goip.go @@ -1,9 +1,9 @@ package goip import ( - "go.dtapp.net/goip/ip2region" - v4 "go.dtapp.net/goip/v4" - v6 "go.dtapp.net/goip/v6" + "go.dtapp.net/library/utils/goip/ip2region" + v4 "go.dtapp.net/library/utils/goip/v4" + v6 "go.dtapp.net/library/utils/goip/v6" "log" "strings" ) diff --git a/vendor/go.dtapp.net/golog/api.go b/utils/golog/api.go similarity index 98% rename from vendor/go.dtapp.net/golog/api.go rename to utils/golog/api.go index a6c12a71..769bf4c2 100644 --- a/vendor/go.dtapp.net/golog/api.go +++ b/utils/golog/api.go @@ -1,7 +1,7 @@ package golog import ( - "go.dtapp.net/goip" + "go.dtapp.net/library/utils/goip" "gorm.io/datatypes" "gorm.io/gorm" "log" diff --git a/vendor/go.dtapp.net/golog/gin.go b/utils/golog/gin.go similarity index 99% rename from vendor/go.dtapp.net/golog/gin.go rename to utils/golog/gin.go index f7d16cec..f7169e32 100644 --- a/vendor/go.dtapp.net/golog/gin.go +++ b/utils/golog/gin.go @@ -1,7 +1,7 @@ package golog import ( - "go.dtapp.net/goip" + "go.dtapp.net/library/utils/goip" "gorm.io/datatypes" "gorm.io/gorm" "log" diff --git a/vendor/go.dtapp.net/golog/json.go b/utils/golog/json.go similarity index 100% rename from vendor/go.dtapp.net/golog/json.go rename to utils/golog/json.go diff --git a/vendor/go.dtapp.net/golog/system.go b/utils/golog/system.go similarity index 100% rename from vendor/go.dtapp.net/golog/system.go rename to utils/golog/system.go diff --git a/vendor/go.dtapp.net/golog/time.go b/utils/golog/time.go similarity index 97% rename from vendor/go.dtapp.net/golog/time.go rename to utils/golog/time.go index 57aecbd5..2050160c 100644 --- a/vendor/go.dtapp.net/golog/time.go +++ b/utils/golog/time.go @@ -4,7 +4,7 @@ import ( "database/sql/driver" "errors" "fmt" - "go.dtapp.net/gotime" + "go.dtapp.net/library/utils/gotime" "gorm.io/gorm" "gorm.io/gorm/schema" "time" diff --git a/utils/gomongo/time.go b/utils/gomongo/time.go index c384a04a..5e0c06d8 100644 --- a/utils/gomongo/time.go +++ b/utils/gomongo/time.go @@ -1,7 +1,7 @@ package gomongo import ( - "go.dtapp.net/gotime" + "go.dtapp.net/library/utils/gotime" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/bsontype" "time" diff --git a/utils/gorequest/http.go b/utils/gorequest/http.go index 7a4ef0a9..cba3351b 100644 --- a/utils/gorequest/http.go +++ b/utils/gorequest/http.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" "fmt" - "go.dtapp.net/gotime" + "go.dtapp.net/library/utils/gotime" "io" "io/ioutil" "net/http" diff --git a/utils/gorequest/params.go b/utils/gorequest/params.go index 289dc616..948ad719 100644 --- a/utils/gorequest/params.go +++ b/utils/gorequest/params.go @@ -2,7 +2,7 @@ package gorequest import ( "encoding/json" - "go.dtapp.net/gostring" + "go.dtapp.net/library/utils/gostring" "log" ) diff --git a/vendor/go.dtapp.net/goip/.drone.yml b/vendor/go.dtapp.net/goip/.drone.yml deleted file mode 100644 index 511f0fc9..00000000 --- a/vendor/go.dtapp.net/goip/.drone.yml +++ /dev/null @@ -1,11 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: test-golang - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... \ No newline at end of file diff --git a/vendor/go.dtapp.net/goip/.gitignore b/vendor/go.dtapp.net/goip/.gitignore deleted file mode 100644 index 114804cd..00000000 --- a/vendor/go.dtapp.net/goip/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.env -.git -.svn -.idea -.vscode -*.log -gomod.sh -/vendor/ diff --git a/vendor/go.dtapp.net/goip/README.md b/vendor/go.dtapp.net/goip/README.md deleted file mode 100644 index c78fc68e..00000000 --- a/vendor/go.dtapp.net/goip/README.md +++ /dev/null @@ -1,44 +0,0 @@ -

-Golang Ip -

- -📦 Golang Ip库组件 - -[comment]: <> (go) -[![godoc](https://pkg.go.dev/badge/go.dtapp.net/goip?status.svg)](https://pkg.go.dev/go.dtapp.net/goip) -[![goproxy.cn](https://goproxy.cn/stats/go.dtapp.net/goip/badges/download-count.svg)](https://goproxy.cn/stats/go.dtapp.net/goip) -[![goreportcard.com](https://goreportcard.com/badge/go.dtapp.net/goip )](https://goreportcard.com/report/go.dtapp.net/goip) -[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/go.dtapp.net/goip) - -#### 安装使用 - -```go -go get -v -u go.dtapp.net/goip -``` - -#### 导入 - -```go -import ( - "go.dtapp.net/goip" -) -``` - -```go -package main - -import ( - "go.dtapp.net/goip" - "testing" -) - -func TestGoIp(t *testing.T) { - // 获取Mac地址 - t.Log(goip.GetMacAddr()) - // 内网ip - t.Log(goip.GetInsideIp()) - // 外网ip - t.Log(goip.GetOutsideIp()) -} - -``` \ No newline at end of file diff --git a/vendor/go.dtapp.net/goip/analyse.go b/vendor/go.dtapp.net/goip/analyse.go deleted file mode 100644 index 10fcab7d..00000000 --- a/vendor/go.dtapp.net/goip/analyse.go +++ /dev/null @@ -1,89 +0,0 @@ -package goip - -import ( - "strconv" -) - -var ( - ipv4 = "IPV4" - ipv6 = "IPV6" -) - -type AnalyseResult struct { - IP string `json:"ip,omitempty"` // 输入的ip地址 - Country string `json:"country,omitempty"` // 国家或地区 - Province string `json:"province,omitempty"` // 省份 - City string `json:"city,omitempty"` // 城市 - Area string `json:"area,omitempty"` // 区域 - Isp string `json:"isp,omitempty"` // 运营商 -} - -func (c *Client) Analyse(item string) AnalyseResult { - isIp := c.isIpv4OrIpv6(item) - switch isIp { - case ipv4: - info := c.V4db.Find(item) - search, err := c.V4Region.MemorySearch(item) - if err != nil { - return AnalyseResult{ - IP: info.IP, - Country: info.Country, - Area: info.Area, - } - } else { - return AnalyseResult{ - IP: search.IP, - Country: search.Country, - Province: search.Province, - City: search.City, - Isp: info.Area, - } - } - case ipv6: - info := c.V6db.Find(item) - return AnalyseResult{ - IP: info.IP, - Country: info.Country, - Province: info.Province, - City: info.City, - Area: info.Area, - Isp: info.Isp, - } - default: - return AnalyseResult{} - } -} - -// CheckIpv4 检查数据是不是IPV4 -func (c *Client) CheckIpv4(ips string) bool { - if len(ips) > 3 { - return false - } - nums, err := strconv.Atoi(ips) - if err != nil { - return false - } - if nums < 0 || nums > 255 { - return false - } - if len(ips) > 1 && ips[0] == '0' { - return false - } - return true -} - -// CheckIpv6 检测是不是IPV6 -func (c *Client) CheckIpv6(ips string) bool { - if ips == "" { - return true - } - if len(ips) > 4 { - return false - } - for _, val := range ips { - if !((val >= '0' && val <= '9') || (val >= 'a' && val <= 'f') || (val >= 'A' && val <= 'F')) { - return false - } - } - return true -} diff --git a/vendor/go.dtapp.net/goip/goip.go b/vendor/go.dtapp.net/goip/goip.go deleted file mode 100644 index 818d6290..00000000 --- a/vendor/go.dtapp.net/goip/goip.go +++ /dev/null @@ -1,63 +0,0 @@ -package goip - -import ( - "go.dtapp.net/goip/ip2region" - v4 "go.dtapp.net/goip/v4" - v6 "go.dtapp.net/goip/v6" - "log" - "strings" -) - -type Client struct { - V4Region ip2region.Ip2Region // IPV4 - V4db v4.Pointer // IPV4 - V6db v6.Pointer // IPV6 -} - -// NewIp 实例化 -func NewIp() *Client { - app := &Client{} - v4Num := app.V4db.InitIPV4Data() - log.Printf("IPV4 库加载完成 共加载:%d 条 IP 记录\n", v4Num) - v6Num := app.V6db.InitIPV4Data() - log.Printf("IPV6 库加载完成 共加载:%d 条 IP 记录\n", v6Num) - return app -} - -func (c *Client) Ipv4(ip string) (res v4.Result, resInfo ip2region.IpInfo) { - res = c.V4db.Find(ip) - resInfo, _ = c.V4Region.MemorySearch(ip) - return res, resInfo -} - -func (c *Client) Ipv6(ip string) (res v6.Result) { - res = c.V6db.Find(ip) - return res -} - -func (c *Client) isIpv4OrIpv6(ip string) string { - if len(ip) < 7 { - return "" - } - arrIpv4 := strings.Split(ip, ".") - if len(arrIpv4) == 4 { - //. 判断IPv4 - for _, val := range arrIpv4 { - if !c.CheckIpv4(val) { - return "" - } - } - return ipv4 - } - arrIpv6 := strings.Split(ip, ":") - if len(arrIpv6) == 8 { - // 判断Ipv6 - for _, val := range arrIpv6 { - if !c.CheckIpv6(val) { - return "Neither" - } - } - return ipv6 - } - return "" -} diff --git a/vendor/go.dtapp.net/goip/ip.go b/vendor/go.dtapp.net/goip/ip.go deleted file mode 100644 index 5689de19..00000000 --- a/vendor/go.dtapp.net/goip/ip.go +++ /dev/null @@ -1,90 +0,0 @@ -package goip - -import ( - "encoding/json" - "go.dtapp.net/gorequest" - "net" -) - -// GetInsideIp 内网ip -func GetInsideIp() string { - conn, err := net.Dial("udp", "8.8.8.8:80") - if err != nil { - panic(err) - } - defer conn.Close() - - localAddr := conn.LocalAddr().(*net.UDPAddr) - return localAddr.IP.String() -} - -// Ips 获取全部网卡的全部IP -func Ips() (map[string]string, error) { - - ips := make(map[string]string) - - //返回 interface 结构体对象的列表，包含了全部网卡信息 - interfaces, err := net.Interfaces() - if err != nil { - return nil, err - } - - //遍历全部网卡 - for _, i := range interfaces { - - // Addrs() 方法返回一个网卡上全部的IP列表 - address, err := i.Addrs() - if err != nil { - return nil, err - } - - //遍历一个网卡上全部的IP列表，组合为一个字符串，放入对应网卡名称的map中 - for _, v := range address { - ips[i.Name] += v.String() + " " - } - } - return ips, nil -} - -var respGetOutsideIp struct { - Data struct { - Ip string `json:"ip"` - } `json:"data"` -} - -// GetOutsideIp 外网ip -func GetOutsideIp() (ip string) { - ip = "0.0.0.0" - get := gorequest.NewHttp() - get.SetUri("https://api.dtapp.net/ip") - response, err := get.Get() - if err != nil { - return - } - err = json.Unmarshal(response.ResponseBody, &respGetOutsideIp) - if err != nil { - return - } - if respGetOutsideIp.Data.Ip == "" { - return - } - ip = respGetOutsideIp.Data.Ip - return respGetOutsideIp.Data.Ip -} - -// GetMacAddr 获取Mac地址 -func GetMacAddr() (arrays []string) { - netInterfaces, err := net.Interfaces() - if err != nil { - return arrays - } - for _, netInterface := range netInterfaces { - addr := netInterface.HardwareAddr.String() - if len(addr) == 0 { - continue - } - - arrays = append(arrays, addr) - } - return arrays -} diff --git a/vendor/go.dtapp.net/goip/ip2region/download.go b/vendor/go.dtapp.net/goip/ip2region/download.go deleted file mode 100644 index 2e95e612..00000000 --- a/vendor/go.dtapp.net/goip/ip2region/download.go +++ /dev/null @@ -1,17 +0,0 @@ -package ip2region - -import ( - "io/ioutil" - "net/http" -) - -func getOnline() ([]byte, error) { - resp, err := http.Get("https://ghproxy.com/?q=https://github.com/lionsoul2014/ip2region/blob/master/data/ip2region.db?raw=true") - if err != nil { - return nil, err - } - defer resp.Body.Close() - - body, err := ioutil.ReadAll(resp.Body) - return body, err -} diff --git a/vendor/go.dtapp.net/goip/ip2region/ip2region.db b/vendor/go.dtapp.net/goip/ip2region/ip2region.db deleted file mode 100644 index c43f884c..00000000 Binary files a/vendor/go.dtapp.net/goip/ip2region/ip2region.db and /dev/null differ diff --git a/vendor/go.dtapp.net/goip/ip2region/ip2region.go b/vendor/go.dtapp.net/goip/ip2region/ip2region.go deleted file mode 100644 index a7678604..00000000 --- a/vendor/go.dtapp.net/goip/ip2region/ip2region.go +++ /dev/null @@ -1,177 +0,0 @@ -package ip2region - -import ( - _ "embed" - "errors" - "go.dtapp.net/gostring" - "io/ioutil" - "log" - "os" - "strconv" - "strings" -) - -const ( - IndexBlockLength = 12 -) - -type Ip2Region struct { - // db file handler - dbFileHandler *os.File - - //header block info - - headerSip []int64 - headerPtr []int64 - headerLen int64 - - // super block index info - firstIndexPtr int64 - lastIndexPtr int64 - totalBlocks int64 - - // for memory mode only - // the original db binary string - - dbFile string -} - -//go:embed ip2region.db -var dbBinStr []byte - -type IpInfo struct { - IP string `json:"ip,omitempty"` // 输入的ip地址 - CityID int64 `json:"city_id,omitempty"` // 城市ID - Country string `json:"country,omitempty"` // 国家 - Region string `json:"region,omitempty"` // 区域 - Province string `json:"province,omitempty"` // 省份 - City string `json:"city,omitempty"` // 城市 - ISP string `json:"isp,omitempty"` // 运营商 -} - -func (ip IpInfo) String() string { - return ip.IP + "|" + strconv.FormatInt(ip.CityID, 10) + "|" + ip.Country + "|" + ip.Region + "|" + ip.Province + "|" + ip.City + "|" + ip.ISP -} - -// 获取Ip信息 -func getIpInfo(ipStr string, cityId int64, line []byte) (ipInfo IpInfo) { - - lineSlice := strings.Split(string(line), "|") - length := len(lineSlice) - ipInfo.CityID = cityId - if length < 5 { - for i := 0; i <= 5-length; i++ { - lineSlice = append(lineSlice, "") - } - } - - if lineSlice[0] != "0" { - ipInfo.Country = gostring.SpaceAndLineBreak(lineSlice[0]) - } - if lineSlice[1] != "0" { - ipInfo.Region = gostring.SpaceAndLineBreak(lineSlice[1]) - } - if lineSlice[2] != "0" { - ipInfo.Province = gostring.SpaceAndLineBreak(lineSlice[2]) - } - if lineSlice[3] != "0" { - ipInfo.City = gostring.SpaceAndLineBreak(lineSlice[3]) - } - if lineSlice[4] != "0" { - ipInfo.ISP = gostring.SpaceAndLineBreak(lineSlice[4]) - } - - ipInfo.IP = ipStr - return ipInfo -} - -// MemorySearch memory算法：整个数据库全部载入内存，单次查询都在0.1x毫秒内 -func (r *Ip2Region) MemorySearch(ipStr string) (ipInfo IpInfo, err error) { - - ipInfo.IP = ipStr - - if r.totalBlocks == 0 { - - if err != nil { - - return ipInfo, err - } - - r.firstIndexPtr = getLong(dbBinStr, 0) - r.lastIndexPtr = getLong(dbBinStr, 4) - r.totalBlocks = (r.lastIndexPtr-r.firstIndexPtr)/IndexBlockLength + 1 - } - - ip, err := ip2long(ipStr) - if err != nil { - return ipInfo, err - } - - h := r.totalBlocks - var dataPtr, l int64 - for l <= h { - - m := (l + h) >> 1 - p := r.firstIndexPtr + m*IndexBlockLength - sip := getLong(dbBinStr, p) - if ip < sip { - h = m - 1 - } else { - eip := getLong(dbBinStr, p+4) - if ip > eip { - l = m + 1 - } else { - dataPtr = getLong(dbBinStr, p+8) - break - } - } - } - if dataPtr == 0 { - return ipInfo, errors.New("not found") - } - - dataLen := (dataPtr >> 24) & 0xFF - dataPtr = dataPtr & 0x00FFFFFF - ipInfo = getIpInfo(ipStr, getLong(dbBinStr, dataPtr), dbBinStr[(dataPtr)+4:dataPtr+dataLen]) - return ipInfo, nil - -} - -func getLong(b []byte, offset int64) int64 { - - val := int64(b[offset]) | - int64(b[offset+1])<<8 | - int64(b[offset+2])<<16 | - int64(b[offset+3])<<24 - - return val - -} - -func ip2long(IpStr string) (int64, error) { - bits := strings.Split(IpStr, ".") - if len(bits) != 4 { - return 0, errors.New("ip format error") - } - - var sum int64 - for i, n := range bits { - bit, _ := strconv.ParseInt(n, 10, 64) - sum += bit << uint(24-8*i) - } - - return sum, nil -} - -func (r *Ip2Region) OnlineDownload() (err error) { - tmpData, err := getOnline() - if err != nil { - return errors.New("下载失败 %s" + err.Error()) - } - if err := ioutil.WriteFile("./ip2region.db", tmpData, 0644); err == nil { - log.Printf("已下载最新 ip2region 数据库 %s ", "./ip2region.db") - } else { - return errors.New("保存失败") - } - return nil -} diff --git a/vendor/go.dtapp.net/goip/v4/download.go b/vendor/go.dtapp.net/goip/v4/download.go deleted file mode 100644 index f6e3d7b2..00000000 --- a/vendor/go.dtapp.net/goip/v4/download.go +++ /dev/null @@ -1,58 +0,0 @@ -package v4 - -import ( - "bytes" - "compress/zlib" - "encoding/binary" - "io/ioutil" - "net/http" -) - -// 解密key -// https://zhangzifan.com/update-qqwry-dat.html -func getKey() (uint32, error) { - resp, err := http.Get("https://update.cz88.net/ip/copywrite.rar") - if err != nil { - return 0, err - } - defer resp.Body.Close() - - if body, err := ioutil.ReadAll(resp.Body); err != nil { - return 0, err - } else { - // @see https://stackoverflow.com/questions/34078427/how-to-read-packed-binary-data-in-go - return binary.LittleEndian.Uint32(body[5*4:]), nil - } -} - -// 在线获取内容 -func getOnline() ([]byte, error) { - resp, err := http.Get("https://update.cz88.net/ip/qqwry.rar") - if err != nil { - return nil, err - } - defer resp.Body.Close() - - if body, err := ioutil.ReadAll(resp.Body); err != nil { - return nil, err - } else { - if key, err := getKey(); err != nil { - return nil, err - } else { - for i := 0; i < 0x200; i++ { - key = key * 0x805 - key++ - key = key & 0xff - - body[i] = byte(uint32(body[i]) ^ key) - } - - reader, err := zlib.NewReader(bytes.NewReader(body)) - if err != nil { - return nil, err - } - - return ioutil.ReadAll(reader) - } - } -} diff --git a/vendor/go.dtapp.net/goip/v4/ipv4.go b/vendor/go.dtapp.net/goip/v4/ipv4.go deleted file mode 100644 index 2cef2376..00000000 --- a/vendor/go.dtapp.net/goip/v4/ipv4.go +++ /dev/null @@ -1,201 +0,0 @@ -package v4 - -import ( - _ "embed" - "encoding/binary" - "errors" - "go.dtapp.net/gostring" - "golang.org/x/text/encoding/simplifiedchinese" - "io/ioutil" - "log" - "net" -) - -var ( - header []byte - country []byte - area []byte - offset uint32 - start uint32 - end uint32 -) - -//go:embed qqwry.dat -var dat []byte - -type Pointer struct { - Offset uint32 - ItemLen uint32 - IndexLen uint32 -} - -// Result 返回 -type Result struct { - IP string `json:"ip,omitempty"` // 输入的ip地址 - Country string `json:"country,omitempty"` // 国家或地区 - Area string `json:"area,omitempty"` // 区域 -} - -// InitIPV4Data 加载 -func (q *Pointer) InitIPV4Data() int64 { - buf := dat[0:8] - start := binary.LittleEndian.Uint32(buf[:4]) - end := binary.LittleEndian.Uint32(buf[4:]) - - return int64((end-start)/7 + 1) -} - -// ReadData 从文件中读取数据 -func (q *Pointer) readData(length uint32) (rs []byte) { - end := q.Offset + length - dataNum := uint32(len(dat)) - if q.Offset > dataNum { - return nil - } - - if end > dataNum { - end = dataNum - } - rs = dat[q.Offset:end] - q.Offset = end - return rs -} - -// Find ip地址查询对应归属地信息 -func (q *Pointer) Find(ip string) (res Result) { - - // 赋值 - res.IP = ip - if net.ParseIP("61.241.55.180").To4() == nil { - // 不是ip地址 - return res - } - - q.Offset = 0 - - // 偏移 - offset = q.searchIndex(binary.BigEndian.Uint32(net.ParseIP(ip).To4())) - if offset <= 0 { - return - } - - q.Offset = offset + q.ItemLen - - country, area = q.getAddr() - - enc := simplifiedchinese.GBK.NewDecoder() - - res.Country, _ = enc.String(string(country)) - res.Country = gostring.SpaceAndLineBreak(res.Country) - - res.Area, _ = enc.String(string(area)) - - // Delete CZ88.NET (防止不相关的信息产生干扰） - if res.Area == " CZ88.NET" || res.Area == "" { - res.Area = "" - } else { - res.Area = " " + res.Area - } - - res.Area = gostring.SpaceAndLineBreak(res.Area) - - return -} - -// 获取地址信息 -func (q *Pointer) getAddr() ([]byte, []byte) { - mode := q.readData(1)[0] - if mode == 0x01 { - // [IP][0x01][国家和地区信息的绝对偏移地址] - q.Offset = byteToUInt32(q.readData(3)) - return q.getAddr() - } - // [IP][0x02][信息的绝对偏移][...] or [IP][国家][...] - _offset := q.Offset - 1 - c1 := q.readArea(_offset) - if mode == 0x02 { - q.Offset = 4 + _offset - } else { - q.Offset = _offset + uint32(1+len(c1)) - } - c2 := q.readArea(q.Offset) - return c1, c2 -} - -// 读取区 -func (q *Pointer) readArea(offset uint32) []byte { - q.Offset = offset - mode := q.readData(1)[0] - if mode == 0x01 || mode == 0x02 { - return q.readArea(byteToUInt32(q.readData(3))) - } - q.Offset = offset - return q.readString() -} - -// 读取字符串 -func (q *Pointer) readString() []byte { - data := make([]byte, 0) - for { - buf := q.readData(1) - if buf[0] == 0 { - break - } - data = append(data, buf[0]) - } - return data -} - -// 搜索索引 -func (q *Pointer) searchIndex(ip uint32) uint32 { - q.ItemLen = 4 - q.IndexLen = 7 - header = dat[0:8] - start = binary.LittleEndian.Uint32(header[:4]) - end = binary.LittleEndian.Uint32(header[4:]) - - buf := make([]byte, q.IndexLen) - - for { - mid := start + q.IndexLen*(((end-start)/q.IndexLen)>>1) - buf = dat[mid : mid+q.IndexLen] - _ip := binary.LittleEndian.Uint32(buf[:q.ItemLen]) - - if end-start == q.IndexLen { - if ip >= binary.LittleEndian.Uint32(dat[end:end+q.ItemLen]) { - buf = dat[end : end+q.IndexLen] - } - return byteToUInt32(buf[q.ItemLen:]) - } - - if _ip > ip { - end = mid - } else if _ip < ip { - start = mid - } else if _ip == ip { - return byteToUInt32(buf[q.ItemLen:]) - } - } -} - -// 字节转UInt32 -func byteToUInt32(data []byte) uint32 { - i := uint32(data[0]) & 0xff - i |= (uint32(data[1]) << 8) & 0xff00 - i |= (uint32(data[2]) << 16) & 0xff0000 - return i -} - -// OnlineDownload 在线下载 -func (q *Pointer) OnlineDownload() (err error) { - tmpData, err := getOnline() - if err != nil { - return errors.New("下载失败") - } - if err := ioutil.WriteFile("./qqwry.dat", tmpData, 0644); err == nil { - log.Printf("已下载最新 纯真 IPv4数据库 %s ", "./qqwry.dat") - } else { - return errors.New("保存失败") - } - return nil -} diff --git a/vendor/go.dtapp.net/goip/v4/qqwry.dat b/vendor/go.dtapp.net/goip/v4/qqwry.dat deleted file mode 100644 index 555db577..00000000 Binary files a/vendor/go.dtapp.net/goip/v4/qqwry.dat and /dev/null differ diff --git a/vendor/go.dtapp.net/goip/v6/download.go b/vendor/go.dtapp.net/goip/v6/download.go deleted file mode 100644 index 84dc0735..00000000 --- a/vendor/go.dtapp.net/goip/v6/download.go +++ /dev/null @@ -1,81 +0,0 @@ -package v6 - -import ( - "github.com/saracen/go7z" - "io" - "io/ioutil" - "log" - "net/http" - "os" -) - -func getOnline() (data []byte, err error) { - resp, err := http.Get("https://ip.zxinc.org/ip.7z") - if err != nil { - return nil, err - } - defer resp.Body.Close() - - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } - - file7z, err := ioutil.TempFile("", "*") - if err != nil { - return nil, err - } - defer os.Remove(file7z.Name()) - - if err := ioutil.WriteFile(file7z.Name(), body, 0644); err == nil { - return Un7z(file7z.Name()) - } - return -} - -func Un7z(filePath string) (data []byte, err error) { - sz, err := go7z.OpenReader(filePath) - if err != nil { - return nil, err - } - defer sz.Close() - - fileNoNeed, err := ioutil.TempFile("", "*") - if err != nil { - return nil, err - } - fileNeed, err := ioutil.TempFile("", "*") - if err != nil { - return nil, err - } - - if err != nil { - return nil, err - } - for { - hdr, err := sz.Next() - if err == io.EOF { - break // End of archive - } - if err != nil { - return nil, err - } - - if hdr.Name == "ipv6wry.db" { - if _, err := io.Copy(fileNeed, sz); err != nil { - log.Fatalln("ZX ipv6数据库解压出错：", err.Error()) - } - } else { - if _, err := io.Copy(fileNoNeed, sz); err != nil { - log.Fatalln("ZX ipv6数据库解压出错：", err.Error()) - } - } - } - err = fileNoNeed.Close() - if err != nil { - return nil, err - } - defer os.Remove(fileNoNeed.Name()) - defer os.Remove(fileNeed.Name()) - return ioutil.ReadFile(fileNeed.Name()) -} diff --git a/vendor/go.dtapp.net/goip/v6/ipv6.go b/vendor/go.dtapp.net/goip/v6/ipv6.go deleted file mode 100644 index 414426fb..00000000 --- a/vendor/go.dtapp.net/goip/v6/ipv6.go +++ /dev/null @@ -1,226 +0,0 @@ -package v6 - -import ( - _ "embed" - "encoding/binary" - "errors" - "go.dtapp.net/gostring" - "io/ioutil" - "log" - "math/big" - "net" - "strings" -) - -var ( - header []byte - country []byte - area []byte - v6ip uint64 - offset uint32 - start uint32 - end uint32 -) - -type Result struct { - IP string `json:"ip,omitempty"` // 输入的ip地址 - Country string `json:"country,omitempty"` // 国家 - Province string `json:"province,omitempty"` // 省份 - City string `json:"city,omitempty"` // 城市 - Area string `json:"area,omitempty"` // 区域 - Isp string `json:"isp,omitempty"` // 运营商 -} - -//go:embed ipv6wry.db -var dat []byte - -type Pointer struct { - Offset uint32 - ItemLen uint32 - IndexLen uint32 -} - -// InitIPV4Data 加载 -func (q *Pointer) InitIPV4Data() int64 { - buf := dat[0:8] - start := binary.LittleEndian.Uint32(buf[:4]) - end := binary.LittleEndian.Uint32(buf[4:]) - - return int64((end-start)/7 + 1) -} - -// ReadData 从文件中读取数据 -func (q *Pointer) readData(length uint32) (rs []byte) { - end := q.Offset + length - dataNum := uint32(len(dat)) - if q.Offset > dataNum { - return nil - } - - if end > dataNum { - end = dataNum - } - rs = dat[q.Offset:end] - q.Offset = end - return rs -} - -// Find ip地址查询对应归属地信息 -func (q *Pointer) Find(ip string) (res Result) { - - res = Result{} - res.IP = ip - q.Offset = 0 - - tp := big.NewInt(0) - op := big.NewInt(0) - tp.SetBytes(net.ParseIP(ip).To16()) - op.SetString("18446744073709551616", 10) - op.Div(tp, op) - tp.SetString("FFFFFFFFFFFFFFFF", 16) - op.And(op, tp) - - v6ip = op.Uint64() - offset = q.searchIndex(v6ip) - q.Offset = offset - - country, area = q.getAddr() - - // 解析地区数据 - info := strings.Split(string(country), "\t") - if len(info) > 0 { - i := 1 - for { - if i > len(info) { - break - } - switch i { - case 1: - res.Country = info[i-1] - res.Country = gostring.SpaceAndLineBreak(res.Country) - case 2: - res.Province = info[i-1] - res.Province = gostring.SpaceAndLineBreak(res.Province) - case 3: - res.City = info[i-1] - res.City = gostring.SpaceAndLineBreak(res.City) - case 4: - res.Area = info[i-1] - res.Area = gostring.SpaceAndLineBreak(res.Area) - } - i++ // 自增 - } - } else { - res.Country = string(country) - res.Country = gostring.SpaceAndLineBreak(res.Country) - } - // 运营商 - res.Isp = string(area) - - // Delete ZX (防止不相关的信息产生干扰） - if res.Isp == "ZX" || res.Isp == "" { - res.Isp = "" - } else { - res.Isp = " " + res.Isp - } - - res.Isp = gostring.SpaceAndLineBreak(res.Isp) - - return -} - -func (q *Pointer) getAddr() ([]byte, []byte) { - mode := q.readData(1)[0] - if mode == 0x01 { - // [IP][0x01][国家和地区信息的绝对偏移地址] - q.Offset = byteToUInt32(q.readData(3)) - return q.getAddr() - } - // [IP][0x02][信息的绝对偏移][...] or [IP][国家][...] - _offset := q.Offset - 1 - c1 := q.readArea(_offset) - if mode == 0x02 { - q.Offset = 4 + _offset - } else { - q.Offset = _offset + uint32(1+len(c1)) - } - c2 := q.readArea(q.Offset) - return c1, c2 -} - -func (q *Pointer) readArea(offset uint32) []byte { - q.Offset = offset - mode := q.readData(1)[0] - if mode == 0x01 || mode == 0x02 { - return q.readArea(byteToUInt32(q.readData(3))) - } - q.Offset = offset - return q.readString() -} - -func (q *Pointer) readString() []byte { - data := make([]byte, 0) - for { - buf := q.readData(1) - if buf[0] == 0 { - break - } - data = append(data, buf[0]) - } - return data -} - -func (q *Pointer) searchIndex(ip uint64) uint32 { - - q.ItemLen = 8 - q.IndexLen = 11 - - header = dat[8:24] - start = binary.LittleEndian.Uint32(header[8:]) - counts := binary.LittleEndian.Uint32(header[:8]) - end = start + counts*q.IndexLen - - buf := make([]byte, q.IndexLen) - - for { - mid := start + q.IndexLen*(((end-start)/q.IndexLen)>>1) - buf = dat[mid : mid+q.IndexLen] - _ip := binary.LittleEndian.Uint64(buf[:q.ItemLen]) - - if end-start == q.IndexLen { - if ip >= binary.LittleEndian.Uint64(dat[end:end+q.ItemLen]) { - buf = dat[end : end+q.IndexLen] - } - return byteToUInt32(buf[q.ItemLen:]) - } - - if _ip > ip { - end = mid - } else if _ip < ip { - start = mid - } else if _ip == ip { - return byteToUInt32(buf[q.ItemLen:]) - } - } -} - -func byteToUInt32(data []byte) uint32 { - i := uint32(data[0]) & 0xff - i |= (uint32(data[1]) << 8) & 0xff00 - i |= (uint32(data[2]) << 16) & 0xff0000 - return i -} - -// OnlineDownload 在线下载 -func (q *Pointer) OnlineDownload() (err error) { - tmpData, err := getOnline() - if err != nil { - return errors.New("下载失败") - } - if err := ioutil.WriteFile("./ipv6wry.db", tmpData, 0644); err == nil { - log.Printf("已下载最新 ZX IPv6数据库 %s ", "./ipv6wry.db") - } else { - return errors.New("保存失败") - } - return nil -} diff --git a/vendor/go.dtapp.net/goip/v6/ipv6wry.db b/vendor/go.dtapp.net/goip/v6/ipv6wry.db deleted file mode 100644 index 100814db..00000000 Binary files a/vendor/go.dtapp.net/goip/v6/ipv6wry.db and /dev/null differ diff --git a/vendor/go.dtapp.net/goip/version.go b/vendor/go.dtapp.net/goip/version.go deleted file mode 100644 index dc9eea41..00000000 --- a/vendor/go.dtapp.net/goip/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package goip - -const Version = "1.0.16" diff --git a/vendor/go.dtapp.net/gojson/.drone.yml b/vendor/go.dtapp.net/gojson/.drone.yml deleted file mode 100644 index c56c4797..00000000 --- a/vendor/go.dtapp.net/gojson/.drone.yml +++ /dev/null @@ -1,17 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: Test - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... - - name: Benchmark - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -bench=. -benchmem \ No newline at end of file diff --git a/vendor/go.dtapp.net/gojson/.gitignore b/vendor/go.dtapp.net/gojson/.gitignore deleted file mode 100644 index 442794a4..00000000 --- a/vendor/go.dtapp.net/gojson/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.env -.git -.svn -.idea -.vscode -*.log -gomod.sh -/vendor/ \ No newline at end of file diff --git a/vendor/go.dtapp.net/gojson/gojson.go b/vendor/go.dtapp.net/gojson/gojson.go deleted file mode 100644 index a1e046bd..00000000 --- a/vendor/go.dtapp.net/gojson/gojson.go +++ /dev/null @@ -1,47 +0,0 @@ -package gojson - -import "encoding/json" - -func Encode(v interface{}) (string, error) { - bytes, err := json.Marshal(v) - if err != nil { - return "", err - } - return string(bytes), nil -} - -func MarshalToString(msg interface{}) (string, error) { - j, e := json.Marshal(msg) - if e != nil { - return "", e - } - return string(j), nil -} - -func JsonDecode(data string) (map[string]interface{}, error) { - var dat map[string]interface{} - err := json.Unmarshal([]byte(data), &dat) - return dat, err -} - -func JsonDecodeNoError(data string) map[string]interface{} { - var dat map[string]interface{} - _ = json.Unmarshal([]byte(data), &dat) - return dat -} - -func JsonEncode(data interface{}) (string, error) { - jsons, err := json.Marshal(data) - return string(jsons), err -} - -func JsonEncodeNoError(data interface{}) string { - jsons, _ := json.Marshal(data) - return string(jsons) -} - -func JsonDecodesNoError(data string) []string { - var dat []string - _ = json.Unmarshal([]byte(data), &dat) - return dat -} diff --git a/vendor/go.dtapp.net/gojson/version.go b/vendor/go.dtapp.net/gojson/version.go deleted file mode 100644 index ad968b66..00000000 --- a/vendor/go.dtapp.net/gojson/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package gojson - -const Version = "1.0.0" diff --git a/vendor/go.dtapp.net/golog/.drone.yml b/vendor/go.dtapp.net/golog/.drone.yml deleted file mode 100644 index 511f0fc9..00000000 --- a/vendor/go.dtapp.net/golog/.drone.yml +++ /dev/null @@ -1,11 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: test-golang - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... \ No newline at end of file diff --git a/vendor/go.dtapp.net/golog/.gitignore b/vendor/go.dtapp.net/golog/.gitignore deleted file mode 100644 index 5d31b6eb..00000000 --- a/vendor/go.dtapp.net/golog/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.env -.git -.svn -.idea -.vscode -*.log -gomod.sh -/vendor/ -time_test.go \ No newline at end of file diff --git a/vendor/go.dtapp.net/golog/README.md b/vendor/go.dtapp.net/golog/README.md deleted file mode 100644 index a256cdc7..00000000 --- a/vendor/go.dtapp.net/golog/README.md +++ /dev/null @@ -1,25 +0,0 @@ -

-Golang Log -

- -📦 Golang 日志组件 - -[comment]: <> (go) -[![godoc](https://pkg.go.dev/badge/go.dtapp.net/golog?status.svg)](https://pkg.go.dev/go.dtapp.net/golog) -[![goproxy.cn](https://goproxy.cn/stats/go.dtapp.net/golog/badges/download-count.svg)](https://goproxy.cn/stats/go.dtapp.net/golog) -[![goreportcard.com](https://goreportcard.com/badge/go.dtapp.net/golog )](https://goreportcard.com/report/go.dtapp.net/golog) -[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/go.dtapp.net/golog) - -#### 安装使用 - -```go -go get -v -u go.dtapp.net/golog -``` - -#### 导入 - -```go -import ( - "go.dtapp.net/golog" -) -``` \ No newline at end of file diff --git a/vendor/go.dtapp.net/golog/version.go b/vendor/go.dtapp.net/golog/version.go deleted file mode 100644 index ac0f5a83..00000000 --- a/vendor/go.dtapp.net/golog/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package golog - -const Version = "1.0.13" diff --git a/vendor/go.dtapp.net/gomongo/.drone.yml b/vendor/go.dtapp.net/gomongo/.drone.yml deleted file mode 100644 index 511f0fc9..00000000 --- a/vendor/go.dtapp.net/gomongo/.drone.yml +++ /dev/null @@ -1,11 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: test-golang - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... \ No newline at end of file diff --git a/vendor/go.dtapp.net/gomongo/.gitignore b/vendor/go.dtapp.net/gomongo/.gitignore deleted file mode 100644 index 114804cd..00000000 --- a/vendor/go.dtapp.net/gomongo/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.env -.git -.svn -.idea -.vscode -*.log -gomod.sh -/vendor/ diff --git a/vendor/go.dtapp.net/gomongo/README.md b/vendor/go.dtapp.net/gomongo/README.md deleted file mode 100644 index e0ada719..00000000 --- a/vendor/go.dtapp.net/gomongo/README.md +++ /dev/null @@ -1,25 +0,0 @@ -

-Golang MongoDB CRUD -

- -📦 Golang MongoDB CRUD 组件 - -[comment]: <> (go) -[![godoc](https://pkg.go.dev/badge/go.dtapp.net/gomongo?status.svg)](https://pkg.go.dev/go.dtapp.net/gomongo) -[![goproxy.cn](https://goproxy.cn/stats/go.dtapp.net/gomongo/badges/download-count.svg)](https://goproxy.cn/stats/go.dtapp.net/gomongo) -[![goreportcard.com](https://goreportcard.com/badge/go.dtapp.net/gomongo)](https://goreportcard.com/report/go.dtapp.net/gomongo) -[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/go.dtapp.net/gomongo) - -#### 安装使用 - -```go -go get -v -u go.dtapp.net/gomongo -``` - -#### 导入 - -```go -import ( - "go.dtapp.net/gomongo" -) -``` \ No newline at end of file diff --git a/vendor/go.dtapp.net/gomongo/bson.go b/vendor/go.dtapp.net/gomongo/bson.go deleted file mode 100644 index 88e9471e..00000000 --- a/vendor/go.dtapp.net/gomongo/bson.go +++ /dev/null @@ -1 +0,0 @@ -package gomongo diff --git a/vendor/go.dtapp.net/gomongo/client.go b/vendor/go.dtapp.net/gomongo/client.go deleted file mode 100644 index 302345a2..00000000 --- a/vendor/go.dtapp.net/gomongo/client.go +++ /dev/null @@ -1,57 +0,0 @@ -package gomongo - -import ( - "context" - "errors" - "fmt" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" -) - -// Client 实例 -type Client struct { - db *mongo.Client // MongoDB驱动 - ctx context.Context // 上下文 - DatabaseName string // 库名 - collectionName string // 表名 - filterArr []queryFilter // 查询条件数组 - filter bson.D // 查询条件 -} - -// NewClient 实例化并链接数据库 -func NewClient(dns string) *Client { - - // 连接到MongoDB - db, err := mongo.Connect(context.TODO(), options.Client().ApplyURI(dns)) - if err != nil { - panic(fmt.Sprintf("连接失败：%v", err)) - } - - // 检查连接 - err = db.Ping(context.TODO(), nil) - if err != nil { - panic(fmt.Sprintf("检查连接失败：%v", err)) - } - - return &Client{db: db, ctx: context.TODO()} -} - -// NewClientDb 实例化并传入链接 -func NewClientDb(db *mongo.Client) *Client { - return &Client{db: db, ctx: context.TODO()} -} - -// Close 关闭 -func (c *Client) Close() { - err := c.db.Disconnect(context.TODO()) - if err != nil { - panic(errors.New(fmt.Sprintf("关闭失败：%v", err))) - } - return -} - -// GetDbDriver 获取驱动 -func (c *Client) GetDbDriver() *mongo.Client { - return c.db -} diff --git a/vendor/go.dtapp.net/gomongo/curd.go b/vendor/go.dtapp.net/gomongo/curd.go deleted file mode 100644 index 309fe2d2..00000000 --- a/vendor/go.dtapp.net/gomongo/curd.go +++ /dev/null @@ -1,153 +0,0 @@ -package gomongo - -import ( - "context" - "errors" - "go.mongodb.org/mongo-driver/bson" - "log" - "reflect" -) - -// Database 设置库名 -func (c *Client) Database(database string) *Client { - c.DatabaseName = database - return c -} - -// Collection 设置表名 -func (c *Client) Collection(collection string) *Client { - c.collectionName = collection - return c -} - -// Model 传入模型自动获取库名和表名 -func (c *Client) Model(value interface{}) *Client { - // https://studygolang.com/articles/896 - val := reflect.ValueOf(value) - if methodValue := val.MethodByName("Database"); methodValue.IsValid() { - c.DatabaseName = methodValue.Call(nil)[0].String() - } - if methodValue := val.MethodByName("TableName"); methodValue.IsValid() { - c.collectionName = methodValue.Call(nil)[0].String() - } - return c -} - -// CreateResult 返回查询结果 -type CreateResult struct { - InsertedID interface{} // 创建一条记录的ID - InsertedIDs []interface{} // 创建多条记录的ID -} - -// Create 创建数据 -func (c *Client) Create(values ...interface{}) (CreateResult, error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - - const ( - insertTypeOne = "one" - insertTypeMany = "many" - ) - - var ( - insertType string - insertDataOne interface{} - insertDataMany []interface{} - ) - - for _, value := range values { - switch v := value.(type) { - case map[string]interface{}: - case []map[string]interface{}: - case map[string]string: - case []map[string]string: - default: - sliceValue := reflect.Indirect(reflect.ValueOf(value)) - if sliceValue.Kind() == reflect.Slice { - insertType = insertTypeMany - size := sliceValue.Len() - for i := 0; i < size; i++ { - sv := sliceValue.Index(i) // 取出第i个元素 - elemValue := sv.Interface() // 原始数据 - insertDataMany = append(insertDataMany, elemValue) // 加入到数组中 - } - } else { - insertType = insertTypeOne - insertDataOne = v - } - } - } - - if insertType == insertTypeOne { - result, err := collection.InsertOne(context.TODO(), insertDataOne) - return CreateResult{InsertedID: result.InsertedID}, err - } else if insertType == insertTypeMany { - result, err := collection.InsertMany(context.TODO(), insertDataMany) - return CreateResult{InsertedIDs: result.InsertedIDs}, err - } else { - return CreateResult{}, errors.New("values is empty") - } -} - -// 查询条件 -type queryFilter struct { - Key string - Value interface{} -} - -// Where 条件 -func (c *Client) Where(key string, value interface{}) *Client { - log.Println("key", key) - log.Println("value", value) - c.filterArr = append(c.filterArr, queryFilter{key, value}) - c.filter = bson.D{{key, value}} - return c -} - -// QueryResult 返回查询结果 -type QueryResult struct { - RowsAffected int // 返回找到的记录数 - Error error // 错误信息 -} - -// First 获取第一条记录（主键升序） -func (c *Client) First() *QueryResult { - return &QueryResult{} -} - -// Take 获取一条记录，没有指定排序字段 -func (c *Client) Take(v interface{}) *QueryResult { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - //log.Printf("c.filterArr：%s\n", c.filterArr) - //log.Printf("c.filterArr：%v\n", c.filterArr) - //log.Printf("c.filterArr：%+v\n", c.filterArr) - //log.Printf("c.filter：%s\n", c.filter) - //log.Printf("c.filter：%v\n", c.filter) - //log.Printf("c.filter：%+v\n", c.filter) - err := collection.FindOne(context.TODO(), c.filter).Decode(v) - return &QueryResult{1, err} -} - -// Last 获取最后一条记录（主键降序） -func (c *Client) Last() *QueryResult { - return &QueryResult{} -} - -// Find 获取多条记录 -func (c *Client) Find(v interface{}) *QueryResult { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - log.Printf("c.filterArr：%s\n", c.filterArr) - log.Printf("c.filterArr：%v\n", c.filterArr) - log.Printf("c.filterArr：%+v\n", c.filterArr) - log.Printf("c.filter：%s\n", c.filter) - log.Printf("c.filter：%v\n", c.filter) - log.Printf("c.filter：%+v\n", c.filter) - cursor, err := collection.Find(context.TODO(), c.filter) - if err != nil { - return &QueryResult{0, err} - } - - // 结果遍历和赋值 - err = cursor.All(context.TODO(), v) - - return &QueryResult{cursor.RemainingBatchLength(), err} -} diff --git a/vendor/go.dtapp.net/gomongo/json.go b/vendor/go.dtapp.net/gomongo/json.go deleted file mode 100644 index 7eb032af..00000000 --- a/vendor/go.dtapp.net/gomongo/json.go +++ /dev/null @@ -1,10 +0,0 @@ -package gomongo - -import "encoding/json" - -// JsonDecodeNoError Json解码，不报错 -func JsonDecodeNoError(b []byte) map[string]interface{} { - var data map[string]interface{} - _ = json.Unmarshal(b, &data) - return data -} diff --git a/vendor/go.dtapp.net/gomongo/official.go b/vendor/go.dtapp.net/gomongo/official.go deleted file mode 100644 index 5982e2b6..00000000 --- a/vendor/go.dtapp.net/gomongo/official.go +++ /dev/null @@ -1,164 +0,0 @@ -package gomongo - -import ( - "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" -) - -func (c *Client) Session() (session mongo.Session, err error) { - session, err = c.db.StartSession() - return -} - -// InsertOne 插入单个文档 -func (c *Client) InsertOne(value interface{}) (result *mongo.InsertOneResult, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - result, err = collection.InsertOne(context.TODO(), value) - return result, err -} - -// InsertMany 插入多个文档 -func (c *Client) InsertMany(values []interface{}) (result *mongo.InsertManyResult, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - result, err = collection.InsertMany(context.TODO(), values) - return result, err -} - -// Delete 删除文档 -func (c *Client) Delete(filter interface{}) (int64, error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - count, err := collection.DeleteOne(context.TODO(), filter, nil) - return count.DeletedCount, err -} - -// DeleteMany 删除多个文档 -func (c *Client) DeleteMany(key string, value interface{}) (int64, error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - filter := bson.D{{key, value}} - count, err := collection.DeleteMany(context.TODO(), filter) - return count.DeletedCount, err -} - -// UpdateOne 更新单个文档 -// 修改字段的值($set) -// 字段增加值 inc($inc) -// 从数组中增加一个元素 push($push) -// 从数组中删除一个元素 pull($pull) -func (c *Client) UpdateOne(filter, update interface{}) (int64, error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - result, err := collection.UpdateOne(context.TODO(), filter, update) - return result.UpsertedCount, err -} - -// UpdateMany 更新多个文档 -// 修改字段的值($set) -// 字段增加值 inc($inc) -// 从数组中增加一个元素 push($push) -// 从数组中删除一个元素 pull($pull) -func (c *Client) UpdateMany(filter, update interface{}) (int64, error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - result, err := collection.UpdateMany(context.TODO(), filter, update) - return result.UpsertedCount, err -} - -// Find 查询 -//func (c *Client) Find(filter interface{}, opts ...*options.FindOptions) (result *mongo.Cursor, err error) { -// collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) -// result, err = collection.Find(context.TODO(), filter, opts...) -// return result, err -//} - -// FindOne 查询单个文档 -func (c *Client) FindOne(filter interface{}) (result *mongo.SingleResult) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - result = collection.FindOne(context.TODO(), filter) - return result -} - -// FindMany 查询多个文档 -func (c *Client) FindMany(filter interface{}) (result *mongo.Cursor, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - result, err = collection.Find(context.TODO(), filter) - return result, err -} - -// FindManyByFilters 多条件查询 -func (c *Client) FindManyByFilters(filter interface{}) (result *mongo.Cursor, err error) { - collection, err := c.db.Database(c.DatabaseName).Collection(c.collectionName).Clone() - result, err = collection.Find(context.TODO(), bson.M{"$and": filter}) - return result, err -} - -// FindManyByFiltersSort 多条件查询支持排序 -func (c *Client) FindManyByFiltersSort(filter interface{}, Sort interface{}) (result *mongo.Cursor, err error) { - collection, err := c.db.Database(c.DatabaseName).Collection(c.collectionName).Clone() - findOptions := options.Find() - findOptions.SetSort(Sort) - result, err = collection.Find(context.TODO(), filter, findOptions) - return result, err -} - -// FindCollection 查询集合文档 -func (c *Client) FindCollection(Limit int64) (result *mongo.Cursor, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - findOptions := options.Find() - findOptions.SetLimit(Limit) - result, err = collection.Find(context.TODO(), bson.D{{}}, findOptions) - return result, err -} - -// FindCollectionSort 查询集合文档支持排序 -func (c *Client) FindCollectionSort(Sort interface{}, Limit int64) (result *mongo.Cursor, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - findOptions := options.Find() - findOptions.SetSort(Sort) - findOptions.SetLimit(Limit) - result, err = collection.Find(context.TODO(), bson.D{{}}, findOptions) - return result, err -} - -// FindManyCollectionSort 查询集合文档支持排序支持条件 -func (c *Client) FindManyCollectionSort(filter interface{}, Sort interface{}) (result *mongo.Cursor, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - findOptions := options.Find() - findOptions.SetSort(Sort) - result, err = collection.Find(context.TODO(), filter, findOptions) - return result, err -} - -// CollectionCount 查询集合里有多少数据 -func (c *Client) CollectionCount() (name string, size int64) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - name = collection.Name() - size, _ = collection.EstimatedDocumentCount(context.TODO()) - return name, size -} - -// CollectionDocuments 按选项查询集合 -// Skip 跳过 -// Limit 读取数量 -// sort 1 ，-1 . 1 为升序 ， -1 为降序 -func (c *Client) CollectionDocuments(Skip, Limit int64, sort int, key string, value interface{}) (result *mongo.Cursor, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - SORT := bson.D{{"_id", sort}} - filter := bson.D{{key, value}} - findOptions := options.Find().SetSort(SORT).SetLimit(Limit).SetSkip(Skip) - result, err = collection.Find(context.Background(), filter, findOptions) - return result, err -} - -// AggregateByFiltersSort 统计分析 -func (c *Client) AggregateByFiltersSort(pipeline interface{}, opts ...*options.AggregateOptions) (result *mongo.Cursor, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - result, err = collection.Aggregate(context.TODO(), pipeline, opts...) - return result, err -} - -// CountDocumentsByFilters 统计数量 -func (c *Client) CountDocumentsByFilters(filter interface{}) (count int64, err error) { - collection := c.db.Database(c.DatabaseName).Collection(c.collectionName) - count, err = collection.CountDocuments(context.TODO(), filter) - return count, err -} diff --git a/vendor/go.dtapp.net/gomongo/time.go b/vendor/go.dtapp.net/gomongo/time.go deleted file mode 100644 index c384a04a..00000000 --- a/vendor/go.dtapp.net/gomongo/time.go +++ /dev/null @@ -1,50 +0,0 @@ -package gomongo - -import ( - "go.dtapp.net/gotime" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" - "time" -) - -// BsonTime 类型 -type BsonTime time.Time - -// Value 时间类型 -func (t BsonTime) Value() string { - return gotime.SetCurrent(time.Time(t)).Bson() -} - -// MarshalJSON 实现json序列化 -func (t BsonTime) MarshalJSON() ([]byte, error) { - //log.Println("MarshalJSON") - b := make([]byte, 0) - b = append(b, gotime.SetCurrent(time.Time(t)).Bson()...) - return b, nil -} - -// UnmarshalJSON 实现json反序列化 -func (t *BsonTime) UnmarshalJSON(data []byte) (err error) { - //log.Println("UnmarshalJSON") - t1 := gotime.SetCurrentParse(string(data)) - *t = BsonTime(t1.Time) - return -} - -// MarshalBSONValue 实现bson序列化 -func (t BsonTime) MarshalBSONValue() (bsontype.Type, []byte, error) { - //log.Println("MarshalBSONValue") - targetTime := gotime.SetCurrent(time.Time(t)).Bson() - return bson.MarshalValue(targetTime) -} - -// UnmarshalBSONValue 实现bson反序列化 -func (t *BsonTime) UnmarshalBSONValue(t2 bsontype.Type, data []byte) error { - //log.Println("UnmarshalBSONValue") - t1 := gotime.SetCurrentParse(string(data)) - //if string(data) == "" { - // return errors.New(fmt.Sprintf("%s, %s, %s", "读取数据失败:", t2, data)) - //} - *t = BsonTime(t1.Time) - return nil -} diff --git a/vendor/go.dtapp.net/gomongo/version.go b/vendor/go.dtapp.net/gomongo/version.go deleted file mode 100644 index bade1937..00000000 --- a/vendor/go.dtapp.net/gomongo/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package gomongo - -const Version = "1.0.8" diff --git a/vendor/go.dtapp.net/gomongo/xml.go b/vendor/go.dtapp.net/gomongo/xml.go deleted file mode 100644 index 8e6bbb79..00000000 --- a/vendor/go.dtapp.net/gomongo/xml.go +++ /dev/null @@ -1,16 +0,0 @@ -package gomongo - -import ( - "encoding/json" - "github.com/basgys/goxml2json" - "strings" -) - -// XmlDecodeNoError Xml解码，不报错 -func XmlDecodeNoError(b []byte) map[string]interface{} { - xtj := strings.NewReader(string(b)) - jtx, _ := xml2json.Convert(xtj) - var data map[string]interface{} - _ = json.Unmarshal(jtx.Bytes(), &data) - return data -} diff --git a/vendor/go.dtapp.net/goredis/.drone.yml b/vendor/go.dtapp.net/goredis/.drone.yml deleted file mode 100644 index c56c4797..00000000 --- a/vendor/go.dtapp.net/goredis/.drone.yml +++ /dev/null @@ -1,17 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: Test - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... - - name: Benchmark - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -bench=. -benchmem \ No newline at end of file diff --git a/vendor/go.dtapp.net/goredis/.gitignore b/vendor/go.dtapp.net/goredis/.gitignore deleted file mode 100644 index 4794692f..00000000 --- a/vendor/go.dtapp.net/goredis/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.env -.git -.svn -.idea -.vscode -*.log -goinit.sh -gomod.sh -/vendor/ \ No newline at end of file diff --git a/vendor/go.dtapp.net/goredis/Iterator.go b/vendor/go.dtapp.net/goredis/Iterator.go deleted file mode 100644 index 6c4957b1..00000000 --- a/vendor/go.dtapp.net/goredis/Iterator.go +++ /dev/null @@ -1,26 +0,0 @@ -package goredis - -type Iterator struct { - data []interface{} - index int -} - -// NewIterator 构造函数 -func NewIterator(data []interface{}) *Iterator { - return &Iterator{data: data} -} - -// HasNext 是否有下一个 -func (i *Iterator) HasNext() bool { - if i.data == nil || len(i.data) == 0 { - return false - } - return i.index < len(i.data) -} - -// Next 循环下一个 -func (i *Iterator) Next() (Ret interface{}) { - Ret = i.data[i.index] - i.index = i.index + 1 - return -} diff --git a/vendor/go.dtapp.net/goredis/app.go b/vendor/go.dtapp.net/goredis/app.go deleted file mode 100644 index 38630163..00000000 --- a/vendor/go.dtapp.net/goredis/app.go +++ /dev/null @@ -1,45 +0,0 @@ -package goredis - -import ( - "context" - "errors" - "fmt" - "github.com/go-redis/redis/v8" - "log" - "time" -) - -// App 实例 -type App struct { - Db *redis.Client - Addr string // 地址 - Password string // 密码 - DB int // 数据库 - PoolSize int // 连接池大小 -} - -// InitClient 初始化连接 -func (app *App) InitClient() { - - log.Printf("redis config：%+v\n", app) - - if app.PoolSize == 0 { - app.PoolSize = 100 - } - - app.Db = redis.NewClient(&redis.Options{ - Addr: app.Addr, // 地址 - Password: app.Password, // 密码 - DB: app.DB, // 数据库 - PoolSize: app.PoolSize, // 连接池大小 - }) - - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) - defer cancel() - - _, err := app.Db.Ping(ctx).Result() - if err != nil { - panic(errors.New(fmt.Sprintf("数据库【redis】连接失败：%v", err))) - } - return -} diff --git a/vendor/go.dtapp.net/goredis/hash_operation.go b/vendor/go.dtapp.net/goredis/hash_operation.go deleted file mode 100644 index fa0c1b4c..00000000 --- a/vendor/go.dtapp.net/goredis/hash_operation.go +++ /dev/null @@ -1,26 +0,0 @@ -package goredis - -import ( - "context" - "github.com/go-redis/redis/v8" -) - -type HashOperation struct { - db *redis.Client - ctx context.Context -} - -// NewHashOperation hash类型数据操作 https://www.tizi365.com/archives/296.html -func NewHashOperation(db *redis.Client, ctx context.Context) *HashOperation { - return &HashOperation{db: db, ctx: ctx} -} - -// Set 根据key和field字段设置，field字段的值 -func (cl *HashOperation) Set(key string, value interface{}) *redis.IntCmd { - return cl.db.HSet(cl.ctx, key, value) -} - -// Get 根据key和field字段设置，field字段的值 -func (cl *HashOperation) Get(key, field string) *redis.StringCmd { - return cl.db.HGet(cl.ctx, key, field) -} diff --git a/vendor/go.dtapp.net/goredis/list_operation.go b/vendor/go.dtapp.net/goredis/list_operation.go deleted file mode 100644 index 5c2a412d..00000000 --- a/vendor/go.dtapp.net/goredis/list_operation.go +++ /dev/null @@ -1,76 +0,0 @@ -package goredis - -import ( - "context" - "github.com/go-redis/redis/v8" -) - -type ListOperation struct { - db *redis.Client - ctx context.Context -} - -// NewListOperation 列表(list)类型数据操作 https://www.tizi365.com/archives/299.html -func (app *App) NewListOperation() *ListOperation { - return &ListOperation{db: app.Db, ctx: context.Background()} -} - -// LPush 从列表左边插入数据 -func (cl *ListOperation) LPush(key string, value interface{}) *redis.IntCmd { - return cl.db.LPush(cl.ctx, key, value) -} - -// LPushX 跟LPush的区别是，仅当列表存在的时候才插入数据 -func (cl *ListOperation) LPushX(key string, value interface{}) *redis.IntCmd { - return cl.db.LPushX(cl.ctx, key, value) -} - -// RPop 从列表的右边删除第一个数据，并返回删除的数据 -func (cl *ListOperation) RPop(key string) *redis.StringCmd { - return cl.db.RPop(cl.ctx, key) -} - -// RPush 从列表右边插入数据 -func (cl *ListOperation) RPush(key string, value interface{}) *redis.IntCmd { - return cl.db.RPush(cl.ctx, key, value) -} - -// RPushX 跟RPush的区别是，仅当列表存在的时候才插入数据 -func (cl *ListOperation) RPushX(key string, value interface{}) *redis.IntCmd { - return cl.db.RPushX(cl.ctx, key, value) -} - -// LPop 从列表左边删除第一个数据，并返回删除的数据 -func (cl *ListOperation) LPop(key string) *redis.StringCmd { - return cl.db.LPop(cl.ctx, key) -} - -// Len 返回列表的大小 -func (cl *ListOperation) Len(key string) *redis.IntCmd { - return cl.db.LLen(cl.ctx, key) -} - -// Range 返回列表的一个范围内的数据，也可以返回全部数据 -func (cl *ListOperation) Range(key string, start, stop int64) *redis.StringSliceCmd { - return cl.db.LRange(cl.ctx, key, start, stop) -} - -// RangeAli 返回key全部数据 -func (cl *ListOperation) RangeAli(key string) *redis.StringSliceCmd { - return cl.db.LRange(cl.ctx, key, 0, -1) -} - -// Rem 删除key中的数据 -func (cl *ListOperation) Rem(key string, count int64, value interface{}) *redis.IntCmd { - return cl.db.LRem(cl.ctx, key, count, value) -} - -// Index 根据索引坐标，查询key中的数据 -func (cl *ListOperation) Index(key string, index int64) *redis.StringCmd { - return cl.db.LIndex(cl.ctx, key, index) -} - -// Insert 在指定位置插入数据 -func (cl *ListOperation) Insert(key, op string, pivot, value interface{}) *redis.IntCmd { - return cl.db.LInsert(cl.ctx, key, op, pivot, value) -} diff --git a/vendor/go.dtapp.net/goredis/operation_attr.go b/vendor/go.dtapp.net/goredis/operation_attr.go deleted file mode 100644 index e61fc534..00000000 --- a/vendor/go.dtapp.net/goredis/operation_attr.go +++ /dev/null @@ -1,35 +0,0 @@ -package goredis - -import "time" - -type empty struct{} - -const ( - AttrExpr = "expr" // 过期时间 - AttrNx = "nx" // 设置Nx -) - -type OperationAttr struct { - Name string - Value interface{} -} - -type OperationAttrs []*OperationAttr - -func (a OperationAttrs) Find(name string) interface{} { - for _, attr := range a { - if attr.Name == name { - return attr.Value - } - } - return nil -} - -// WithExpire 过期时间 -func WithExpire(t time.Duration) *OperationAttr { - return &OperationAttr{Name: AttrExpr, Value: t} -} - -func WithNX() *OperationAttr { - return &OperationAttr{Name: AttrNx, Value: empty{}} -} diff --git a/vendor/go.dtapp.net/goredis/simple_cache.go b/vendor/go.dtapp.net/goredis/simple_cache.go deleted file mode 100644 index abcbd0a8..00000000 --- a/vendor/go.dtapp.net/goredis/simple_cache.go +++ /dev/null @@ -1,61 +0,0 @@ -package goredis - -import ( - "encoding/json" - "time" -) - -const ( - SerializerJson = "json" - SerializerString = "string" -) - -type JsonGttFunc func() interface{} - -type DBGttFunc func() string - -// SimpleCache 缓存 -type SimpleCache struct { - Operation *StringOperation // 操作类 - Expire time.Duration // 过去时间 - DBGetter DBGttFunc // 缓存不存在的操作 DB - JsonGetter JsonGttFunc // 缓存不存在的操作 JSON - Serializer string // 序列化方式 -} - -// NewSimpleCache 构造函数 -func (app *App) NewSimpleCache(operation *StringOperation, expire time.Duration, serializer string) *SimpleCache { - return &SimpleCache{ - Operation: operation, // 操作类 - Expire: expire, // 过去时间 - Serializer: serializer, // 缓存不存在的操作 DB - } -} - -// SetCache 设置缓存 -func (c *SimpleCache) SetCache(key string, value interface{}) { - c.Operation.Set(key, value, WithExpire(c.Expire)).Unwrap() -} - -// GetCache 获取缓存 -func (c *SimpleCache) GetCache(key string) (ret interface{}) { - if c.Serializer == SerializerJson { - f := func() string { - obj := c.JsonGetter() - b, err := json.Marshal(obj) - if err != nil { - return "" - } - return string(b) - } - ret = c.Operation.Get(key).UnwrapOrElse(f) - c.SetCache(key, ret) - } else if c.Serializer == SerializerString { - f := func() string { - return c.DBGetter() - } - ret = c.Operation.Get(key).UnwrapOrElse(f) - c.SetCache(key, ret) - } - return -} diff --git a/vendor/go.dtapp.net/goredis/simple_interface_cache.go b/vendor/go.dtapp.net/goredis/simple_interface_cache.go deleted file mode 100644 index c80d2469..00000000 --- a/vendor/go.dtapp.net/goredis/simple_interface_cache.go +++ /dev/null @@ -1,39 +0,0 @@ -package goredis - -import ( - "log" - "time" -) - -type DBGttInterfaceFunc func() interface{} - -// SimpleInterfaceCache 缓存 -type SimpleInterfaceCache struct { - Operation *SimpleOperation // 操作类 - Expire time.Duration // 过期时间 - DBGetter DBGttInterfaceFunc // 缓存不存在的操作 DB -} - -// NewSimpleInterfaceCache 构造函数 -func (app *App) NewSimpleInterfaceCache(operation *SimpleOperation, expire time.Duration) *SimpleInterfaceCache { - return &SimpleInterfaceCache{ - Operation: operation, // 操作类 - Expire: expire, // 过期时间 - } -} - -// SetCache 设置缓存 -func (c *SimpleInterfaceCache) SetCache(key string, value interface{}) { - c.Operation.Set(key, value, WithExpire(c.Expire)).Unwrap() -} - -// GetCache 获取缓存 -func (c *SimpleInterfaceCache) GetCache(key string) (ret interface{}) { - f := func() interface{} { - return c.DBGetter() - } - ret = c.Operation.Get(key).UnwrapOrElse(f) - c.SetCache(key, ret) - log.Println(ret) - return ret -} diff --git a/vendor/go.dtapp.net/goredis/simple_json_cache.go b/vendor/go.dtapp.net/goredis/simple_json_cache.go deleted file mode 100644 index a1809259..00000000 --- a/vendor/go.dtapp.net/goredis/simple_json_cache.go +++ /dev/null @@ -1,43 +0,0 @@ -package goredis - -import ( - "encoding/json" - "time" -) - -type DBGttJsonFunc func() interface{} - -// SimpleJsonCache 缓存 -type SimpleJsonCache struct { - Operation *StringOperation // 操作类 - Expire time.Duration // 过期时间 - DBGetter DBGttJsonFunc // 缓存不存在的操作 DB -} - -// NewSimpleJsonCache 构造函数 -func (app *App) NewSimpleJsonCache(operation *StringOperation, expire time.Duration) *SimpleJsonCache { - return &SimpleJsonCache{ - Operation: operation, // 操作类 - Expire: expire, // 过期时间 - } -} - -// SetCache 设置缓存 -func (c *SimpleJsonCache) SetCache(key string, value interface{}) { - c.Operation.Set(key, value, WithExpire(c.Expire)).Unwrap() -} - -// GetCache 获取缓存 -func (c *SimpleJsonCache) GetCache(key string) (ret interface{}) { - f := func() string { - obj := c.DBGetter() - b, err := json.Marshal(obj) - if err != nil { - return "" - } - return string(b) - } - ret = c.Operation.Get(key).UnwrapOrElse(f) - c.SetCache(key, ret) - return -} diff --git a/vendor/go.dtapp.net/goredis/simple_operation.go b/vendor/go.dtapp.net/goredis/simple_operation.go deleted file mode 100644 index d479f9f9..00000000 --- a/vendor/go.dtapp.net/goredis/simple_operation.go +++ /dev/null @@ -1,38 +0,0 @@ -package goredis - -import ( - "context" - "github.com/go-redis/redis/v8" - "time" -) - -type SimpleOperation struct { - db *redis.Client - ctx context.Context -} - -func (app *App) NewSimpleOperation() *SimpleOperation { - return &SimpleOperation{ - db: app.Db, - ctx: context.Background(), - } -} - -// Set 设置 -func (o *SimpleOperation) Set(key string, value interface{}, attrs ...*OperationAttr) *SimpleResult { - exp := OperationAttrs(attrs).Find(AttrExpr) - if exp == nil { - exp = time.Second * 0 - } - return NewSimpleResult(o.db.Set(o.ctx, key, value, exp.(time.Duration)).Result()) -} - -// Get 获取单个 -func (o *SimpleOperation) Get(key string) *SimpleResult { - return NewSimpleResult(o.db.Get(o.ctx, key).Result()) -} - -// Del 删除key操作，支持批量删除 -func (o *SimpleOperation) Del(keys ...string) *redis.IntCmd { - return o.db.Del(o.ctx, keys...) -} diff --git a/vendor/go.dtapp.net/goredis/simple_result.go b/vendor/go.dtapp.net/goredis/simple_result.go deleted file mode 100644 index 25fbe0da..00000000 --- a/vendor/go.dtapp.net/goredis/simple_result.go +++ /dev/null @@ -1,35 +0,0 @@ -package goredis - -type SimpleResult struct { - Result interface{} - Err error -} - -// NewSimpleResult 构造函数 -func NewSimpleResult(result interface{}, err error) *SimpleResult { - return &SimpleResult{Result: result, Err: err} -} - -// Unwrap 空值情况下返回错误 -func (r *SimpleResult) Unwrap() interface{} { - if r.Err != nil { - panic(r.Err) - } - return r.Result -} - -// UnwrapOr 空值情况下设置返回默认值 -func (r *SimpleResult) UnwrapOr(defaults interface{}) interface{} { - if r.Err != nil { - return defaults - } - return r.Result -} - -// UnwrapOrElse 空值情况下设置返回其他 -func (r *SimpleResult) UnwrapOrElse(f func() interface{}) interface{} { - if r.Err != nil { - return f() - } - return r.Result -} diff --git a/vendor/go.dtapp.net/goredis/simple_sring_cache.go b/vendor/go.dtapp.net/goredis/simple_sring_cache.go deleted file mode 100644 index 9d49c860..00000000 --- a/vendor/go.dtapp.net/goredis/simple_sring_cache.go +++ /dev/null @@ -1,37 +0,0 @@ -package goredis - -import ( - "time" -) - -type DBGttStringFunc func() string - -// SimpleStringCache 缓存 -type SimpleStringCache struct { - Operation *StringOperation // 操作类 - Expire time.Duration // 过期时间 - DBGetter DBGttStringFunc // 缓存不存在的操作 DB -} - -// NewSimpleStringCache 构造函数 -func (app *App) NewSimpleStringCache(operation *StringOperation, expire time.Duration) *SimpleStringCache { - return &SimpleStringCache{ - Operation: operation, // 操作类 - Expire: expire, // 过期时间 - } -} - -// SetCache 设置缓存 -func (c *SimpleStringCache) SetCache(key string, value string) { - c.Operation.Set(key, value, WithExpire(c.Expire)).Unwrap() -} - -// GetCache 获取缓存 -func (c *SimpleStringCache) GetCache(key string) (ret string) { - f := func() string { - return c.DBGetter() - } - ret = c.Operation.Get(key).UnwrapOrElse(f) - c.SetCache(key, ret) - return -} diff --git a/vendor/go.dtapp.net/goredis/slice_result.go b/vendor/go.dtapp.net/goredis/slice_result.go deleted file mode 100644 index d04737ef..00000000 --- a/vendor/go.dtapp.net/goredis/slice_result.go +++ /dev/null @@ -1,31 +0,0 @@ -package goredis - -type SliceResult struct { - Result []interface{} - Err error -} - -// NewSliceResult 构造函数 -func NewSliceResult(result []interface{}, err error) *SliceResult { - return &SliceResult{Result: result, Err: err} -} - -// Unwrap 空值情况下返回错误 -func (r *SliceResult) Unwrap() []interface{} { - if r.Err != nil { - panic(r.Err) - } - return r.Result -} - -// UnwrapOr 空值情况下设置返回默认值 -func (r *SliceResult) UnwrapOr(defaults []interface{}) []interface{} { - if r.Err != nil { - return defaults - } - return r.Result -} - -func (r *SliceResult) Iter() *Iterator { - return NewIterator(r.Result) -} diff --git a/vendor/go.dtapp.net/goredis/string_operation.go b/vendor/go.dtapp.net/goredis/string_operation.go deleted file mode 100644 index e9183aed..00000000 --- a/vendor/go.dtapp.net/goredis/string_operation.go +++ /dev/null @@ -1,43 +0,0 @@ -package goredis - -import ( - "context" - "github.com/go-redis/redis/v8" - "time" -) - -type StringOperation struct { - db *redis.Client - ctx context.Context -} - -func (app *App) NewStringOperation() *StringOperation { - return &StringOperation{ - db: app.Db, - ctx: context.Background(), - } -} - -// Set 设置 -func (o *StringOperation) Set(key string, value interface{}, attrs ...*OperationAttr) *StringResult { - exp := OperationAttrs(attrs).Find(AttrExpr) - if exp == nil { - exp = time.Second * 0 - } - return NewStringResult(o.db.Set(o.ctx, key, value, exp.(time.Duration)).Result()) -} - -// Get 获取单个 -func (o *StringOperation) Get(key string) *StringResult { - return NewStringResult(o.db.Get(o.ctx, key).Result()) -} - -// MGet 获取多个 -func (o *StringOperation) MGet(keys ...string) *SliceResult { - return NewSliceResult(o.db.MGet(o.ctx, keys...).Result()) -} - -// Del 删除key操作，支持批量删除 -func (o *StringOperation) Del(keys ...string) *redis.IntCmd { - return o.db.Del(o.ctx, keys...) -} diff --git a/vendor/go.dtapp.net/goredis/string_result.go b/vendor/go.dtapp.net/goredis/string_result.go deleted file mode 100644 index d9c2c81f..00000000 --- a/vendor/go.dtapp.net/goredis/string_result.go +++ /dev/null @@ -1,38 +0,0 @@ -package goredis - -type StringResult struct { - Result string // 结果 - Err error // 错误 -} - -// NewStringResult 构造函数 -func NewStringResult(result string, err error) *StringResult { - return &StringResult{ - Result: result, - Err: err, - } -} - -// Unwrap 空值情况下返回错误 -func (r *StringResult) Unwrap() string { - if r.Err != nil { - panic(r.Err) - } - return r.Result -} - -// UnwrapOr 空值情况下设置返回默认值 -func (r *StringResult) UnwrapOr(defaults string) string { - if r.Err != nil { - return defaults - } - return r.Result -} - -// UnwrapOrElse 空值情况下设置返回其他 -func (r *StringResult) UnwrapOrElse(f func() string) string { - if r.Err != nil { - return f() - } - return r.Result -} diff --git a/vendor/go.dtapp.net/goredis/version.go b/vendor/go.dtapp.net/goredis/version.go deleted file mode 100644 index ce287517..00000000 --- a/vendor/go.dtapp.net/goredis/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package goredis - -const Version = "1.0.0" diff --git a/vendor/go.dtapp.net/gorequest/.drone.yml b/vendor/go.dtapp.net/gorequest/.drone.yml deleted file mode 100644 index c56c4797..00000000 --- a/vendor/go.dtapp.net/gorequest/.drone.yml +++ /dev/null @@ -1,17 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: Test - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... - - name: Benchmark - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -bench=. -benchmem \ No newline at end of file diff --git a/vendor/go.dtapp.net/gorequest/.gitignore b/vendor/go.dtapp.net/gorequest/.gitignore deleted file mode 100644 index 114804cd..00000000 --- a/vendor/go.dtapp.net/gorequest/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.env -.git -.svn -.idea -.vscode -*.log -gomod.sh -/vendor/ diff --git a/vendor/go.dtapp.net/gorequest/LICENSE b/vendor/go.dtapp.net/gorequest/LICENSE deleted file mode 100644 index a0d0e5bc..00000000 --- a/vendor/go.dtapp.net/gorequest/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 茂名聚合科技有限公司 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/go.dtapp.net/gorequest/README.md b/vendor/go.dtapp.net/gorequest/README.md deleted file mode 100644 index 36b4e58f..00000000 --- a/vendor/go.dtapp.net/gorequest/README.md +++ /dev/null @@ -1,25 +0,0 @@ -

-Golang Request -

- -📦 Golang 请求组件 - -[comment]: <> (go) -[![godoc](https://pkg.go.dev/badge/go.dtapp.net/gorequest?status.svg)](https://pkg.go.dev/go.dtapp.net/gorequest) -[![goproxy.cn](https://goproxy.cn/stats/go.dtapp.net/gorequest/badges/download-count.svg)](https://goproxy.cn/stats/go.dtapp.net/gorequest) -[![goreportcard.com](https://goreportcard.com/badge/go.dtapp.net/gorequest)](https://goreportcard.com/report/go.dtapp.net/gorequest) -[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/go.dtapp.net/gorequest) - -#### 安装使用 - -```go -go get -v -u go.dtapp.net/gorequest -``` - -#### 导入 - -```go -import ( - "go.dtapp.net/gorequest" -) -``` \ No newline at end of file diff --git a/vendor/go.dtapp.net/gorequest/header.go b/vendor/go.dtapp.net/gorequest/header.go deleted file mode 100644 index 7e6aa783..00000000 --- a/vendor/go.dtapp.net/gorequest/header.go +++ /dev/null @@ -1,58 +0,0 @@ -package gorequest - -import ( - "net/url" -) - -// Headers 头部信息 -type Headers map[string]string - -// NewHeaders 新建头部信息 -func NewHeaders() Headers { - P := make(Headers) - return P -} - -// NewNewHeadersWith 头部信息使用 -func NewNewHeadersWith(headers ...Headers) Headers { - p := make(Headers) - for _, v := range headers { - p.SetHeaders(v) - } - return p -} - -// Set 设置头部信息 -func (p Headers) Set(key, value string) { - p[key] = value -} - -// SetHeaders 批量设置头部信息 -func (p Headers) SetHeaders(headers Headers) { - for key, value := range headers { - p[key] = value - } -} - -// GetQuery 获取头部信息 -func (p Headers) GetQuery() string { - u := url.Values{} - for k, v := range p { - u.Set(k, v) - } - return u.Encode() -} - -// DeepCopy 深度复制 -func (p *Headers) DeepCopy() map[string]string { - targetMap := make(map[string]string) - - // 从原始复制到目标 - for key, value := range *p { - targetMap[key] = value - } - - // 重新申请一个新的map - *p = map[string]string{} - return targetMap -} diff --git a/vendor/go.dtapp.net/gorequest/http.go b/vendor/go.dtapp.net/gorequest/http.go deleted file mode 100644 index 096b655b..00000000 --- a/vendor/go.dtapp.net/gorequest/http.go +++ /dev/null @@ -1,301 +0,0 @@ -package gorequest - -import ( - "bytes" - "crypto/tls" - "encoding/json" - "errors" - "fmt" - "go.dtapp.net/gotime" - "io" - "io/ioutil" - "net/http" - "net/url" - "runtime" - "strings" - "time" -) - -var userAgentFormat = "DtApp-Request/%s (%s) GO/%s" - -// Response 返回内容 -type Response struct { - RequestUri string //【请求】链接 - RequestParams Params //【请求】参数 - RequestMethod string //【请求】方式 - RequestHeader Headers //【请求】头部 - RequestTime time.Time //【请求】时间 - ResponseHeader http.Header //【返回】头部 - ResponseStatus string //【返回】状态 - ResponseStatusCode int //【返回】状态码 - ResponseBody []byte //【返回】内容 - ResponseContentLength int64 //【返回】大小 - ResponseTime time.Time //【返回】时间 -} - -// App 实例 -type App struct { - Uri string // 全局请求地址，没有设置url才会使用 - Error error // 错误 - httpUri string // 请求地址 - httpMethod string // 请求方法 - httpHeader Headers // 请求头 - httpParams Params // 请求参数 - responseContent Response // 返回内容 - httpContentType string // 请求内容类型 - debug bool // 是否开启调试模式 - p12Cert *tls.Certificate // p12证书内容 -} - -// 定义 -var ( - httpParamsModeJson = "JSON" - httpParamsModeXml = "XML" - httpParamsModeForm = "FORM" -) - -// NewHttp 实例化 -func NewHttp() *App { - return &App{ - httpHeader: NewHeaders(), - httpParams: NewParams(), - } -} - -// SetDebug 设置调试模式 -func (app *App) SetDebug() { - app.debug = true -} - -// SetUri 设置请求地址 -func (app *App) SetUri(uri string) { - app.httpUri = uri -} - -// SetMethod 设置请求方式 -func (app *App) SetMethod(method string) { - app.httpMethod = method -} - -// SetHeader 设置请求头 -func (app *App) SetHeader(key, value string) { - if key == "" { - panic("url is empty") - } - app.httpHeader.Set(key, value) -} - -// SetHeaders 批量设置请求头 -func (app *App) SetHeaders(headers Headers) { - for key, value := range headers { - app.httpHeader.Set(key, value) - } -} - -// SetAuthToken 设置身份验证令牌 -func (app *App) SetAuthToken(token string) { - app.httpHeader.Set("Authorization", fmt.Sprintf("Bearer %s", token)) -} - -// SetUserAgent 设置用户代理，空字符串就随机设置 -func (app *App) SetUserAgent(ua string) { - if ua == "" { - ua = GetRandomUserAgent() - } - app.httpHeader.Set("User-Agent", ua) -} - -// SetContentTypeJson 设置JSON格式 -func (app *App) SetContentTypeJson() { - app.httpContentType = httpParamsModeJson -} - -// SetContentTypeForm 设置FORM格式 -func (app *App) SetContentTypeForm() { - app.httpContentType = httpParamsModeForm -} - -// SetContentTypeXml 设置XML格式 -func (app *App) SetContentTypeXml() { - app.httpContentType = httpParamsModeXml -} - -// SetParam 设置请求参数 -func (app *App) SetParam(key string, value interface{}) { - if key == "" { - panic("url is empty") - } - app.httpParams.Set(key, value) -} - -// SetParams 批量设置请求参数 -func (app *App) SetParams(params Params) { - for key, value := range params { - app.httpParams.Set(key, value) - } -} - -// SetP12Cert 设置证书 -func (app *App) SetP12Cert(content *tls.Certificate) { - app.p12Cert = content -} - -// Get 发起GET请求 -func (app *App) Get(uri ...string) (httpResponse Response, err error) { - if len(uri) == 1 { - app.Uri = uri[0] - } - // 设置请求方法 - app.httpMethod = http.MethodGet - return request(app) -} - -// Post 发起POST请求 -func (app *App) Post(uri ...string) (httpResponse Response, err error) { - if len(uri) == 1 { - app.Uri = uri[0] - } - // 设置请求方法 - app.httpMethod = http.MethodPost - return request(app) -} - -// Request 发起请求 -func (app *App) Request() (httpResponse Response, err error) { - return request(app) -} - -// 请求接口 -func request(app *App) (httpResponse Response, err error) { - - // 赋值 - httpResponse.RequestTime = gotime.Current().Time - httpResponse.RequestUri = app.httpUri - httpResponse.RequestMethod = app.httpMethod - httpResponse.RequestParams = app.httpParams.DeepCopy() - httpResponse.RequestHeader = app.httpHeader.DeepCopy() - - // 判断网址 - if httpResponse.RequestUri == "" { - httpResponse.RequestUri = app.Uri - } - if httpResponse.RequestUri == "" { - app.Error = errors.New("没有设置Uri") - return httpResponse, app.Error - } - - // 创建 http 客户端 - client := &http.Client{} - - if app.p12Cert != nil { - transport := &http.Transport{ - TLSClientConfig: &tls.Config{ - Certificates: []tls.Certificate{*app.p12Cert}, - }, - DisableCompression: true, - } - client = &http.Client{ - Transport: transport, - } - } - - httpResponse.RequestHeader.Set("Sdk-User-Agent", fmt.Sprintf(userAgentFormat, Version, runtime.GOOS, runtime.Version())) - switch app.httpContentType { - case httpParamsModeJson: - httpResponse.RequestHeader.Set("Content-Type", "application/json") - case httpParamsModeForm: - httpResponse.RequestHeader.Set("Content-Type", "application/x-www-form-urlencoded") - case httpParamsModeXml: - httpResponse.RequestHeader.Set("Content-Type", "text/xml") - } - - // 请求内容 - var reqBody io.Reader - - if httpResponse.RequestMethod == http.MethodPost && app.httpContentType == httpParamsModeJson { - jsonStr, err := json.Marshal(httpResponse.RequestParams) - if err != nil { - app.Error = errors.New(fmt.Sprintf("解析出错 %s", err)) - return httpResponse, app.Error - } - // 赋值 - reqBody = bytes.NewBuffer(jsonStr) - } - - if httpResponse.RequestMethod == http.MethodPost && app.httpContentType == httpParamsModeForm { - // 携带 form 参数 - form := url.Values{} - if len(httpResponse.RequestParams) > 0 { - for k, v := range httpResponse.RequestParams { - form.Add(k, GetParamsString(v)) - } - } - // 赋值 - reqBody = strings.NewReader(form.Encode()) - } - - if app.httpContentType == httpParamsModeXml { - reqBody, err = httpResponse.RequestParams.MarshalXML() - if err != nil { - app.Error = errors.New(fmt.Sprintf("解析XML出错 %s", err)) - return httpResponse, app.Error - } - } - - // 创建请求 - req, err := http.NewRequest(httpResponse.RequestMethod, httpResponse.RequestUri, reqBody) - if err != nil { - app.Error = errors.New(fmt.Sprintf("创建请求出错 %s", err)) - return httpResponse, app.Error - } - - // GET 请求携带查询参数 - if httpResponse.RequestMethod == http.MethodGet { - if len(httpResponse.RequestParams) > 0 { - q := req.URL.Query() - for k, v := range httpResponse.RequestParams { - q.Add(k, GetParamsString(v)) - } - req.URL.RawQuery = q.Encode() - } - } - - // 设置请求头 - if len(httpResponse.RequestHeader) > 0 { - for key, value := range httpResponse.RequestHeader { - req.Header.Set(key, value) - } - } - - // 发送请求 - resp, err := client.Do(req) - if err != nil { - app.Error = errors.New(fmt.Sprintf("请求出错 %s", err)) - return httpResponse, app.Error - } - - // 最后关闭连接 - defer resp.Body.Close() - - // 读取内容 - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - app.Error = errors.New(fmt.Sprintf("解析内容出错 %s", err)) - return httpResponse, app.Error - } - - // 赋值 - httpResponse.ResponseTime = gotime.Current().Time - httpResponse.ResponseStatus = resp.Status - httpResponse.ResponseStatusCode = resp.StatusCode - httpResponse.ResponseHeader = resp.Header - httpResponse.ResponseBody = body - httpResponse.ResponseContentLength = resp.ContentLength - - if app.debug == true { - fmt.Printf("gorequest：%+v\n", httpResponse) - fmt.Printf("gorequest.body：%s\n", httpResponse.ResponseBody) - } - - return httpResponse, err -} diff --git a/vendor/go.dtapp.net/gorequest/ip.go b/vendor/go.dtapp.net/gorequest/ip.go deleted file mode 100644 index d7811a90..00000000 --- a/vendor/go.dtapp.net/gorequest/ip.go +++ /dev/null @@ -1,46 +0,0 @@ -package gorequest - -import ( - "net" - "net/http" - "strings" -) - -// ClientIp 尽最大努力实现获取客户端 IP 的算法。 -// 解析 X-Real-IP 和 X-Forwarded-For 以便于反向代理（nginx 或 haproxy）可以正常工作。 -func ClientIp(r *http.Request) string { - - // 转发IP - xForwardedFor := r.Header.Get("X-Forwarded-For") - ip := strings.TrimSpace(strings.Split(xForwardedFor, ",")[0]) - if ip != "" { - return ip - } - - // 真实Ip - ip = strings.TrimSpace(r.Header.Get("X-Real-Ip")) - if ip != "" { - return ip - } - - // HTTP客户端IP - httpClientIp := r.Header.Get("HTTP_CLIENT_IP") - ip = strings.TrimSpace(strings.Split(httpClientIp, ",")[0]) - if ip != "" { - return ip - } - - // HTTP转发IP - HttpXForwardedFor := r.Header.Get("HTTP_X_FORWARDED_FOR") - ip = strings.TrimSpace(strings.Split(HttpXForwardedFor, ",")[0]) - if ip != "" { - return ip - } - - // 系统 - if ip, _, err := net.SplitHostPort(strings.TrimSpace(r.RemoteAddr)); err == nil { - return ip - } - - return "" -} diff --git a/vendor/go.dtapp.net/gorequest/params.go b/vendor/go.dtapp.net/gorequest/params.go deleted file mode 100644 index 289dc616..00000000 --- a/vendor/go.dtapp.net/gorequest/params.go +++ /dev/null @@ -1,68 +0,0 @@ -package gorequest - -import ( - "encoding/json" - "go.dtapp.net/gostring" - "log" -) - -// Params 参数 -type Params map[string]interface{} - -// NewParams 新建参数 -func NewParams() Params { - P := make(Params) - return P -} - -// NewParamsWith 参数使用 -func NewParamsWith(params ...Params) Params { - p := make(Params) - for _, v := range params { - p.SetParams(v) - } - return p -} - -// Set 设置参数 -func (p Params) Set(key string, value interface{}) { - p[key] = value -} - -// SetParams 批量设置参数 -func (p Params) SetParams(params Params) { - for key, value := range params { - p[key] = value - } -} - -// GetParamsString 获取参数字符串 -func GetParamsString(src interface{}) string { - switch src.(type) { - case string: - return src.(string) - case int, int8, int32, int64: - case uint8, uint16, uint32, uint64: - case float32, float64: - return gostring.ToString(src) - } - data, err := json.Marshal(src) - if err != nil { - log.Fatal(err) - } - return string(data) -} - -// DeepCopy 深度复制 -func (p *Params) DeepCopy() map[string]interface{} { - targetMap := make(map[string]interface{}) - - // 从原始复制到目标 - for key, value := range *p { - targetMap[key] = value - } - - // 重新申请一个新的map - *p = map[string]interface{}{} - return targetMap -} diff --git a/vendor/go.dtapp.net/gorequest/url.go b/vendor/go.dtapp.net/gorequest/url.go deleted file mode 100644 index 0d3ad79f..00000000 --- a/vendor/go.dtapp.net/gorequest/url.go +++ /dev/null @@ -1,70 +0,0 @@ -package gorequest - -import ( - "net/url" - "strings" -) - -// ResponseUrlParse 返回参数 -type ResponseUrlParse struct { - Uri string `json:"uri"` // URI - Urn string `json:"urn"` // URN - Url string `json:"url"` // URL - Scheme string `json:"scheme"` // 协议 - Host string `json:"host"` // 主机 - Hostname string `json:"hostname"` // 主机名 - Port string `json:"port"` // 端口 - Path string `json:"path"` // 路径 - RawQuery string `json:"raw_query"` // 参数 ? - Fragment string `json:"fragment"` // 片段 # -} - -// UriParse 解析URl -func UriParse(input string) (resp ResponseUrlParse) { - parse, err := url.Parse(input) - if err != nil { - return - } - resp.Uri = input - resp.Urn = parse.Host + parse.Path - resp.Url = parse.Scheme + "://" + parse.Host + parse.Path - resp.Scheme = parse.Scheme - resp.Host = parse.Host - resp.Hostname = parse.Hostname() - resp.Port = parse.Port() - resp.Path = parse.Path - resp.RawQuery = parse.RawQuery - resp.Fragment = parse.Fragment - return -} - -// UriFilterExcludeQueryString 过滤掉url中的参数 -func UriFilterExcludeQueryString(uri string) string { - URL, _ := url.Parse(uri) - clearUri := strings.ReplaceAll(uri, URL.RawQuery, "") - clearUri = strings.TrimRight(clearUri, "?") - return strings.TrimRight(clearUri, "/") -} - -// LenCode 编码 -func LenCode(s string) string { - escape := url.QueryEscape(s) - return escape -} - -// DeCode 解码 -func DeCode(s string) string { - unescape, _ := url.QueryUnescape(s) - return unescape -} - -// ParseQuery 获取URL参数 https://studygolang.com/articles/2876 -func ParseQuery(s string) map[string][]string { - u, err := url.Parse(s) - if err != nil { - return nil - } - urlParam := u.RawQuery - m, _ := url.ParseQuery(urlParam) - return m -} diff --git a/vendor/go.dtapp.net/gorequest/user_agent.go b/vendor/go.dtapp.net/gorequest/user_agent.go deleted file mode 100644 index 814d5220..00000000 --- a/vendor/go.dtapp.net/gorequest/user_agent.go +++ /dev/null @@ -1,73 +0,0 @@ -package gorequest - -import ( - "fmt" - "math/rand" - "runtime" - "time" -) - -// GetRandomUserAgent 获取随机UA -func GetRandomUserAgent() string { - r := rand.New(rand.NewSource(time.Now().UnixNano())) - return userAgentList[r.Intn(len(userAgentList))] -} - -var userAgentList = []string{ - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36", // Chrome 2022-02-14 - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0", // Firefox 2022-02-14 - "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko", // IE 2022-02-14 - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Safari/537.36 HeyTapBrowser/40.7.35.1", // Chrome 2022-02-14 - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Safari/537.36 OnePlusBrowser/30.5.0.8", // Chrome 2022-02-14 - "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20060814 Firefox/51.0", // Firefox 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15", // Safari 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15", // Safari 2022-04-18 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.82 Safari/537.36 Edg/98.0.1108.51", // Edge 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 Edg/100.0.1185.44", // Chrome 2022-04-18 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.80 Safari/537.36", // Chrome 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36", // Chrome 2022-04-18 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0", // Firefox 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:99.0) Gecko/20100101 Firefox/99.0", // Firefox 2022-04-18 -} - -// GetRandomUserAgentSystem 获取系统随机UA -func GetRandomUserAgentSystem() string { - r := rand.New(rand.NewSource(time.Now().UnixNano())) - switch runtime.GOOS { - case "linux": - return userAgentListLinux[r.Intn(len(userAgentListLinux))] - case "windows": - return userAgentListWindows[r.Intn(len(userAgentListWindows))] - default: - return userAgentListMac[r.Intn(len(userAgentListMac))] - } -} - -var userAgentListWindows = []string{ - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36", // Chrome 2022-02-14 - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0", // Firefox 2022-02-14 - "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko", // IE 2022-02-14 -} - -var userAgentListLinux = []string{ - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Safari/537.36 HeyTapBrowser/40.7.35.1", // Chrome 2022-02-14 - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Safari/537.36 OnePlusBrowser/30.5.0.8", // Chrome 2022-02-14 - "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20060814 Firefox/51.0", // Firefox 2022-02-14 -} - -var userAgentListMac = []string{ - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15", // Safari 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15", // Safari 2022-04-18 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.82 Safari/537.36 Edg/98.0.1108.51", // Edge 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 Edg/100.0.1185.44", // Chrome 2022-04-18 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.80 Safari/537.36", // Chrome 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36", // Chrome 2022-04-18 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:97.0) Gecko/20100101 Firefox/97.0", // Firefox 2022-02-14 - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:99.0) Gecko/20100101 Firefox/99.0", // Firefox 2022-04-18 -} - -func DtaUa() string { - str := runtime.Version() - content := str[2 : len(str)-0] - return fmt.Sprintf("Go-dta-request/%s/%v", Version, content) -} diff --git a/vendor/go.dtapp.net/gorequest/version.go b/vendor/go.dtapp.net/gorequest/version.go deleted file mode 100644 index 5cfb4198..00000000 --- a/vendor/go.dtapp.net/gorequest/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package gorequest - -const Version = "1.0.19" diff --git a/vendor/go.dtapp.net/gorequest/xml.go b/vendor/go.dtapp.net/gorequest/xml.go deleted file mode 100644 index 3c1d272c..00000000 --- a/vendor/go.dtapp.net/gorequest/xml.go +++ /dev/null @@ -1,47 +0,0 @@ -package gorequest - -import ( - "bytes" - "encoding/xml" - "fmt" - "io" -) - -// MarshalXML 结构体转xml -func (p Params) MarshalXML() (reader io.Reader, err error) { - buffer := bytes.NewBuffer(make([]byte, 0)) - - if _, err = io.WriteString(buffer, ""); err != nil { - return - } - - for k, v := range p { - switch { - case k == "detail": - if _, err = io.WriteString(buffer, ""); err != nil { - return - } - default: - if _, err = io.WriteString(buffer, "<"+k+">"); err != nil { - return - } - if err = xml.EscapeText(buffer, []byte(fmt.Sprintf("%v", v))); err != nil { - return - } - if _, err = io.WriteString(buffer, ""); err != nil { - return - } - } - } - - if _, err = io.WriteString(buffer, ""); err != nil { - return - } - return buffer, nil -} diff --git a/vendor/go.dtapp.net/gostring/.drone.yml b/vendor/go.dtapp.net/gostring/.drone.yml deleted file mode 100644 index 511f0fc9..00000000 --- a/vendor/go.dtapp.net/gostring/.drone.yml +++ /dev/null @@ -1,11 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: test-golang - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... \ No newline at end of file diff --git a/vendor/go.dtapp.net/gostring/.gitignore b/vendor/go.dtapp.net/gostring/.gitignore deleted file mode 100644 index 2b895f41..00000000 --- a/vendor/go.dtapp.net/gostring/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.env -.git -.svn -.idea -.vscode -*.log -gitmod.sh \ No newline at end of file diff --git a/vendor/go.dtapp.net/gostring/.travis.yml b/vendor/go.dtapp.net/gostring/.travis.yml deleted file mode 100644 index 688142cc..00000000 --- a/vendor/go.dtapp.net/gostring/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: go - -go: - - master - -script: - - go test -v ./... \ No newline at end of file diff --git a/vendor/go.dtapp.net/gostring/LICENSE b/vendor/go.dtapp.net/gostring/LICENSE deleted file mode 100644 index a0d0e5bc..00000000 --- a/vendor/go.dtapp.net/gostring/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 茂名聚合科技有限公司 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/go.dtapp.net/gostring/README.md b/vendor/go.dtapp.net/gostring/README.md deleted file mode 100644 index 3d746997..00000000 --- a/vendor/go.dtapp.net/gostring/README.md +++ /dev/null @@ -1,25 +0,0 @@ -

-Golang String -

- -📦 Golang 字符串组件 - -[comment]: <> (go) -[![godoc](https://pkg.go.dev/badge/go.dtapp.net/gostring?status.svg)](https://pkg.go.dev/go.dtapp.net/gostring) -[![goproxy.cn](https://goproxy.cn/stats/go.dtapp.net/gostring/badges/download-count.svg)](https://goproxy.cn/stats/go.dtapp.net/gostring) -[![goreportcard.com](https://goreportcard.com/badge/go.dtapp.net/gostring)](https://goreportcard.com/report/go.dtapp.net/gostring) -[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/go.dtapp.net/gostring) - -#### 安装使用 - -```go -go get -v -u go.dtapp.net/gostring -``` - -#### 导入 - -```go -import ( - "go.dtapp.net/gostring" -) -``` \ No newline at end of file diff --git a/vendor/go.dtapp.net/gostring/gostring.go b/vendor/go.dtapp.net/gostring/gostring.go deleted file mode 100644 index c489f7dc..00000000 --- a/vendor/go.dtapp.net/gostring/gostring.go +++ /dev/null @@ -1,151 +0,0 @@ -package gostring - -import ( - "crypto/hmac" - "crypto/sha256" - "encoding/hex" - "fmt" - "strconv" - "strings" - "unicode/utf8" -) - -const Version = "1.0.3" - -// ToString 转换成string -func ToString(value interface{}) string { - if value == nil { - return "" - } - return fmt.Sprint(value) -} - -// ToFloat64 string到float64 -func ToFloat64(s string) float64 { - i, _ := strconv.ParseFloat(s, 64) - return i -} - -// ToInt string到int -func ToInt(s string) int { - i, _ := strconv.Atoi(s) - return i -} - -// ToInt64 string到int64 -func ToInt64(s string) int64 { - i, err := strconv.ParseInt(s, 10, 64) - if err == nil { - return i - } - return int64(ToFloat64(s)) -} - -// ToUint string到uint64 -func ToUint(s string) uint { - i, err := strconv.ParseUint(s, 10, 64) - if err == nil { - return uint(i) - } - return 0 -} - -// ToUint64 string到uint64 -func ToUint64(s string) uint64 { - i, err := strconv.ParseUint(s, 10, 64) - if err == nil { - return i - } - return 0 -} - -// Replace 字符串替换 -func Replace(str, old, new string) string { - return strings.Replace(str, old, new, -1) -} - -func HmacSha256Hex(key, strToSign string) string { - hasHer := hmac.New(sha256.New, []byte(key)) - hasHer.Write([]byte(strToSign)) - return hex.EncodeToString(hasHer.Sum(nil)) -} - -// Space 去除空格 -func Space(str string) string { - return strings.Replace(str, " ", "", -1) -} - -// LineBreak 去除换行符 -func LineBreak(str string) string { - return strings.Replace(str, "\n", "", -1) -} - -// SpaceAndLineBreak 去除空格和去除换行符 -func SpaceAndLineBreak(str string) string { - return LineBreak(Space(str)) -} - -// TrimLastChar 删除字符串中的最后一个 -func TrimLastChar(s string) string { - r, size := utf8.DecodeLastRuneInString(s) - if r == utf8.RuneError && (size == 0 || size == 1) { - size = 0 - } - return s[:len(s)-size] -} - -// Split 字符串分隔 -func Split(s string, sep string) []string { - return strings.Split(s, sep) -} - -// Contains 判断字符串是否包含某个字符 -func Contains(s, substr string) bool { - return strings.Contains(s, substr) -} - -func NumericalToString(value interface{}) (string, bool) { - var val string - - switch value.(type) { - default: - return "0", false - case int: - intVal, _ := value.(int) - val = strconv.FormatInt(int64(intVal), 10) - case int8: - intVal, _ := value.(int8) - val = strconv.FormatInt(int64(intVal), 10) - case int16: - intVal, _ := value.(int16) - val = strconv.FormatInt(int64(intVal), 10) - case int32: - intVal, _ := value.(int32) - val = strconv.FormatInt(int64(intVal), 10) - case int64: - intVal, _ := value.(int64) - val = strconv.FormatInt(int64(intVal), 10) - case uint: - intVal, _ := value.(uint) - val = strconv.FormatUint(uint64(intVal), 10) - case uint8: - intVal, _ := value.(uint8) - val = strconv.FormatUint(uint64(intVal), 10) - case uint16: - intVal, _ := value.(uint16) - val = strconv.FormatUint(uint64(intVal), 10) - case uint32: - intVal, _ := value.(uint32) - val = strconv.FormatUint(uint64(intVal), 10) - case uint64: - intVal, _ := value.(uint64) - val = strconv.FormatUint(intVal, 10) - case float32: - floatVal, _ := value.(float32) - val = strconv.FormatFloat(float64(floatVal), 'f', -1, 32) - case float64: - floatVal, _ := value.(float64) - val = strconv.FormatFloat(floatVal, 'f', -1, 64) - } - return val, true -} diff --git a/vendor/go.dtapp.net/gotime/.drone.yml b/vendor/go.dtapp.net/gotime/.drone.yml deleted file mode 100644 index 511f0fc9..00000000 --- a/vendor/go.dtapp.net/gotime/.drone.yml +++ /dev/null @@ -1,11 +0,0 @@ -kind: pipeline -type: docker -name: clone - -steps: - - name: test-golang - image: golang:1.18 - commands: - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go test -v ./... \ No newline at end of file diff --git a/vendor/go.dtapp.net/gotime/.gitignore b/vendor/go.dtapp.net/gotime/.gitignore deleted file mode 100644 index 2ee9f269..00000000 --- a/vendor/go.dtapp.net/gotime/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.env -.git -.svn -.idea -.vscode -.log -gomod.sh \ No newline at end of file diff --git a/vendor/go.dtapp.net/gotime/.travis.yml b/vendor/go.dtapp.net/gotime/.travis.yml deleted file mode 100644 index 688142cc..00000000 --- a/vendor/go.dtapp.net/gotime/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: go - -go: - - master - -script: - - go test -v ./... \ No newline at end of file diff --git a/vendor/go.dtapp.net/gotime/LICENSE b/vendor/go.dtapp.net/gotime/LICENSE deleted file mode 100644 index a0d0e5bc..00000000 --- a/vendor/go.dtapp.net/gotime/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 茂名聚合科技有限公司 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/go.dtapp.net/gotime/README.md b/vendor/go.dtapp.net/gotime/README.md deleted file mode 100644 index 97c8f75d..00000000 --- a/vendor/go.dtapp.net/gotime/README.md +++ /dev/null @@ -1,25 +0,0 @@ -

-Golang Time -

- -📦 Golang 时间组件 - -[comment]: <> (go) -[![godoc](https://pkg.go.dev/badge/go.dtapp.net/gotime?status.svg)](https://pkg.go.dev/go.dtapp.net/gotime) -[![goproxy.cn](https://goproxy.cn/stats/go.dtapp.net/gotime/badges/download-count.svg)](https://goproxy.cn/stats/go.dtapp.net/gotime) -[![goreportcard.com](https://goreportcard.com/badge/go.dtapp.net/gotime)](https://goreportcard.com/report/go.dtapp.net/gotime) -[![deps.dev](https://img.shields.io/badge/deps-go-red.svg)](https://deps.dev/go/go.dtapp.net/gotime) - -#### 安装使用 - -```go -go get -v -u go.dtapp.net/gotime -``` - -#### 导入 - -```go -import ( - "go.dtapp.net/gotime" -) -``` \ No newline at end of file diff --git a/vendor/go.dtapp.net/gotime/Tomorrow.go b/vendor/go.dtapp.net/gotime/Tomorrow.go deleted file mode 100644 index e91268f5..00000000 --- a/vendor/go.dtapp.net/gotime/Tomorrow.go +++ /dev/null @@ -1,15 +0,0 @@ -package gotime - -import "time" - -// Tomorrow 明天 -func Tomorrow() Pro { - p := NewPro() - location, err := time.LoadLocation("Asia/Shanghai") - if err != nil { - p.Time = time.Now().Add(time.Hour*8).AddDate(0, 0, +1) - } else { - p.Time = time.Now().In(location).AddDate(0, 0, +1) - } - return p -} diff --git a/vendor/go.dtapp.net/gotime/app.go b/vendor/go.dtapp.net/gotime/app.go deleted file mode 100644 index 4905ba23..00000000 --- a/vendor/go.dtapp.net/gotime/app.go +++ /dev/null @@ -1,107 +0,0 @@ -package gotime - -import ( - "fmt" - "time" -) - -const Version = "1.0.2" - -// 时间格式化常量 -const ( - RFC3339Format = time.RFC3339 - Iso8601Format = "2006-01-02T15:04:05-07:00" - CookieFormat = "Monday, 02-Jan-2006 15:04:05 MST" - RFC1036Format = "Mon, 02 Jan 06 15:04:05 -0700" - RFC7231Format = "Mon, 02 Jan 2006 15:04:05 GMT" - DayDateTimeFormat = "Mon, Jan 2, 2006 3:04 PM" - DateTimeFormat = "2006-01-02 15:04:05" - DateFormat = "2006-01-02" - TimeFormat = "15:04:05" - ShortDateTimeFormat = "20060102150405" - ShortDateFormat = "20060102" - ShortTimeFormat = "150405" -) - -// Pro 结构体 -type Pro struct { - Time time.Time - loc *time.Location - Error error -} - -// NewPro 初始化结构体 -func NewPro() Pro { - return Pro{ - Time: time.Now(), - } -} - -// BeforeSeconds 获取n秒前的时间 -func (p Pro) BeforeSeconds(seconds int) Pro { - st, _ := time.ParseDuration(fmt.Sprintf("-%ds", seconds)) - p.Time = p.Time.Add(st) - return p -} - -// AfterSeconds 获取n秒后的时间 -func (p Pro) AfterSeconds(seconds int) Pro { - st, _ := time.ParseDuration(fmt.Sprintf("+%ds", seconds)) - p.Time = p.Time.Add(st) - return p -} - -// BeforeMinute 获取n分钟前的时间 -func (p Pro) BeforeMinute(seconds int) Pro { - st, _ := time.ParseDuration(fmt.Sprintf("-%dm", seconds)) - p.Time = p.Time.Add(st) - return p -} - -// AfterMinute 获取n分钟后的时间 -func (p Pro) AfterMinute(seconds int) Pro { - st, _ := time.ParseDuration(fmt.Sprintf("+%dm", seconds)) - p.Time = p.Time.Add(st) - return p -} - -// BeforeHour 获取n小时前的时间 -func (p Pro) BeforeHour(hour int) Pro { - st, _ := time.ParseDuration(fmt.Sprintf("-%dh", hour)) - p.Time = p.Time.Add(st) - return p -} - -// AfterHour 获取n小时后的时间 -func (p Pro) AfterHour(hour int) Pro { - st, _ := time.ParseDuration(fmt.Sprintf("+%dh", hour)) - p.Time = p.Time.Add(st) - return p -} - -// BeforeDay 获取n天前的时间 -func (p Pro) BeforeDay(day int) Pro { - p.Time = p.Time.AddDate(0, 0, -day) - return p -} - -// AfterDay 获取n天后的时间 -func (p Pro) AfterDay(day int) Pro { - p.Time = p.Time.AddDate(0, 0, day) - return p -} - -// SetFormat 格式化 -func (p Pro) SetFormat(layout string) string { - return p.Time.Format(layout) -} - -// Month 获取当前月 -func (p Pro) Month() int { - return p.MonthOfYear() -} - -// MonthOfYear 获取本年的第几月 -func (p Pro) MonthOfYear() int { - return int(p.Time.In(p.loc).Month()) -} diff --git a/vendor/go.dtapp.net/gotime/compare.go b/vendor/go.dtapp.net/gotime/compare.go deleted file mode 100644 index bc899641..00000000 --- a/vendor/go.dtapp.net/gotime/compare.go +++ /dev/null @@ -1,65 +0,0 @@ -package gotime - -import "time" - -// Gt 是否大于 -func (p Pro) Gt(t2 time.Time) bool { - return p.Time.After(t2) -} - -// Lt 是否小于 -func (p Pro) Lt(t2 time.Time) bool { - return p.Time.Before(t2) -} - -// Eq 是否等于 -func (p Pro) Eq(t2 time.Time) bool { - return p.Time.Equal(t2) -} - -// Ne 是否不等于 -func (p Pro) Ne(t2 time.Time) bool { - return !p.Eq(t2) -} - -// Gte 是否大于等于 -func (p Pro) Gte(t2 time.Time) bool { - return p.Gt(t2) || p.Eq(t2) -} - -// Lte 是否小于等于 -func (p Pro) Lte(t2 time.Time) bool { - return p.Lt(t2) || p.Eq(t2) -} - -// Between 是否在两个时间之间(不包括这两个时间) -func (p Pro) Between(start time.Time, end time.Time) bool { - if p.Gt(start) && p.Lt(end) { - return true - } - return false -} - -// BetweenIncludedStart 是否在两个时间之间(包括开始时间) -func (p Pro) BetweenIncludedStart(start time.Time, end time.Time) bool { - if p.Gte(start) && p.Lt(end) { - return true - } - return false -} - -// BetweenIncludedEnd 是否在两个时间之间(包括结束时间) -func (p Pro) BetweenIncludedEnd(start time.Time, end time.Time) bool { - if p.Gt(start) && p.Lte(end) { - return true - } - return false -} - -// BetweenIncludedBoth 是否在两个时间之间(包括这两个时间) -func (p Pro) BetweenIncludedBoth(start time.Time, end time.Time) bool { - if p.Gte(start) && p.Lte(end) { - return true - } - return false -} diff --git a/vendor/go.dtapp.net/gotime/differ.go b/vendor/go.dtapp.net/gotime/differ.go deleted file mode 100644 index 0ad3033e..00000000 --- a/vendor/go.dtapp.net/gotime/differ.go +++ /dev/null @@ -1,69 +0,0 @@ -package gotime - -import "time" - -// DiffInHour 相差多少小时 -func (p Pro) DiffInHour(t2 time.Time) (hour int64) { - t2.Before(p.Time) - diff := p.Time.Unix() - t2.Unix() - hour = diff / 3600 - return hour -} - -// DiffInHourWithAbs 相差多少小时(绝对值) -func (p Pro) DiffInHourWithAbs(t2 time.Time) (hour int64) { - p.Time.Before(t2) - diff := t2.Unix() - p.Time.Unix() - hour = diff / 3600 - if hour > 0 { - return hour - } - t2.Before(p.Time) - diff = p.Time.Unix() - t2.Unix() - hour = diff / 3600 - return hour -} - -// DiffInMinutes 相差多少分钟 -func (p Pro) DiffInMinutes(t2 time.Time) (hour int64) { - t2.Before(p.Time) - diff := p.Time.Unix() - t2.Unix() - hour = diff / 60 - return hour -} - -// DiffInMinutesWithAbs 相差多少分钟(绝对值) -func (p Pro) DiffInMinutesWithAbs(t2 time.Time) (hour int64) { - p.Time.Before(t2) - diff := t2.Unix() - p.Time.Unix() - hour = diff / 60 - if hour > 0 { - return hour - } - t2.Before(p.Time) - diff = p.Time.Unix() - t2.Unix() - hour = diff / 60 - return hour -} - -// DiffInSecond 相差多少秒 -func (p Pro) DiffInSecond(t2 time.Time) (hour int64) { - t2.Before(p.Time) - diff := p.Time.Unix() - t2.Unix() - hour = diff - return hour -} - -// DiffInSecondWithAbs 相差多少秒(绝对值) -func (p Pro) DiffInSecondWithAbs(t2 time.Time) (hour int64) { - p.Time.Before(t2) - diff := t2.Unix() - p.Time.Unix() - hour = diff - if hour > 0 { - return hour - } - t2.Before(p.Time) - diff = p.Time.Unix() - t2.Unix() - hour = diff - return hour -} diff --git a/vendor/go.dtapp.net/gotime/errors.go b/vendor/go.dtapp.net/gotime/errors.go deleted file mode 100644 index 2f69622f..00000000 --- a/vendor/go.dtapp.net/gotime/errors.go +++ /dev/null @@ -1,8 +0,0 @@ -package gotime - -import "fmt" - -// invalidTimezoneError 无效的时区错误 -var invalidTimezoneError = func(timezone string) error { - return fmt.Errorf("invalid timezone %q, please see the file %q for all valid timezones", timezone, "$GOROOT/lib/time/zoneinfo.zip") -} diff --git a/vendor/go.dtapp.net/gotime/location.go b/vendor/go.dtapp.net/gotime/location.go deleted file mode 100644 index 1b664ab0..00000000 --- a/vendor/go.dtapp.net/gotime/location.go +++ /dev/null @@ -1,14 +0,0 @@ -package gotime - -import ( - "time" -) - -// 通过时区获取 Location 实例 -func getLocationByTimezone(timezone string) (*time.Location, error) { - loc, err := time.LoadLocation(timezone) - if err != nil { - err = invalidTimezoneError(timezone) - } - return loc, err -} diff --git a/vendor/go.dtapp.net/gotime/mongo.go b/vendor/go.dtapp.net/gotime/mongo.go deleted file mode 100644 index 314fe541..00000000 --- a/vendor/go.dtapp.net/gotime/mongo.go +++ /dev/null @@ -1,6 +0,0 @@ -package gotime - -// Bson mongoDB -func (p Pro) Bson() string { - return p.Now().String() -} diff --git a/vendor/go.dtapp.net/gotime/start_end.go b/vendor/go.dtapp.net/gotime/start_end.go deleted file mode 100644 index 5afb4f50..00000000 --- a/vendor/go.dtapp.net/gotime/start_end.go +++ /dev/null @@ -1,124 +0,0 @@ -package gotime - -import "time" - -// 数字常量 -const ( - YearsPerMillennium = 1000 // 每千年1000年 - YearsPerCentury = 100 // 每世纪100年 - YearsPerDecade = 10 // 每十年10年 - QuartersPerYear = 4 // 每年4季度 - MonthsPerYear = 12 // 每年12月 - MonthsPerQuarter = 3 // 每季度3月 - WeeksPerNormalYear = 52 // 每常规年52周 - weeksPerLongYear = 53 // 每长年53周 - WeeksPerMonth = 4 // 每月4周 - DaysPerLeapYear = 366 // 每闰年366天 - DaysPerNormalYear = 365 // 每常规年365天 - DaysPerWeek = 7 // 每周7天 - HoursPerWeek = 168 // 每周168小时 - HoursPerDay = 24 // 每天24小时 - MinutesPerDay = 1440 // 每天1440分钟 - MinutesPerHour = 60 // 每小时60分钟 - SecondsPerWeek = 604800 // 每周604800秒 - SecondsPerDay = 86400 // 每天86400秒 - SecondsPerHour = 3600 // 每小时3600秒 - SecondsPerMinute = 60 // 每分钟60秒 - MillisecondsPerSecond = 1000 // 每秒1000毫秒 - MicrosecondsPerMillisecond = 1000 // 每毫秒1000微秒 - MicrosecondsPerSecond = 1000000 // 每秒1000000微秒 -) - -// StartOfCentury 本世纪开始时间 -func (p Pro) StartOfCentury() Pro { - p.Time = time.Date(p.Time.Year()/YearsPerCentury*YearsPerCentury, 1, 1, 0, 0, 0, 0, p.Time.Location()) - return p -} - -// EndOfCentury 本世纪结束时间 -func (p Pro) EndOfCentury() Pro { - p.Time = time.Date(p.Time.Year()/YearsPerCentury*YearsPerCentury+99, 12, 31, 23, 59, 59, 999999999, p.Time.Location()) - return p -} - -// StartOfDecade 本年代开始时间 -func (p Pro) StartOfDecade() Pro { - p.Time = time.Date(p.Time.Year()/YearsPerDecade*YearsPerDecade, 1, 1, 0, 0, 0, 0, p.Time.Location()) - return p -} - -// EndOfDecade 本年代结束时间 -func (p Pro) EndOfDecade() Pro { - p.Time = time.Date(p.Time.Year()/YearsPerDecade*YearsPerDecade+9, 12, 31, 23, 59, 59, 999999999, p.Time.Location()) - return p -} - -// StartOfYear 本年开始时间 -func (p Pro) StartOfYear() Pro { - p.Time = time.Date(p.Time.Year(), 1, 1, 0, 0, 0, 0, p.Time.Location()) - return p -} - -// EndOfYear 本年结束时间 -func (p Pro) EndOfYear() Pro { - p.Time = time.Date(p.Time.Year(), 12, 31, 23, 59, 59, 999999999, p.Time.Location()) - return p -} - -// Quarter 获取当前季度 -func (p Pro) Quarter() (quarter int) { - switch { - case p.Time.Month() >= 10: - quarter = 4 - case p.Time.Month() >= 7: - quarter = 3 - case p.Time.Month() >= 4: - quarter = 2 - case p.Time.Month() >= 1: - quarter = 1 - } - return -} - -// StartOfQuarter 本季度开始时间 -func (p Pro) StartOfQuarter() Pro { - p.Time = time.Date(p.Time.Year(), time.Month(3*p.Quarter()-2), 1, 0, 0, 0, 0, p.Time.Location()) - return p -} - -// EndOfQuarter 本季度结束时间 -func (p Pro) EndOfQuarter() Pro { - quarter, day := p.Quarter(), 30 - switch quarter { - case 1, 4: - day = 31 - case 2, 3: - day = 30 - } - p.Time = time.Date(p.Time.Year(), time.Month(3*quarter), day, 23, 59, 59, 999999999, p.Time.Location()) - return p -} - -// StartOfMonth 本月开始时间 -func (p Pro) StartOfMonth() Pro { - p.Time = time.Date(p.Time.Year(), time.Month(p.Month()), 1, 0, 0, 0, 0, p.Time.Location()) - return p -} - -// EndOfMonth 本月结束时间 -func (p Pro) EndOfMonth() Pro { - p.Time = time.Date(p.Time.Year(), time.Month(p.Month()), 1, 23, 59, 59, 999999999, p.Time.Location()) - return p -} - -// StartOfDay 本日开始时间 -func (p Pro) StartOfDay() Pro { - p.Time = time.Date(p.Time.Year(), p.Time.Month(), p.Time.Day(), 0, 0, 0, 0, p.Time.Location()) - return p -} - -// EndOfDay 本日结束时间 -func (p Pro) EndOfDay() Pro { - p.Time = time.Date(p.Time.Year(), p.Time.Month(), p.Time.Day(), 23, 59, 59, 0, p.Time.Location()) - return p -} diff --git a/vendor/go.dtapp.net/gotime/today.go b/vendor/go.dtapp.net/gotime/today.go deleted file mode 100644 index f19f505e..00000000 --- a/vendor/go.dtapp.net/gotime/today.go +++ /dev/null @@ -1,112 +0,0 @@ -package gotime - -import ( - "log" - "strconv" - "strings" - "time" -) - -// Current 获取当前的时间 -func Current() Pro { - p := NewPro() - p.loc, p.Error = time.LoadLocation("Asia/Shanghai") - if p.Error != nil { - // Docker部署golang应用时时区问题 https://www.ddhigh.com/2018/03/01/golang-docker-timezone.html - log.Printf("【gotime】时区错误：%v\n", p.Error) - p.Time = time.Now().Add(time.Hour * 8) - } else { - p.Time = time.Now().In(p.loc) - } - return p -} - -// SetCurrent 设置当前的时间 -func SetCurrent(sTime time.Time) Pro { - p := NewPro() - p.Time = sTime - return p -} - -// SetCurrentParse 设置当前的时间 -func SetCurrentParse(str string) Pro { - - p := NewPro() - - p.loc, p.Error = time.LoadLocation("Asia/Shanghai") - - layout := DateTimeFormat - if str == "" || str == "0" || str == "0000-00-00 00:00:00" || str == "0000-00-00" || str == "00:00:00" { - return p - } - if len(str) == 10 && strings.Count(str, "-") == 2 { - layout = DateFormat - } - if strings.Index(str, "T") == 10 { - layout = RFC3339Format - } - if _, err := strconv.ParseInt(str, 10, 64); err == nil { - switch len(str) { - case 8: - layout = ShortDateFormat - case 14: - layout = ShortDateTimeFormat - } - } - location, _ := time.ParseInLocation(layout, str, p.loc) - - p.Time = location - return p -} - -// SetCurrentUnix 设置当前的时间 Unix时间戳 -func SetCurrentUnix(ts int64) Pro { - p := NewPro() - p.Time = time.Unix(ts, 0) - return p -} - -// Now 今天此刻 -func (p Pro) Now() time.Time { - return p.Time -} - -// Format 今天此刻格式化 -func (p Pro) Format() string { - return p.Time.Format(DateTimeFormat) -} - -// ToDateFormat 今天此刻日期 -func (p Pro) ToDateFormat() string { - return p.Time.Format(DateFormat) -} - -// ToTimeFormat 今天此刻时间 -func (p Pro) ToTimeFormat() string { - return p.Time.Format(TimeFormat) -} - -// Timestamp 今天此刻时间戳 -func (p Pro) Timestamp() int64 { - return p.Time.Unix() -} - -// TimestampWithSecond 今天此刻时间戳 -func (p Pro) TimestampWithSecond() int64 { - return p.Time.Unix() -} - -// TimestampWithMillisecond 今天毫秒级时间戳 -func (p Pro) TimestampWithMillisecond() int64 { - return p.Time.UnixNano() / int64(time.Millisecond) -} - -// TimestampWithMicrosecond 今天微秒级时间戳 -func (p Pro) TimestampWithMicrosecond() int64 { - return p.Time.UnixNano() / int64(time.Microsecond) -} - -// TimestampWithNanosecond 今天纳秒级时间戳 -func (p Pro) TimestampWithNanosecond() int64 { - return p.Time.UnixNano() -} diff --git a/vendor/go.dtapp.net/gotime/yesterday.go b/vendor/go.dtapp.net/gotime/yesterday.go deleted file mode 100644 index be1cd6c6..00000000 --- a/vendor/go.dtapp.net/gotime/yesterday.go +++ /dev/null @@ -1,17 +0,0 @@ -package gotime - -import ( - "time" -) - -// Yesterday 昨天 -func Yesterday() Pro { - p := NewPro() - location, err := time.LoadLocation("Asia/Shanghai") - if err != nil { - p.Time = time.Now().Add(time.Hour*8).AddDate(0, 0, -1) - } else { - p.Time = time.Now().In(location).AddDate(0, 0, -1) - } - return p -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 2019fe11..acba9bbf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -70,6 +70,8 @@ github.com/baidubce/bce-sdk-go/util/log # github.com/basgys/goxml2json v1.1.0 ## explicit github.com/basgys/goxml2json +# github.com/bitly/go-simplejson v0.5.0 +## explicit # github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d ## explicit; go 1.12 github.com/bradfitz/gomemcache/memcache @@ -272,6 +274,8 @@ github.com/qiniu/go-sdk/v7/storage github.com/saracen/go7z github.com/saracen/go7z/filters github.com/saracen/go7z/headers +# github.com/saracen/go7z-fixtures v0.0.0-20190623165746-aa6b8fba1d2f +## explicit # github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f ## explicit github.com/saracen/solidblock @@ -307,33 +311,6 @@ github.com/xdg-go/stringprep # github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a ## explicit; go 1.12 github.com/youmark/pkcs8 -# go.dtapp.net/goip v1.0.16 -## explicit; go 1.18 -go.dtapp.net/goip -go.dtapp.net/goip/ip2region -go.dtapp.net/goip/v4 -go.dtapp.net/goip/v6 -# go.dtapp.net/gojson v1.0.0 -## explicit; go 1.18 -go.dtapp.net/gojson -# go.dtapp.net/golog v1.0.13 -## explicit; go 1.18 -go.dtapp.net/golog -# go.dtapp.net/gomongo v1.0.8 -## explicit; go 1.18 -go.dtapp.net/gomongo -# go.dtapp.net/goredis v1.0.0 -## explicit; go 1.18 -go.dtapp.net/goredis -# go.dtapp.net/gorequest v1.0.19 -## explicit; go 1.18 -go.dtapp.net/gorequest -# go.dtapp.net/gostring v1.0.3 -## explicit; go 1.18 -go.dtapp.net/gostring -# go.dtapp.net/gotime v1.0.2 -## explicit; go 1.18 -go.dtapp.net/gotime # go.etcd.io/etcd/api/v3 v3.5.4 ## explicit; go 1.16 go.etcd.io/etcd/api/v3/authpb