diff --git a/controllers/account.go b/controllers/account.go index 6d4c97cf..39e9432e 100644 --- a/controllers/account.go +++ b/controllers/account.go @@ -21,9 +21,9 @@ import ( "strconv" "strings" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/original" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/original" + "github.com/casbin/casdoor/util" ) const ( diff --git a/controllers/application.go b/controllers/application.go index 36bb3946..59930de3 100644 --- a/controllers/application.go +++ b/controllers/application.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) // @Title GetApplications diff --git a/controllers/auth.go b/controllers/auth.go index ac2fe9a8..e2dfac7e 100644 --- a/controllers/auth.go +++ b/controllers/auth.go @@ -22,9 +22,9 @@ import ( "time" "github.com/astaxie/beego" - "github.com/casdoor/casdoor/idp" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/idp" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/util" ) func codeToResponse(code *object.Code) *Response { diff --git a/controllers/base.go b/controllers/base.go index 4824a20b..3649b8ba 100644 --- a/controllers/base.go +++ b/controllers/base.go @@ -18,7 +18,7 @@ import ( "time" "github.com/astaxie/beego" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" ) type ApiController struct { diff --git a/controllers/ldap.go b/controllers/ldap.go index 334e3ca8..d9a28827 100644 --- a/controllers/ldap.go +++ b/controllers/ldap.go @@ -16,8 +16,8 @@ package controllers import ( "encoding/json" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/util" ) type LdapServer struct { diff --git a/controllers/link.go b/controllers/link.go index 6f2654c2..d96f1b41 100644 --- a/controllers/link.go +++ b/controllers/link.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) type LinkForm struct { diff --git a/controllers/organization.go b/controllers/organization.go index abaee896..2d5389c4 100644 --- a/controllers/organization.go +++ b/controllers/organization.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) // @Title GetOrganizations diff --git a/controllers/provider.go b/controllers/provider.go index 2acb4e4c..fbf7a707 100644 --- a/controllers/provider.go +++ b/controllers/provider.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) // @Title GetProviders diff --git a/controllers/record.go b/controllers/record.go index 177bde19..0e4f8f6b 100644 --- a/controllers/record.go +++ b/controllers/record.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) // @Title GetRecords diff --git a/controllers/token.go b/controllers/token.go index 45110fe6..dac2543e 100644 --- a/controllers/token.go +++ b/controllers/token.go @@ -17,7 +17,7 @@ package controllers import ( "encoding/json" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) // @Title GetTokens diff --git a/controllers/user.go b/controllers/user.go index ed1f6a87..4fca41cb 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/original" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/original" ) // @Title GetGlobalUsers diff --git a/controllers/verification.go b/controllers/verification.go index 8d99f331..1757ad10 100644 --- a/controllers/verification.go +++ b/controllers/verification.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/util" ) func (c *ApiController) getCurrentUser() *object.User { diff --git a/go.mod b/go.mod index 3eaf865d..ab8e8723 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/casdoor/casdoor +module github.com/casbin/casdoor go 1.15 diff --git a/main.go b/main.go index e113e4f5..7ce67083 100644 --- a/main.go +++ b/main.go @@ -18,12 +18,12 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/plugins/cors" - "github.com/casdoor/casdoor/authz" - "github.com/casdoor/casdoor/controllers" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/routers" + "github.com/casbin/casdoor/authz" + "github.com/casbin/casdoor/controllers" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/routers" - _ "github.com/casdoor/casdoor/routers" + _ "github.com/casbin/casdoor/routers" ) func main() { diff --git a/object/application.go b/object/application.go index 2c464335..049be193 100644 --- a/object/application.go +++ b/object/application.go @@ -15,7 +15,7 @@ package object import ( - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" "xorm.io/core" ) diff --git a/object/check.go b/object/check.go index 40d222e2..1e123ce1 100644 --- a/object/check.go +++ b/object/check.go @@ -18,7 +18,7 @@ import ( "fmt" "regexp" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" ) var reWhiteSpace *regexp.Regexp diff --git a/object/init.go b/object/init.go index 55f1c3ce..b1350d55 100644 --- a/object/init.go +++ b/object/init.go @@ -14,7 +14,7 @@ package object -import "github.com/casdoor/casdoor/util" +import "github.com/casbin/casdoor/util" func InitDb() { initBuiltInOrganization() diff --git a/object/ldap.go b/object/ldap.go index 31d68fc2..83771568 100644 --- a/object/ldap.go +++ b/object/ldap.go @@ -17,7 +17,7 @@ package object import ( "errors" "fmt" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" goldap "github.com/go-ldap/ldap/v3" "github.com/thanhpk/randstr" "strings" diff --git a/object/organization.go b/object/organization.go index b048120a..3bf8f8a1 100644 --- a/object/organization.go +++ b/object/organization.go @@ -15,7 +15,7 @@ package object import ( - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" "xorm.io/core" ) diff --git a/object/provider.go b/object/provider.go index 6c272c09..e86c7b12 100644 --- a/object/provider.go +++ b/object/provider.go @@ -15,7 +15,7 @@ package object import ( - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" "xorm.io/core" ) diff --git a/object/record.go b/object/record.go index 3058bf7a..e0d3b2c8 100644 --- a/object/record.go +++ b/object/record.go @@ -15,7 +15,7 @@ package object import ( - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" ) type Records struct { diff --git a/object/token.go b/object/token.go index 821c2f70..07daaf11 100644 --- a/object/token.go +++ b/object/token.go @@ -17,7 +17,7 @@ package object import ( "strings" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" "xorm.io/core" ) diff --git a/object/user.go b/object/user.go index 1804abb8..1ed0763d 100644 --- a/object/user.go +++ b/object/user.go @@ -17,7 +17,7 @@ package object import ( "fmt" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" "xorm.io/core" ) diff --git a/object/user_cred.go b/object/user_cred.go index 46a25486..1a745603 100644 --- a/object/user_cred.go +++ b/object/user_cred.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" ) func calculateHash(user *User) string { diff --git a/object/user_test.go b/object/user_test.go index 4f939d47..64c436fd 100644 --- a/object/user_test.go +++ b/object/user_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" "xorm.io/core" ) diff --git a/object/user_util.go b/object/user_util.go index 2d1b9cb6..17021f61 100644 --- a/object/user_util.go +++ b/object/user_util.go @@ -19,7 +19,7 @@ import ( "reflect" "strings" - "github.com/casdoor/casdoor/idp" + "github.com/casbin/casdoor/idp" "xorm.io/core" ) diff --git a/object/verification.go b/object/verification.go index 98bf6bb4..4313e89d 100644 --- a/object/verification.go +++ b/object/verification.go @@ -20,7 +20,7 @@ import ( "time" "github.com/astaxie/beego" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" "xorm.io/core" ) diff --git a/original/adapter.go b/original/adapter.go index 39d0409e..79628ce0 100644 --- a/original/adapter.go +++ b/original/adapter.go @@ -16,7 +16,7 @@ package original import ( "github.com/astaxie/beego" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" _ "github.com/go-sql-driver/mysql" // db = mysql //_ "github.com/lib/pq" // db = postgres ) diff --git a/original/public_api.go b/original/public_api.go index da68ac57..9439ac73 100644 --- a/original/public_api.go +++ b/original/public_api.go @@ -17,7 +17,7 @@ package original import ( "fmt" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) func isEnabled() bool { diff --git a/original/sync.go b/original/sync.go index 6c3dbe89..030fc2a9 100644 --- a/original/sync.go +++ b/original/sync.go @@ -19,8 +19,8 @@ import ( "strconv" "strings" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/util" ) func getFullAvatarUrl(avatar string) string { diff --git a/original/user.go b/original/user.go index 8063a2df..70240d0c 100644 --- a/original/user.go +++ b/original/user.go @@ -14,7 +14,7 @@ package original -import "github.com/casdoor/casdoor/object" +import "github.com/casbin/casdoor/object" func getUsers() []*object.User { users := object.GetUsers(orgName) diff --git a/original/user_original.go b/original/user_original.go index ade91d69..b96f26f2 100644 --- a/original/user_original.go +++ b/original/user_original.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" ) type User struct { diff --git a/original/user_original_test.go b/original/user_original_test.go index 8db05159..a79ef9a4 100644 --- a/original/user_original_test.go +++ b/original/user_original_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/casdoor/casdoor/object" + "github.com/casbin/casdoor/object" ) func TestGetUsers(t *testing.T) { diff --git a/routers/authz_filter.go b/routers/authz_filter.go index 2540b27a..86ab65dc 100644 --- a/routers/authz_filter.go +++ b/routers/authz_filter.go @@ -21,10 +21,10 @@ import ( "strings" "github.com/astaxie/beego/context" - "github.com/casdoor/casdoor/authz" - "github.com/casdoor/casdoor/controllers" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/authz" + "github.com/casbin/casdoor/controllers" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/util" ) type Object struct { diff --git a/routers/auto_login_filter.go b/routers/auto_login_filter.go index a8b97214..aa2d0371 100644 --- a/routers/auto_login_filter.go +++ b/routers/auto_login_filter.go @@ -19,9 +19,9 @@ import ( "net/url" "github.com/astaxie/beego/context" - "github.com/casdoor/casdoor/controllers" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/controllers" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/util" ) func getSessionUser(ctx *context.Context) string { diff --git a/routers/record.go b/routers/record.go index 4cbe53c0..6cfe9731 100644 --- a/routers/record.go +++ b/routers/record.go @@ -18,8 +18,8 @@ import ( "strings" "github.com/astaxie/beego/context" - "github.com/casdoor/casdoor/object" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/object" + "github.com/casbin/casdoor/util" ) func getUser(ctx *context.Context) (username string) { diff --git a/routers/router.go b/routers/router.go index 1de18e39..6030ee53 100644 --- a/routers/router.go +++ b/routers/router.go @@ -21,7 +21,7 @@ package routers import ( "github.com/astaxie/beego" - "github.com/casdoor/casdoor/controllers" + "github.com/casbin/casdoor/controllers" ) func init() { diff --git a/routers/static_filter.go b/routers/static_filter.go index ea755345..e048e35e 100644 --- a/routers/static_filter.go +++ b/routers/static_filter.go @@ -19,7 +19,7 @@ import ( "strings" "github.com/astaxie/beego/context" - "github.com/casdoor/casdoor/util" + "github.com/casbin/casdoor/util" ) func StaticFilter(ctx *context.Context) { diff --git a/swagger/index.html b/swagger/index.html index d425107a..f5e4d694 100644 --- a/swagger/index.html +++ b/swagger/index.html @@ -31,7 +31,7 @@ - +