llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace casdoor with casbin (#194)

Browse Source 
Signed-off-by: sh1luo <690898835@qq.com>
This commit is contained in:
sh1luo 2021-07-25 09:34:25 +08:00 committed by GitHub
parent 3bbb0fb58e
commit c632c3c307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/account.go
View File

@ -21,9 +21,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/original" "github.com/casbin/casdoor/original"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
const ( const (

2
controllers/application.go
View File

@ -17,7 +17,7 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
// @Title GetApplications // @Title GetApplications

6
controllers/auth.go
View File

@ -22,9 +22,9 @@ import (
"time" "time"
"github.com/astaxie/beego" "github.com/astaxie/beego"
"github.com/casdoor/casdoor/idp" "github.com/casbin/casdoor/idp"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
func codeToResponse(code *object.Code) *Response { func codeToResponse(code *object.Code) *Response {

2
controllers/base.go
View File

@ -18,7 +18,7 @@ import (
"time" "time"
"github.com/astaxie/beego" "github.com/astaxie/beego"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
type ApiController struct { type ApiController struct {

4
controllers/ldap.go
View File

@ -16,8 +16,8 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
type LdapServer struct { type LdapServer struct {

2
controllers/link.go
View File

@ -17,7 +17,7 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
type LinkForm struct { type LinkForm struct {

2
controllers/organization.go
View File

@ -17,7 +17,7 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
// @Title GetOrganizations // @Title GetOrganizations

2
controllers/provider.go
View File

@ -17,7 +17,7 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
// @Title GetProviders // @Title GetProviders

2
controllers/record.go
View File

@ -17,7 +17,7 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
// @Title GetRecords // @Title GetRecords

2
controllers/token.go
View File

@ -17,7 +17,7 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
// @Title GetTokens // @Title GetTokens

4
controllers/user.go
View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/original" "github.com/casbin/casdoor/original"
) )
// @Title GetGlobalUsers // @Title GetGlobalUsers

4
controllers/verification.go
View File

@ -18,8 +18,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
func (c *ApiController) getCurrentUser() *object.User { func (c *ApiController) getCurrentUser() *object.User {

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/casdoor/casdoor module github.com/casbin/casdoor
go 1.15 go 1.15

10
main.go
View File

@ -18,12 +18,12 @@ import (
"github.com/astaxie/beego" "github.com/astaxie/beego"
"github.com/astaxie/beego/logs" "github.com/astaxie/beego/logs"
"github.com/astaxie/beego/plugins/cors" "github.com/astaxie/beego/plugins/cors"
"github.com/casdoor/casdoor/authz" "github.com/casbin/casdoor/authz"
"github.com/casdoor/casdoor/controllers" "github.com/casbin/casdoor/controllers"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/routers" "github.com/casbin/casdoor/routers"
_ "github.com/casdoor/casdoor/routers" _ "github.com/casbin/casdoor/routers"
) )
func main() { func main() {

2
object/application.go
View File

@ -15,7 +15,7 @@
package object package object
import ( import (
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )

2
object/check.go
View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"regexp" "regexp"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
var reWhiteSpace *regexp.Regexp var reWhiteSpace *regexp.Regexp

2
object/init.go
View File

@ -14,7 +14,7 @@
package object package object
import "github.com/casdoor/casdoor/util" import "github.com/casbin/casdoor/util"
func InitDb() { func InitDb() {
initBuiltInOrganization() initBuiltInOrganization()

2
object/ldap.go
View File

@ -17,7 +17,7 @@ package object
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
goldap "github.com/go-ldap/ldap/v3" goldap "github.com/go-ldap/ldap/v3"
"github.com/thanhpk/randstr" "github.com/thanhpk/randstr"
"strings" "strings"

2
object/organization.go
View File

@ -15,7 +15,7 @@
package object package object
import ( import (
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )

2
object/provider.go
View File

@ -15,7 +15,7 @@
package object package object
import ( import (
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )

2
object/record.go
View File

@ -15,7 +15,7 @@
package object package object
import ( import (
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
type Records struct { type Records struct {

2
object/token.go
View File

@ -17,7 +17,7 @@ package object
import ( import (
"strings" "strings"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )

2
object/user.go
View File

@ -17,7 +17,7 @@ package object
import ( import (
"fmt" "fmt"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )

2
object/user_cred.go
View File

@ -18,7 +18,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
func calculateHash(user *User) string { func calculateHash(user *User) string {

2
object/user_test.go
View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )

2
object/user_util.go
View File

@ -19,7 +19,7 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/casdoor/casdoor/idp" "github.com/casbin/casdoor/idp"
"xorm.io/core" "xorm.io/core"
) )

2
object/verification.go
View File

@ -20,7 +20,7 @@ import (
"time" "time"
"github.com/astaxie/beego" "github.com/astaxie/beego"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )

2
original/adapter.go
View File

@ -16,7 +16,7 @@ package original
import ( import (
"github.com/astaxie/beego" "github.com/astaxie/beego"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
_ "github.com/go-sql-driver/mysql" // db = mysql _ "github.com/go-sql-driver/mysql" // db = mysql
//_ "github.com/lib/pq" // db = postgres //_ "github.com/lib/pq" // db = postgres
) )

2
original/public_api.go
View File

@ -17,7 +17,7 @@ package original
import ( import (
"fmt" "fmt"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
func isEnabled() bool { func isEnabled() bool {

4
original/sync.go
View File

@ -19,8 +19,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
func getFullAvatarUrl(avatar string) string { func getFullAvatarUrl(avatar string) string {

2
original/user.go
View File

@ -14,7 +14,7 @@
package original package original
import "github.com/casdoor/casdoor/object" import "github.com/casbin/casdoor/object"
func getUsers() []*object.User { func getUsers() []*object.User {
users := object.GetUsers(orgName) users := object.GetUsers(orgName)

2
original/user_original.go
View File

@ -18,7 +18,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
type User struct { type User struct {

2
original/user_original_test.go
View File

@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
) )
func TestGetUsers(t *testing.T) { func TestGetUsers(t *testing.T) {

8
routers/authz_filter.go
View File

@ -21,10 +21,10 @@ import (
"strings" "strings"
"github.com/astaxie/beego/context" "github.com/astaxie/beego/context"
"github.com/casdoor/casdoor/authz" "github.com/casbin/casdoor/authz"
"github.com/casdoor/casdoor/controllers" "github.com/casbin/casdoor/controllers"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
type Object struct { type Object struct {

6
routers/auto_login_filter.go
View File

@ -19,9 +19,9 @@ import (
"net/url" "net/url"
"github.com/astaxie/beego/context" "github.com/astaxie/beego/context"
"github.com/casdoor/casdoor/controllers" "github.com/casbin/casdoor/controllers"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
func getSessionUser(ctx *context.Context) string { func getSessionUser(ctx *context.Context) string {

4
routers/record.go
View File

@ -18,8 +18,8 @@ import (
"strings" "strings"
"github.com/astaxie/beego/context" "github.com/astaxie/beego/context"
"github.com/casdoor/casdoor/object" "github.com/casbin/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
func getUser(ctx *context.Context) (username string) { func getUser(ctx *context.Context) (username string) {

2
routers/router.go
View File

@ -21,7 +21,7 @@ package routers
import ( import (
"github.com/astaxie/beego" "github.com/astaxie/beego"
"github.com/casdoor/casdoor/controllers" "github.com/casbin/casdoor/controllers"
) )
func init() { func init() {

2
routers/static_filter.go
View File

@ -19,7 +19,7 @@ import (
"strings" "strings"
"github.com/astaxie/beego/context" "github.com/astaxie/beego/context"
"github.com/casdoor/casdoor/util" "github.com/casbin/casdoor/util"
) )
func StaticFilter(ctx *context.Context) { func StaticFilter(ctx *context.Context) {

2
swagger/index.html
View File

@ -31,7 +31,7 @@
<body> <body>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0"> <svg xmlns="http://www.w3.org/2000/svg" style="position:absolute;width:0;height:0">
<defs> <defs>
<symbol viewBox="0 0 20 20" id="unlocked"> <symbol viewBox="0 0 20 20" id="unlocked">
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path> <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>