From 60b413c90afaf22431bce25d9be2d18d03b50dec Mon Sep 17 00:00:00 2001 From: Bowen Date: Sat, 8 Jun 2024 14:51:25 +0800 Subject: [PATCH 1/5] release: v1.2.0 --- README.md | 9 +++++---- go.mod | 34 +++++++++++++++++----------------- go.sum | 16 ++++++++++++++++ logo.png | Bin 16438 -> 0 bytes oss_test.go | 8 ++++---- 5 files changed, 42 insertions(+), 25 deletions(-) delete mode 100644 logo.png diff --git a/README.md b/README.md index 0e175d4..9e69d69 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,11 @@ An OSS disk driver for `facades.Storage()` of Goravel. ## Version -| goravel/oss | goravel/framework | -| ---------- | -------------- | -| v1.1.* | v1.13.* | -| v1.0.* | v1.12.* | +| goravel/oss | goravel/framework | +|-------------|-------------------| +| v1.2.* | v1.14.* | +| v1.1.* | v1.13.* | +| v1.0.* | v1.12.* | ## Install diff --git a/go.mod b/go.mod index 5c6804c..0e67550 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/goravel/oss -go 1.20 +go 1.21 require ( github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible github.com/gookit/color v1.5.4 - github.com/goravel/framework v1.13.2 + github.com/goravel/framework v1.14.0 github.com/stretchr/testify v1.9.0 ) @@ -15,15 +15,15 @@ require ( github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/containerd/continuity v0.3.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/cli v20.10.22+incompatible // indirect github.com/docker/docker v20.10.24+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gabriel-vasile/mimetype v1.4.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-module/carbon/v2 v2.2.8 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang-module/carbon/v2 v2.3.12 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/kr/pretty v0.3.1 // indirect @@ -34,23 +34,23 @@ require ( github.com/opencontainers/runc v1.1.5 // indirect github.com/ory/dockertest/v3 v3.10.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect - golang.org/x/mod v0.10.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.9.1 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/grpc v1.58.2 // indirect - google.golang.org/protobuf v1.31.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect + google.golang.org/grpc v1.64.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 2348379..73b581a 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,7 @@ github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/cli v20.10.22+incompatible h1:0E7UqWPcn4SlvLImMHyh6xwyNRUGdPxhstpHeh0bFL0= github.com/docker/cli v20.10.22+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE= @@ -34,6 +35,7 @@ github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -41,9 +43,11 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-module/carbon/v2 v2.2.8 h1:a1VxHHKAR7fc1ho7sYXhS1s5S4x7+oqAf2EY5p8C46A= github.com/golang-module/carbon/v2 v2.2.8/go.mod h1:XDALX7KgqmHk95xyLeaqX9/LJGbfLATyruTziq68SZ8= +github.com/golang-module/carbon/v2 v2.3.12/go.mod h1:HNsedGzXGuNciZImYP2OMnpiwq/vhIstR/vn45ib5cI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= @@ -53,6 +57,7 @@ github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= github.com/goravel/framework v1.13.2 h1:7BRNihQ/ZNeA384941yg8zRytXRXkkStksXNyyUEgQI= github.com/goravel/framework v1.13.2/go.mod h1:BOUTIwzhOMyKNXaxSYbVB74NkmbS2xv1W1fPRv9eDws= +github.com/goravel/framework v1.14.0/go.mod h1:rScDXGQZdoVfyxemNPmijlz/2a+lWNOa4jTuak5GGVg= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -86,6 +91,7 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -127,10 +133,12 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 h1:pVgRXcIictcr+lBQIFeiwuwtDIs4eL21OuM9nyAADmo= golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -138,6 +146,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -157,32 +166,39 @@ golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/logo.png b/logo.png deleted file mode 100644 index 830dda49f9e49829b168dcd6cc0d95e62523592a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16438 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 diff --git a/oss_test.go b/oss_test.go index 8b6094d..c7b5575 100644 --- a/oss_test.go +++ b/oss_test.go @@ -15,8 +15,8 @@ import ( "github.com/goravel/framework/support/carbon" "github.com/stretchr/testify/assert" - configmocks "github.com/goravel/framework/contracts/config/mocks" - contractsfilesystem "github.com/goravel/framework/contracts/filesystem" + filesystemcontract "github.com/goravel/framework/contracts/filesystem" + configmock "github.com/goravel/framework/mocks/config" ) func TestStorage(t *testing.T) { @@ -28,7 +28,7 @@ func TestStorage(t *testing.T) { assert.Nil(t, os.WriteFile("test.txt", []byte("Goravel"), 0644)) url := os.Getenv("ALIYUN_URL") - mockConfig := &configmocks.Config{} + mockConfig := &configmock.Config{} mockConfig.On("GetString", "app.timezone").Return("UTC") mockConfig.On("GetString", "filesystems.disks.oss.key").Return(os.Getenv("ALIYUN_ACCESS_KEY_ID")) mockConfig.On("GetString", "filesystems.disks.oss.secret").Return(os.Getenv("ALIYUN_ACCESS_KEY_SECRET")) @@ -407,7 +407,7 @@ type File struct { path string } -func (f *File) Disk(disk string) contractsfilesystem.File { +func (f *File) Disk(disk string) filesystemcontract.File { return &File{} } From f3f15d164983105ddab286a4b0a0f17181395eee Mon Sep 17 00:00:00 2001 From: Bowen Date: Sat, 8 Jun 2024 14:52:52 +0800 Subject: [PATCH 2/5] Update action --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 647097c..1e690dd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: matrix: go: - '1.21' - - '1.20' + - '1.22' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -26,7 +26,7 @@ jobs: matrix: go: - '1.21' - - '1.20' + - '1.22' runs-on: windows-latest steps: - uses: actions/checkout@v4 From 9aa4b837765729044c086a86d55f5fbd58878a7c Mon Sep 17 00:00:00 2001 From: Bowen Date: Sat, 8 Jun 2024 14:55:57 +0800 Subject: [PATCH 3/5] add logo --- logo.png | Bin 0 -> 10853 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 logo.png diff --git a/logo.png b/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2103c8d67a2265ba1ddd2ebf1cec71028d2b0d42 GIT binary patch literal 10853 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 BBai?9 literal 0 HcmV?d00001 From c79a852c96e157b0900e01bb5a5fb07f50261815 Mon Sep 17 00:00:00 2001 From: Bowen Date: Sat, 8 Jun 2024 15:03:52 +0800 Subject: [PATCH 4/5] update lint --- go.mod | 26 -------- go.sum | 174 +++++----------------------------------------------- oss.go | 2 +- oss_test.go | 4 +- 4 files changed, 18 insertions(+), 188 deletions(-) diff --git a/go.mod b/go.mod index 0e67550..f4dd35f 100644 --- a/go.mod +++ b/go.mod @@ -10,48 +10,22 @@ require ( ) require ( - github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect - github.com/containerd/continuity v0.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/docker/cli v20.10.22+incompatible // indirect - github.com/docker/docker v20.10.24+incompatible // indirect - github.com/docker/go-connections v0.4.0 // indirect - github.com/docker/go-units v0.5.0 // indirect github.com/gabriel-vasile/mimetype v1.4.4 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-module/carbon/v2 v2.3.12 // indirect - github.com/golang/protobuf v1.5.4 // indirect - github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/imdario/mergo v0.3.13 // indirect github.com/kr/pretty v0.3.1 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/moby/term v0.5.0 // indirect - github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/opencontainers/runc v1.1.5 // indirect - github.com/ory/dockertest/v3 v3.10.0 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect - github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect - github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 73b581a..acfdadb 100644 --- a/go.sum +++ b/go.sum @@ -1,67 +1,20 @@ -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= -github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= -github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= -github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= -github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docker/cli v20.10.22+incompatible h1:0E7UqWPcn4SlvLImMHyh6xwyNRUGdPxhstpHeh0bFL0= -github.com/docker/cli v20.10.22+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE= -github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I= github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-module/carbon/v2 v2.2.8 h1:a1VxHHKAR7fc1ho7sYXhS1s5S4x7+oqAf2EY5p8C46A= -github.com/golang-module/carbon/v2 v2.2.8/go.mod h1:XDALX7KgqmHk95xyLeaqX9/LJGbfLATyruTziq68SZ8= +github.com/golang-module/carbon/v2 v2.3.12 h1:VC1DwN1kBwJkh5MjXmTFryjs5g4CWyoM8HAHffZPX/k= github.com/golang-module/carbon/v2 v2.3.12/go.mod h1:HNsedGzXGuNciZImYP2OMnpiwq/vhIstR/vn45ib5cI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= -github.com/goravel/framework v1.13.2 h1:7BRNihQ/ZNeA384941yg8zRytXRXkkStksXNyyUEgQI= -github.com/goravel/framework v1.13.2/go.mod h1:BOUTIwzhOMyKNXaxSYbVB74NkmbS2xv1W1fPRv9eDws= +github.com/goravel/framework v1.14.0 h1:UhlFBTLkLJwKgJTCSmnExXmBkgQsP0RTvQnE0+1m7DA= github.com/goravel/framework v1.14.0/go.mod h1:rScDXGQZdoVfyxemNPmijlz/2a+lWNOa4jTuak5GGVg= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -69,35 +22,12 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= -github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= -github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= -github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= -github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= -github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4= -github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -105,108 +35,34 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 h1:pVgRXcIictcr+lBQIFeiwuwtDIs4eL21OuM9nyAADmo= -golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= -google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo= diff --git a/oss.go b/oss.go index ecd4d1d..11326bb 100644 --- a/oss.go +++ b/oss.go @@ -317,7 +317,7 @@ func (r *Oss) Size(file string) (int64, error) { } func (r *Oss) TemporaryUrl(file string, t time.Time) (string, error) { - signedURL, err := r.bucketInstance.SignURL(file, oss.HTTPGet, int64(t.Sub(carbon.Now().ToStdTime()).Seconds())) + signedURL, err := r.bucketInstance.SignURL(file, oss.HTTPGet, int64(t.Sub(carbon.Now().StdTime()).Seconds())) if err != nil { return "", err } diff --git a/oss_test.go b/oss_test.go index c7b5575..c0c8e4a 100644 --- a/oss_test.go +++ b/oss_test.go @@ -225,7 +225,7 @@ func TestStorage(t *testing.T) { l, err := time.LoadLocation("UTC") assert.Nil(t, err) - assert.Equal(t, carbon.Now().ToStdTime().In(l).Format("2006-01-02 15"), date.Format("2006-01-02 15")) + assert.Equal(t, carbon.Now().StdTime().In(l).Format("2006-01-02 15"), date.Format("2006-01-02 15")) assert.Nil(t, driver.DeleteDirectory(rootFolder+"LastModified")) }, }, @@ -364,7 +364,7 @@ func TestStorage(t *testing.T) { setup: func() { assert.Nil(t, driver.Put(rootFolder+"TemporaryUrl/1.txt", "Goravel")) assert.True(t, driver.Exists(rootFolder+"TemporaryUrl/1.txt")) - url, err := driver.TemporaryUrl(rootFolder+"TemporaryUrl/1.txt", carbon.Now().ToStdTime().Add(5*time.Second)) + url, err := driver.TemporaryUrl(rootFolder+"TemporaryUrl/1.txt", carbon.Now().StdTime().Add(5*time.Second)) assert.Nil(t, err) assert.NotEmpty(t, url) resp, err := http.Get(url) From 1def993d6360725119e967de5f2a5f1eaf1ee123 Mon Sep 17 00:00:00 2001 From: Bowen Date: Sat, 8 Jun 2024 15:05:52 +0800 Subject: [PATCH 5/5] update lint --- oss_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oss_test.go b/oss_test.go index c0c8e4a..6d19ad1 100644 --- a/oss_test.go +++ b/oss_test.go @@ -432,7 +432,7 @@ func (f *File) HashName(path ...string) string { } func (f *File) LastModified() (time.Time, error) { - return carbon.Now().ToStdTime(), nil + return carbon.Now().StdTime(), nil } func (f *File) MimeType() (string, error) {