diff --git a/components/core/system_component.go b/components/core/system_component.go index 73328ff..ca78201 100644 --- a/components/core/system_component.go +++ b/components/core/system_component.go @@ -6,7 +6,6 @@ import ( "sync" "time" - "github.com/google/uuid" "github.com/reiver/greatape/providers/outbound/email" "github.com/reiver/greatape/providers/outbound/sms" . "github.com/xeronith/diamante/contracts/email" @@ -85,11 +84,11 @@ func (component *systemComponent) UnixNano() int64 { } func (component *systemComponent) GenerateUUID() string { - return uuid.New().String() + return utility.GenerateUUID() } func (component *systemComponent) GenerateSalt() string { - return uuid.New().String() + return utility.GenerateUUID() } func (component *systemComponent) GenerateHash(value string, salt string) string { diff --git a/go.mod b/go.mod index 8bb8fea..2009f02 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,9 @@ module github.com/reiver/greatape go 1.19 require ( - github.com/google/uuid v1.3.0 github.com/robfig/cron v1.2.0 github.com/sendgrid/sendgrid-go v3.12.0+incompatible - github.com/xeronith/diamante v1.5.7 + github.com/xeronith/diamante v1.6.0 google.golang.org/protobuf v1.28.1 ) @@ -14,6 +13,7 @@ require ( github.com/andybalholm/brotli v1.0.5 // indirect github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect + github.com/gofrs/uuid v3.3.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.2 // indirect diff --git a/go.sum b/go.sum index bc56a61..a773c30 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:Dddq github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84= +github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= @@ -19,8 +21,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/influxdata/influxdb v1.11.0 h1:0X+ZsbcOWc6AEi5MHee9BYqXCKmz8IZsljrRYjmV8Qg= @@ -76,8 +76,8 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/xeronith/diamante v1.5.7 h1:bnCKGfX1r6l9z+C39KTUBUvW+KtAqEgV6JkZ155sBl4= -github.com/xeronith/diamante v1.5.7/go.mod h1:NN8ADVJERhPi8OtLTVWR6vAEWSu60RMFfG4e2Uh+DcY= +github.com/xeronith/diamante v1.6.0 h1:joMl5ZM4za/YCnYtsC6nBGslmkcp04MNBurfYd6KWA8= +github.com/xeronith/diamante v1.6.0/go.mod h1:bbUv8CmwbOaknbNlRWlekNYQkxTfM69T1GxbJorMUqI= 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=