diff --git a/conf/conf.go b/conf/conf.go index 38343c22..16ec1ba7 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/astaxie/beego" + "github.com/beego/beego" ) func init() { diff --git a/conf/conf_test.go b/conf/conf_test.go index c7cc8a79..db0286f3 100644 --- a/conf/conf_test.go +++ b/conf/conf_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "github.com/astaxie/beego" + "github.com/beego/beego" "github.com/stretchr/testify/assert" ) diff --git a/controllers/application.go b/controllers/application.go index 518f07e8..8449bce1 100644 --- a/controllers/application.go +++ b/controllers/application.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/base.go b/controllers/base.go index 7d7153a5..08af3d4b 100644 --- a/controllers/base.go +++ b/controllers/base.go @@ -18,8 +18,8 @@ import ( "strings" "time" - "github.com/astaxie/beego" - "github.com/astaxie/beego/logs" + "github.com/beego/beego" + "github.com/beego/beego/logs" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/casbin_adapter.go b/controllers/casbin_adapter.go index 5f3e303f..4d394b9a 100644 --- a/controllers/casbin_adapter.go +++ b/controllers/casbin_adapter.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/cert.go b/controllers/cert.go index 2f1882ad..f685c2d7 100644 --- a/controllers/cert.go +++ b/controllers/cert.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/model.go b/controllers/model.go index 682bcd23..2a2e4f93 100644 --- a/controllers/model.go +++ b/controllers/model.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/organization.go b/controllers/organization.go index dada3de1..a42a0cb3 100644 --- a/controllers/organization.go +++ b/controllers/organization.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/payment.go b/controllers/payment.go index e3c52608..a4bbe387 100644 --- a/controllers/payment.go +++ b/controllers/payment.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/permission.go b/controllers/permission.go index d33c9311..b23fa542 100644 --- a/controllers/permission.go +++ b/controllers/permission.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/product.go b/controllers/product.go index e37469af..f947f025 100644 --- a/controllers/product.go +++ b/controllers/product.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/provider.go b/controllers/provider.go index 7f00ed67..20b98b4f 100644 --- a/controllers/provider.go +++ b/controllers/provider.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/record.go b/controllers/record.go index 4f5678ac..fa49005b 100644 --- a/controllers/record.go +++ b/controllers/record.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/resource.go b/controllers/resource.go index da7469a0..5113685b 100644 --- a/controllers/resource.go +++ b/controllers/resource.go @@ -22,7 +22,7 @@ import ( "mime" "path/filepath" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/role.go b/controllers/role.go index b9870551..1b72cfc4 100644 --- a/controllers/role.go +++ b/controllers/role.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/syncer.go b/controllers/syncer.go index 22dab5e4..1d2c02f0 100644 --- a/controllers/syncer.go +++ b/controllers/syncer.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/token.go b/controllers/token.go index 8492c42e..5dc5b208 100644 --- a/controllers/token.go +++ b/controllers/token.go @@ -18,7 +18,7 @@ import ( "encoding/json" "net/http" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/user.go b/controllers/user.go index 185d3d87..678b192e 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/controllers/webhook.go b/controllers/webhook.go index 24bc8e0a..d434cc3f 100644 --- a/controllers/webhook.go +++ b/controllers/webhook.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/astaxie/beego/utils/pagination" + "github.com/beego/beego/utils/pagination" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/go.mod b/go.mod index 1b54b0d2..ce1e7cc4 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.16 require ( github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387 - github.com/astaxie/beego v1.12.3 github.com/aws/aws-sdk-go v1.44.4 + github.com/beego/beego v1.12.11 github.com/beevik/etree v1.1.0 github.com/casbin/casbin/v2 v2.30.1 github.com/casbin/xorm-adapter/v3 v3.0.1 diff --git a/go.sum b/go.sum index 8beb2f1c..84161861 100644 --- a/go.sum +++ b/go.sum @@ -74,13 +74,13 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.61.1075/go.mod h1:pUKYbK5JQ+1Dfxk80P0q github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8Gq34cBFbzSpQZVVT9N09TM= github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= -github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ= -github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA= github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/aws/aws-sdk-go v1.44.4 h1:ePN0CVJMdiz2vYUcJH96eyxRrtKGSDMgyhP6rah2OgE= github.com/aws/aws-sdk-go v1.44.4/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= +github.com/beego/beego v1.12.11 h1:MWKcnpavb7iAIS0m6uuEq6pHKkYvGNw/5umIUKqL7jM= +github.com/beego/beego v1.12.11/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6WkLAs= github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ= github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -115,9 +115,9 @@ github.com/cloudflare/cfssl v0.0.0-20190726000631-633726f6bcb7 h1:Puu1hUwfps3+1C github.com/cloudflare/cfssl v0.0.0-20190726000631-633726f6bcb7/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U= -github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c= -github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs= +github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A= +github.com/couchbase/gomemcached v0.1.2-0.20201224031647-c432ccf49f32/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo= +github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -341,7 +341,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -412,7 +411,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= -github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE= @@ -430,7 +428,7 @@ github.com/twilio/twilio-go v0.26.0/go.mod h1:lz62Hopu4vicpQ056H5TJ0JE4AP0rS3sQ3 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/volcengine/volc-sdk-golang v1.0.19 h1:jJp+aJgK0e//rZ9I0K2Y7ufJwvuZRo/AQsYDynXMNgA= github.com/volcengine/volc-sdk-golang v1.0.19/go.mod h1:+GGi447k4p1I5PNdbpG2GLaF0Ui9vIInTojMM0IfSS4= -github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc= +github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -458,6 +456,7 @@ golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -566,6 +565,7 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -597,6 +597,7 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/main.go b/main.go index c61432aa..4db4ef2b 100644 --- a/main.go +++ b/main.go @@ -18,9 +18,9 @@ import ( "flag" "fmt" - "github.com/astaxie/beego" - "github.com/astaxie/beego/logs" - _ "github.com/astaxie/beego/session/redis" + "github.com/beego/beego" + "github.com/beego/beego/logs" + _ "github.com/beego/beego/session/redis" "github.com/casdoor/casdoor/authz" "github.com/casdoor/casdoor/conf" "github.com/casdoor/casdoor/controllers" diff --git a/object/adapter.go b/object/adapter.go index 21a9c1ca..16b5d88d 100644 --- a/object/adapter.go +++ b/object/adapter.go @@ -18,7 +18,7 @@ import ( "fmt" "runtime" - "github.com/astaxie/beego" + "github.com/beego/beego" "github.com/casdoor/casdoor/conf" "github.com/casdoor/casdoor/util" _ "github.com/denisenkom/go-mssqldb" // db = mssql diff --git a/object/ldap.go b/object/ldap.go index 1e08754e..ac53a9f9 100644 --- a/object/ldap.go +++ b/object/ldap.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "github.com/astaxie/beego" + "github.com/beego/beego" "github.com/casdoor/casdoor/util" goldap "github.com/go-ldap/ldap/v3" "github.com/thanhpk/randstr" diff --git a/object/ldap_autosync.go b/object/ldap_autosync.go index dbc77e8c..2e0a8aa4 100644 --- a/object/ldap_autosync.go +++ b/object/ldap_autosync.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/logs" + "github.com/beego/beego/logs" "github.com/casdoor/casdoor/util" ) diff --git a/object/record.go b/object/record.go index a02fc31f..aa10e9b8 100644 --- a/object/record.go +++ b/object/record.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/astaxie/beego/context" + "github.com/beego/beego/context" "github.com/casdoor/casdoor/conf" "github.com/casdoor/casdoor/util" ) diff --git a/routers/authz_filter.go b/routers/authz_filter.go index 031c2251..efb74131 100644 --- a/routers/authz_filter.go +++ b/routers/authz_filter.go @@ -20,7 +20,7 @@ import ( "net/http" "strings" - "github.com/astaxie/beego/context" + "github.com/beego/beego/context" "github.com/casdoor/casdoor/authz" "github.com/casdoor/casdoor/util" ) diff --git a/routers/auto_signin_filter.go b/routers/auto_signin_filter.go index bbe86312..786ed6ac 100644 --- a/routers/auto_signin_filter.go +++ b/routers/auto_signin_filter.go @@ -17,7 +17,7 @@ package routers import ( "fmt" - "github.com/astaxie/beego/context" + "github.com/beego/beego/context" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/routers/base.go b/routers/base.go index 1f021dcb..7b41cb8a 100644 --- a/routers/base.go +++ b/routers/base.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/astaxie/beego/context" + "github.com/beego/beego/context" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/routers/cors_filter.go b/routers/cors_filter.go index 06055df1..cbda29b1 100644 --- a/routers/cors_filter.go +++ b/routers/cors_filter.go @@ -17,7 +17,7 @@ package routers import ( "net/http" - "github.com/astaxie/beego/context" + "github.com/beego/beego/context" "github.com/casdoor/casdoor/conf" "github.com/casdoor/casdoor/object" ) diff --git a/routers/record.go b/routers/record.go index f65b6720..0f7fadea 100644 --- a/routers/record.go +++ b/routers/record.go @@ -17,7 +17,7 @@ package routers import ( "fmt" - "github.com/astaxie/beego/context" + "github.com/beego/beego/context" "github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/util" ) diff --git a/routers/router.go b/routers/router.go index 3fc66f9c..e4d04b0c 100644 --- a/routers/router.go +++ b/routers/router.go @@ -20,7 +20,7 @@ package routers import ( - "github.com/astaxie/beego" + "github.com/beego/beego" "github.com/casdoor/casdoor/controllers" ) diff --git a/routers/static_filter.go b/routers/static_filter.go index 0f787fe9..9131799f 100644 --- a/routers/static_filter.go +++ b/routers/static_filter.go @@ -19,7 +19,7 @@ import ( "os" "strings" - "github.com/astaxie/beego/context" + "github.com/beego/beego/context" "github.com/casdoor/casdoor/conf" "github.com/casdoor/casdoor/util" ) diff --git a/util/log.go b/util/log.go index 5e99f987..a47cc91c 100644 --- a/util/log.go +++ b/util/log.go @@ -19,8 +19,8 @@ import ( "net/http" "strings" - "github.com/astaxie/beego/context" - "github.com/astaxie/beego/logs" + "github.com/beego/beego/context" + "github.com/beego/beego/logs" ) func GetIPInfo(clientIP string) string { diff --git a/util/routine.go b/util/routine.go index 086d3423..fc2585d2 100644 --- a/util/routine.go +++ b/util/routine.go @@ -17,7 +17,7 @@ package util import ( "fmt" - "github.com/astaxie/beego/logs" + "github.com/beego/beego/logs" ) func SafeGoroutine(fn func()) {