Update import path.

This commit is contained in:
Gucheng Wang 2022-01-20 14:11:46 +08:00
parent c3fb48f473
commit c22ab44894
65 changed files with 109 additions and 109 deletions

View File

@ -7,10 +7,10 @@
<a href="https://hub.docker.com/r/casbin/casdoor">
<img alt="docker pull casbin/casdoor" src="https://img.shields.io/docker/pulls/casbin/casdoor.svg">
</a>
<a href="https://github.com/casbin/casdoor/actions/workflows/build.yml">
<a href="https://github.com/casdoor/casdoor/actions/workflows/build.yml">
<img alt="GitHub Workflow Status (branch)" src="https://github.com/casbin/jcasbin/workflows/build/badge.svg?style=flat-square">
</a>
<a href="https://github.com/casbin/casdoor/releases/latest">
<a href="https://github.com/casdoor/casdoor/releases/latest">
<img alt="GitHub Release" src="https://img.shields.io/github/v/release/casbin/casdoor.svg">
</a>
<a href="https://hub.docker.com/repository/docker/casbin/casdoor">
@ -19,19 +19,19 @@
</p>
<p align="center">
<a href="https://goreportcard.com/report/github.com/casbin/casdoor">
<img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/casbin/casdoor?style=flat-square">
<a href="https://goreportcard.com/report/github.com/casdoor/casdoor">
<img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/casdoor/casdoor?style=flat-square">
</a>
<a href="https://github.com/casbin/casdoor/blob/master/LICENSE">
<a href="https://github.com/casdoor/casdoor/blob/master/LICENSE">
<img src="https://img.shields.io/github/license/casbin/casdoor?style=flat-square" alt="license">
</a>
<a href="https://github.com/casbin/casdoor/issues">
<a href="https://github.com/casdoor/casdoor/issues">
<img alt="GitHub issues" src="https://img.shields.io/github/issues/casbin/casdoor?style=flat-square">
</a>
<a href="#">
<img alt="GitHub stars" src="https://img.shields.io/github/stars/casbin/casdoor?style=flat-square">
</a>
<a href="https://github.com/casbin/casdoor/network">
<a href="https://github.com/casdoor/casdoor/network">
<img alt="GitHub forks" src="https://img.shields.io/github/forks/casbin/casdoor?style=flat-square">
</a>
<a href="https://crowdin.com/project/casdoor-site">
@ -54,13 +54,13 @@ Run your own casdoor program in a few minutes.
There are two methods, get code via go subcommand `get`:
```shell
go get github.com/casbin/casdoor
go get github.com/casdoor/casdoor
```
or `git`:
```bash
git clone https://github.com/casbin/casdoor
git clone https://github.com/casdoor/casdoor
```
Finally, change directory:
@ -182,5 +182,5 @@ If you are contributing to casdoor, please note that we use [Crowdin](https://cr
## License
[Apache-2.0](https://github.com/casbin/casdoor/blob/master/LICENSE)
[Apache-2.0](https://github.com/casdoor/casdoor/blob/master/LICENSE)

View File

@ -18,8 +18,8 @@ import (
"github.com/astaxie/beego"
"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/model"
"github.com/casbin/casdoor/conf"
xormadapter "github.com/casbin/xorm-adapter/v2"
"github.com/casdoor/casdoor/conf"
stringadapter "github.com/qiangmzsx/string-adapter/v2"
)

View File

@ -19,8 +19,8 @@ import (
"fmt"
"strconv"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
const (

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetApplications

View File

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

View File

@ -19,8 +19,8 @@ import (
"time"
"github.com/astaxie/beego"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// controller for handlers under /api uri

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetCerts

View File

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

View File

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

View File

@ -14,7 +14,7 @@
package controllers
import "github.com/casbin/casdoor/object"
import "github.com/casdoor/casdoor/object"
// @Title GetOidcDiscovery
// @Tag OIDC API

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetOrganizations ...

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetPermissions

View File

@ -17,8 +17,8 @@ package controllers
import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetProviders

View File

@ -16,8 +16,8 @@ package controllers
import (
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetRecords

View File

@ -23,8 +23,8 @@ import (
"path/filepath"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// @router /get-resources [get]

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetRoles

View File

@ -21,8 +21,8 @@ import (
"encoding/json"
"fmt"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// SendEmail

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetSyncers

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetTokens

View File

@ -20,8 +20,8 @@ import (
"strings"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetGlobalUsers

View File

@ -20,8 +20,8 @@ import (
"mime/multipart"
"os"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
func saveFile(path string, file *multipart.File) {

View File

@ -19,8 +19,8 @@ import (
"strconv"
"github.com/astaxie/beego"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// ResponseOk ...

View File

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

View File

@ -18,8 +18,8 @@ import (
"encoding/json"
"github.com/astaxie/beego/utils/pagination"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
// GetWebhooks

2
go.mod
View File

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

View File

@ -21,7 +21,7 @@ import (
"regexp"
"strings"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
)
type I18nData map[string]map[string]string

View File

@ -18,7 +18,7 @@ import (
"fmt"
"strings"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
)
func getI18nFilePath(language string) string {

View File

@ -21,7 +21,7 @@ import (
"reflect"
"time"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
"github.com/markbates/goth"
"github.com/markbates/goth/providers/amazon"
"github.com/markbates/goth/providers/apple"

10
main.go
View File

@ -21,11 +21,11 @@ import (
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/plugins/cors"
_ "github.com/astaxie/beego/session/redis"
"github.com/casbin/casdoor/authz"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/proxy"
"github.com/casbin/casdoor/routers"
_ "github.com/casbin/casdoor/routers"
"github.com/casdoor/casdoor/authz"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/proxy"
"github.com/casdoor/casdoor/routers"
_ "github.com/casdoor/casdoor/routers"
)
func main() {

View File

@ -20,8 +20,8 @@ import (
"xorm.io/core"
"github.com/astaxie/beego"
"github.com/casbin/casdoor/conf"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/conf"
"github.com/casdoor/casdoor/util"
//_ "github.com/denisenkom/go-mssqldb" // db = mssql
_ "github.com/go-sql-driver/mysql" // db = mysql
//_ "github.com/lib/pq" // db = postgres

View File

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

View File

@ -20,7 +20,7 @@ import (
"io"
"github.com/astaxie/beego"
"github.com/casbin/casdoor/proxy"
"github.com/casdoor/casdoor/proxy"
)
var defaultStorageProvider *Provider = nil

View File

@ -18,7 +18,7 @@ import (
"fmt"
"testing"
"github.com/casbin/casdoor/proxy"
"github.com/casdoor/casdoor/proxy"
)
func TestSyncPermanentAvatars(t *testing.T) {

View File

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

View File

@ -18,8 +18,8 @@ import (
"fmt"
"regexp"
"github.com/casbin/casdoor/cred"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/cred"
"github.com/casdoor/casdoor/util"
goldap "github.com/go-ldap/ldap/v3"
)

View File

@ -17,7 +17,7 @@ package object
import (
_ "embed"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
)
//go:embed token_jwt_key.pem

View File

@ -19,7 +19,7 @@ import (
"fmt"
"strings"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
goldap "github.com/go-ldap/ldap/v3"
"github.com/thanhpk/randstr"
)

View File

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

View File

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

View File

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

View File

@ -20,7 +20,7 @@ import (
"github.com/astaxie/beego"
"github.com/astaxie/beego/context"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
)
var logPostOnly bool

View File

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

View File

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

View File

@ -20,8 +20,8 @@ import (
"strings"
"github.com/astaxie/beego"
"github.com/casbin/casdoor/storage"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/storage"
"github.com/casdoor/casdoor/util"
)
var isCloudIntranet bool

View File

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

View File

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

View File

@ -19,7 +19,7 @@ import (
"strconv"
"strings"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
)
func (syncer *Syncer) getFullAvatarUrl(avatar string) string {

View File

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

View File

@ -18,7 +18,7 @@ import (
"fmt"
"testing"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
)
func TestGenerateRsaKeys(t *testing.T) {

View File

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

View File

@ -14,7 +14,7 @@
package object
import "github.com/casbin/casdoor/cred"
import "github.com/casdoor/casdoor/cred"
func calculateHash(user *User) string {
syncer := getDbSyncerForUser(user)

View File

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

View File

@ -15,8 +15,8 @@
package object
import (
"github.com/casbin/casdoor/util"
"github.com/casbin/casdoor/xlsx"
"github.com/casdoor/casdoor/util"
"github.com/casdoor/casdoor/xlsx"
)
func getUserMap(owner string) map[string]*User {

View File

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

View File

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

View File

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

View File

@ -18,7 +18,7 @@ import (
"net/http"
"strings"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
)
func sendWebhook(webhook *Webhook, record *Record) error {

View File

@ -20,8 +20,8 @@ import (
"net/http"
"github.com/astaxie/beego/context"
"github.com/casbin/casdoor/authz"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/authz"
"github.com/casdoor/casdoor/util"
)
type Object struct {

View File

@ -19,8 +19,8 @@ import (
"time"
"github.com/astaxie/beego/context"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
func AutoSigninFilter(ctx *context.Context) {

View File

@ -19,8 +19,8 @@ import (
"strings"
"github.com/astaxie/beego/context"
"github.com/casbin/casdoor/object"
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
)
type Response struct {

View File

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

View File

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

View File

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

View File

@ -13,7 +13,7 @@
// limitations under the License.
export const ShowGithubCorner = false;
export const GithubRepo = "https://github.com/casbin/casdoor";
export const GithubRepo = "https://github.com/casdoor/casdoor";
export const ForceLanguage = "";
export const DefaultLanguage = "en";

View File

@ -15,7 +15,7 @@
package xlsx
import (
"github.com/casbin/casdoor/util"
"github.com/casdoor/casdoor/util"
"github.com/tealeg/xlsx"
)