server/beego
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using new organization

Browse Source
This commit is contained in:
Ming Deng
2020-12-13 23:09:19 +08:00
parent 093f976365
commit a70f7fc920
253 changed files with 504 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/web/LICENSE
View File

@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.

2
server/web/admin.go
View File

@@ -20,7 +20,7 @@ import (
"reflect"
"time"
"github.com/astaxie/beego/core/logs"
"github.com/beego/beego/core/logs"
)
// BeeAdminApp is the default adminApp used by admin module.

2
server/web/admin_controller.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/astaxie/beego/core/admin"
"github.com/beego/beego/core/admin"
)
type adminController struct {

2
server/web/admin_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/core/admin"
"github.com/beego/beego/core/admin"
)
type SampleDatabaseCheck struct {

6
server/web/captcha/README.md
View File

@@ -6,9 +6,9 @@ an example for use captcha
package controllers
import (
"github.com/astaxie/beego"
"github.com/astaxie/beego/cache"
"github.com/astaxie/beego/utils/captcha"
"github.com/beego/beego"
"github.com/beego/beego/cache"
"github.com/beego/beego/utils/captcha"
)
var cpt *captcha.Captcha

14
server/web/captcha/captcha.go
View File

@@ -19,9 +19,9 @@
// package controllers
//
// import (
// "github.com/astaxie/beego"
// "github.com/astaxie/beego/cache"
// "github.com/astaxie/beego/utils/captcha"
// "github.com/beego/beego"
// "github.com/beego/beego/cache"
// "github.com/beego/beego/utils/captcha"
// )
//
// var cpt *captcha.Captcha
@@ -67,11 +67,11 @@ import (
"strings"
"time"
"github.com/astaxie/beego/core/logs"
"github.com/beego/beego/core/logs"
"github.com/astaxie/beego/core/utils"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/core/utils"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
)
var (

2
server/web/captcha/image_test.go
View File

@@ -17,7 +17,7 @@ package captcha
import (
"testing"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego/core/utils"
)
type byteCounter struct {

12
server/web/config.go
View File

@@ -23,13 +23,13 @@ import (
"runtime"
"strings"
"github.com/astaxie/beego"
"github.com/astaxie/beego/core/config"
"github.com/astaxie/beego/core/logs"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego"
"github.com/beego/beego/core/config"
"github.com/beego/beego/core/logs"
"github.com/beego/beego/server/web/session"
"github.com/astaxie/beego/core/utils"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/core/utils"
"github.com/beego/beego/server/web/context"
)
// Config is the main struct for BConfig

2
server/web/config_test.go
View File

@@ -19,7 +19,7 @@ import (
"reflect"
"testing"
beeJson "github.com/astaxie/beego/core/config/json"
beeJson "github.com/beego/beego/core/config/json"
)
func TestDefaults(t *testing.T) {

4
server/web/context/context.go
View File

@@ -15,7 +15,7 @@
// Package context provide the context utils
// Usage:
//
// import "github.com/astaxie/beego/context"
// import "github.com/beego/beego/context"
//
// ctx := context.Context{Request:req,ResponseWriter:rw}
//
@@ -35,7 +35,7 @@ import (
"strings"
"time"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego/core/utils"
)
// Commonly used mime-types

2
server/web/context/input.go
View File

@@ -29,7 +29,7 @@ import (
"strings"
"sync"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
// Regexes for checking the accept headers

4
server/web/context/param/conv.go
View File

@@ -4,8 +4,8 @@ import (
"fmt"
"reflect"
"github.com/astaxie/beego/core/logs"
beecontext "github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/core/logs"
beecontext "github.com/beego/beego/server/web/context"
)
// ConvertParams converts http method params to values that will be passed to the method controller as arguments

6
server/web/controller.go
View File

@@ -29,10 +29,10 @@ import (
"strconv"
"strings"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
"github.com/astaxie/beego/server/web/context"
"github.com/astaxie/beego/server/web/context/param"
"github.com/beego/beego/server/web/context"
"github.com/beego/beego/server/web/context/param"
)
var (

2
server/web/controller_test.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
func TestGetInt(t *testing.T) {

2
server/web/doc.go
View File

@@ -6,7 +6,7 @@ It is used for rapid development of RESTful APIs, web apps and backend services
beego is inspired by Tornado, Sinatra and Flask with the added benefit of some Go-specific features such as interfaces and struct embedding.
package main
import "github.com/astaxie/beego"
import "github.com/beego/beego"
func main() {
beego.Run()

6
server/web/error.go
View File

@@ -23,10 +23,10 @@ import (
"strconv"
"strings"
"github.com/astaxie/beego"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego"
"github.com/beego/beego/core/utils"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
const (

2
server/web/filter.go
View File

@@ -17,7 +17,7 @@ package web
import (
"strings"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
// FilterChain is different from pure FilterFunc

8
server/web/filter/apiauth/apiauth.go
View File

@@ -16,8 +16,8 @@
//
// Simple Usage:
// import(
// "github.com/astaxie/beego"
// "github.com/astaxie/beego/plugins/apiauth"
// "github.com/beego/beego"
// "github.com/beego/beego/plugins/apiauth"
// )
//
// func main(){
@@ -65,8 +65,8 @@ import (
"sort"
"time"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
)
// AppIDToAppSecret gets appsecret through appid

8
server/web/filter/auth/basic.go
View File

@@ -15,8 +15,8 @@
// Package auth provides handlers to enable basic auth support.
// Simple Usage:
// import(
// "github.com/astaxie/beego"
// "github.com/astaxie/beego/plugins/auth"
// "github.com/beego/beego"
// "github.com/beego/beego/plugins/auth"
// )
//
// func main(){
@@ -40,8 +40,8 @@ import (
"net/http"
"strings"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
)
var defaultRealm = "Authorization Required"

8
server/web/filter/authz/authz.go
View File

@@ -15,8 +15,8 @@
// Package authz provides handlers to enable ACL, RBAC, ABAC authorization support.
// Simple Usage:
// import(
// "github.com/astaxie/beego"
// "github.com/astaxie/beego/plugins/authz"
// "github.com/beego/beego"
// "github.com/beego/beego/plugins/authz"
// "github.com/casbin/casbin"
// )
//
@@ -44,8 +44,8 @@ import (
"github.com/casbin/casbin"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
)
// NewAuthorizer returns the authorizer.

2
server/web/filter/authz/authz_model.conf
View File

@@ -11,4 +11,4 @@ g = _, _
e = some(where (p.eft == allow))
[matchers]
m = g(r.sub, p.sub) && keyMatch(r.obj, p.obj) && (r.act == p.act || p.act == "*")
m = g(r.sub, p.sub) && keyMatch(r.obj, p.obj) && (r.act == p.act || p.act == "*")

2
server/web/filter/authz/authz_policy.csv
View File

@@ -4,4 +4,4 @@ p, bob, /dataset2/resource1, *
p, bob, /dataset2/resource2, GET
p, bob, /dataset2/folder1/*, POST
p, dataset1_admin, /dataset1/*, *
g, cathy, dataset1_admin
g, cathy, dataset1_admin
1 p, alice, /dataset1/*, GET
4 p, bob, /dataset2/resource2, GET
5 p, bob, /dataset2/folder1/*, POST
6 p, dataset1_admin, /dataset1/*, *
7 g, cathy, dataset1_admin

6
server/web/filter/authz/authz_test.go
View File

@@ -21,9 +21,9 @@ import (
"github.com/casbin/casbin"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/astaxie/beego/server/web/filter/auth"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
"github.com/beego/beego/server/web/filter/auth"
)
func testRequest(t *testing.T, handler *web.ControllerRegister, user string, path string, method string, code int) {

8
server/web/filter/cors/cors.go
View File

@@ -15,8 +15,8 @@
// Package cors provides handlers to enable CORS support.
// Usage
// import (
// "github.com/astaxie/beego"
// "github.com/astaxie/beego/plugins/cors"
// "github.com/beego/beego"
// "github.com/beego/beego/plugins/cors"
// )
//
// func main() {
@@ -42,8 +42,8 @@ import (
"strings"
"time"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
)
const (

4
server/web/filter/cors/cors_test.go
View File

@@ -21,8 +21,8 @@ import (
"testing"
"time"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
)
// HTTPHeaderGuardRecorder is httptest.ResponseRecorder with own http.Header

4
server/web/filter/opentracing/filter.go
View File

@@ -17,8 +17,8 @@ package opentracing
import (
"context"
"github.com/astaxie/beego/server/web"
beegoCtx "github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web"
beegoCtx "github.com/beego/beego/server/web/context"
logKit "github.com/go-kit/kit/log"
opentracingKit "github.com/go-kit/kit/tracing/opentracing"
"github.com/opentracing/opentracing-go"

2
server/web/filter/opentracing/filter_test.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/opentracing/opentracing-go"
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
func TestFilterChainBuilder_FilterChain(t *testing.T) {

6
server/web/filter/prometheus/filter.go
View File

@@ -21,9 +21,9 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/astaxie/beego"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego"
"github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context"
)
// FilterChainBuilder is an extension point,

2
server/web/filter/prometheus/filter_test.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
func TestFilterChain(t *testing.T) {

2
server/web/filter_chain_test.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
func TestControllerRegister_InsertFilterChain(t *testing.T) {

2
server/web/filter_test.go
View File

@@ -19,7 +19,7 @@ import (
"net/http/httptest"
"testing"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
var FilterUser = func(ctx *context.Context) {

2
server/web/grace/grace.go
View File

@@ -22,7 +22,7 @@
// "net/http"
// "os"
//
// "github.com/astaxie/beego/grace"
// "github.com/beego/beego/grace"
// )
//
// func handler(w http.ResponseWriter, r *http.Request) {

6
server/web/hooks.go
View File

@@ -6,9 +6,9 @@ import (
"net/http"
"path/filepath"
"github.com/astaxie/beego/core/logs"
"github.com/astaxie/beego/server/web/context"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/core/logs"
"github.com/beego/beego/server/web/context"
"github.com/beego/beego/server/web/session"
)
// register MIME type with content type

28
server/web/namespace.go
View File

@@ -18,7 +18,7 @@ import (
"net/http"
"strings"
beecontext "github.com/astaxie/beego/server/web/context"
beecontext "github.com/beego/beego/server/web/context"
)
type namespaceCond func(*beecontext.Context) bool
@@ -97,91 +97,91 @@ func (n *Namespace) Filter(action string, filter ...FilterFunc) *Namespace {
}
// Router same as beego.Rourer
// refer: https://godoc.org/github.com/astaxie/beego#Router
// refer: https://godoc.org/github.com/beego/beego#Router
func (n *Namespace) Router(rootpath string, c ControllerInterface, mappingMethods ...string) *Namespace {
n.handlers.Add(rootpath, c, mappingMethods...)
return n
}
// AutoRouter same as beego.AutoRouter
// refer: https://godoc.org/github.com/astaxie/beego#AutoRouter
// refer: https://godoc.org/github.com/beego/beego#AutoRouter
func (n *Namespace) AutoRouter(c ControllerInterface) *Namespace {
n.handlers.AddAuto(c)
return n
}
// AutoPrefix same as beego.AutoPrefix
// refer: https://godoc.org/github.com/astaxie/beego#AutoPrefix
// refer: https://godoc.org/github.com/beego/beego#AutoPrefix
func (n *Namespace) AutoPrefix(prefix string, c ControllerInterface) *Namespace {
n.handlers.AddAutoPrefix(prefix, c)
return n
}
// Get same as beego.Get
// refer: https://godoc.org/github.com/astaxie/beego#Get
// refer: https://godoc.org/github.com/beego/beego#Get
func (n *Namespace) Get(rootpath string, f FilterFunc) *Namespace {
n.handlers.Get(rootpath, f)
return n
}
// Post same as beego.Post
// refer: https://godoc.org/github.com/astaxie/beego#Post
// refer: https://godoc.org/github.com/beego/beego#Post
func (n *Namespace) Post(rootpath string, f FilterFunc) *Namespace {
n.handlers.Post(rootpath, f)
return n
}
// Delete same as beego.Delete
// refer: https://godoc.org/github.com/astaxie/beego#Delete
// refer: https://godoc.org/github.com/beego/beego#Delete
func (n *Namespace) Delete(rootpath string, f FilterFunc) *Namespace {
n.handlers.Delete(rootpath, f)
return n
}
// Put same as beego.Put
// refer: https://godoc.org/github.com/astaxie/beego#Put
// refer: https://godoc.org/github.com/beego/beego#Put
func (n *Namespace) Put(rootpath string, f FilterFunc) *Namespace {
n.handlers.Put(rootpath, f)
return n
}
// Head same as beego.Head
// refer: https://godoc.org/github.com/astaxie/beego#Head
// refer: https://godoc.org/github.com/beego/beego#Head
func (n *Namespace) Head(rootpath string, f FilterFunc) *Namespace {
n.handlers.Head(rootpath, f)
return n
}
// Options same as beego.Options
// refer: https://godoc.org/github.com/astaxie/beego#Options
// refer: https://godoc.org/github.com/beego/beego#Options
func (n *Namespace) Options(rootpath string, f FilterFunc) *Namespace {
n.handlers.Options(rootpath, f)
return n
}
// Patch same as beego.Patch
// refer: https://godoc.org/github.com/astaxie/beego#Patch
// refer: https://godoc.org/github.com/beego/beego#Patch
func (n *Namespace) Patch(rootpath string, f FilterFunc) *Namespace {
n.handlers.Patch(rootpath, f)
return n
}
// Any same as beego.Any
// refer: https://godoc.org/github.com/astaxie/beego#Any
// refer: https://godoc.org/github.com/beego/beego#Any
func (n *Namespace) Any(rootpath string, f FilterFunc) *Namespace {
n.handlers.Any(rootpath, f)
return n
}
// Handler same as beego.Handler
// refer: https://godoc.org/github.com/astaxie/beego#Handler
// refer: https://godoc.org/github.com/beego/beego#Handler
func (n *Namespace) Handler(rootpath string, h http.Handler) *Namespace {
n.handlers.Handler(rootpath, h)
return n
}
// Include add include class
// refer: https://godoc.org/github.com/astaxie/beego#Include
// refer: https://godoc.org/github.com/beego/beego#Include
func (n *Namespace) Include(cList ...ControllerInterface) *Namespace {
n.handlers.Include(cList...)
return n

2
server/web/namespace_test.go
View File

@@ -20,7 +20,7 @@ import (
"strconv"
"testing"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
func TestNamespaceGet(t *testing.T) {

4
server/web/pagination/controller.go
View File

@@ -15,8 +15,8 @@
package pagination
import (
"github.com/astaxie/beego/core/utils/pagination"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/core/utils/pagination"
"github.com/beego/beego/server/web/context"
)
// SetPaginator Instantiates a Paginator and assigns it to context.Input.Data("paginator").

10
server/web/parser.go
View File

@@ -30,17 +30,17 @@ import (
"golang.org/x/tools/go/packages"
"github.com/astaxie/beego/core/logs"
"github.com/beego/beego/core/logs"
"github.com/astaxie/beego/core/utils"
"github.com/astaxie/beego/server/web/context/param"
"github.com/beego/beego/core/utils"
"github.com/beego/beego/server/web/context/param"
)
var globalRouterTemplate = `package {{.routersDir}}
import (
beego "github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context/param"{{.globalimport}}
beego "github.com/beego/beego/server/web"
"github.com/beego/beego/server/web/context/param"{{.globalimport}}
)
func init() {

2
server/web/policy.go
View File

@@ -17,7 +17,7 @@ package web
import (
"strings"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
// PolicyFunc defines a policy function which is invoked before the controller handler is executed.

8
server/web/router.go
View File

@@ -25,11 +25,11 @@ import (
"sync"
"time"
"github.com/astaxie/beego/core/logs"
"github.com/beego/beego/core/logs"
"github.com/astaxie/beego/core/utils"
beecontext "github.com/astaxie/beego/server/web/context"
"github.com/astaxie/beego/server/web/context/param"
"github.com/beego/beego/core/utils"
beecontext "github.com/beego/beego/server/web/context"
"github.com/beego/beego/server/web/context/param"
)
// default filter execution points

4
server/web/router_test.go
View File

@@ -21,9 +21,9 @@ import (
"strings"
"testing"
"github.com/astaxie/beego/core/logs"
"github.com/beego/beego/core/logs"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
type TestController struct {

8
server/web/server.go
View File

@@ -31,11 +31,11 @@ import (
"golang.org/x/crypto/acme/autocert"
"github.com/astaxie/beego/core/logs"
beecontext "github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/core/logs"
beecontext "github.com/beego/beego/server/web/context"
"github.com/astaxie/beego/core/utils"
"github.com/astaxie/beego/server/web/grace"
"github.com/beego/beego/core/utils"
"github.com/beego/beego/server/web/grace"
)
var (

4
server/web/session/README.md
View File

@@ -5,7 +5,7 @@ session is a Go session manager. It can use many session providers. Just like th
## How to install?
go get github.com/astaxie/beego/session
go get github.com/beego/beego/session
## What providers are supported?
@@ -18,7 +18,7 @@ As of now this session manager support memory, file, Redis and MySQL.
First you must import it
import (
"github.com/astaxie/beego/session"
"github.com/beego/beego/session"
)
Then in you web app init the global session manager

6
server/web/session/couchbase/sess_couchbase.go
View File

@@ -20,8 +20,8 @@
//
// Usage:
// import(
// _ "github.com/astaxie/beego/session/couchbase"
// "github.com/astaxie/beego/session"
// _ "github.com/beego/beego/session/couchbase"
// "github.com/beego/beego/session"
// )
//
// func init() {
@@ -41,7 +41,7 @@ import (
couchbase "github.com/couchbase/go-couchbase"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
var couchbpder = &Provider{}

2
server/web/session/ledis/ledis_session.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/ledisdb/ledisdb/config"
"github.com/ledisdb/ledisdb/ledis"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
var (

6
server/web/session/memcache/sess_memcache.go
View File

@@ -20,8 +20,8 @@
//
// Usage:
// import(
// _ "github.com/astaxie/beego/session/memcache"
// "github.com/astaxie/beego/session"
// _ "github.com/beego/beego/session/memcache"
// "github.com/beego/beego/session"
// )
//
// func init() {
@@ -38,7 +38,7 @@ import (
"strings"
"sync"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
"github.com/bradfitz/gomemcache/memcache"
)

6
server/web/session/mysql/sess_mysql.go
View File

@@ -28,8 +28,8 @@
//
// Usage:
// import(
// _ "github.com/astaxie/beego/session/mysql"
// "github.com/astaxie/beego/session"
// _ "github.com/beego/beego/session/mysql"
// "github.com/beego/beego/session"
// )
//
// func init() {
@@ -47,7 +47,7 @@ import (
"sync"
"time"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
// import mysql driver
_ "github.com/go-sql-driver/mysql"
)

6
server/web/session/postgres/sess_postgresql.go
View File

@@ -38,8 +38,8 @@
//
// Usage:
// import(
// _ "github.com/astaxie/beego/session/postgresql"
// "github.com/astaxie/beego/session"
// _ "github.com/beego/beego/session/postgresql"
// "github.com/beego/beego/session"
// )
//
// func init() {
@@ -57,7 +57,7 @@ import (
"sync"
"time"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
// import postgresql Driver
_ "github.com/lib/pq"
)

6
server/web/session/redis/sess_redis.go
View File

@@ -20,8 +20,8 @@
//
// Usage:
// import(
// _ "github.com/astaxie/beego/session/redis"
// "github.com/astaxie/beego/session"
// _ "github.com/beego/beego/session/redis"
// "github.com/beego/beego/session"
// )
//
// func init() {
@@ -43,7 +43,7 @@ import (
"github.com/go-redis/redis/v7"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
var redispder = &Provider{}

2
server/web/session/redis/sess_redis_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
func TestRedis(t *testing.T) {

6
server/web/session/redis_cluster/redis_cluster.go
View File

@@ -20,8 +20,8 @@
//
// Usage:
// import(
// _ "github.com/astaxie/beego/session/redis_cluster"
// "github.com/astaxie/beego/session"
// _ "github.com/beego/beego/session/redis_cluster"
// "github.com/beego/beego/session"
// )
//
// func init() {
@@ -43,7 +43,7 @@ import (
rediss "github.com/go-redis/redis/v7"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
var redispder = &Provider{}

6
server/web/session/redis_sentinel/sess_redis_sentinel.go
View File

@@ -20,8 +20,8 @@
//
// Usage:
// import(
// _ "github.com/astaxie/beego/session/redis_sentinel"
// "github.com/astaxie/beego/session"
// _ "github.com/beego/beego/session/redis_sentinel"
// "github.com/beego/beego/session"
// )
//
// func init() {
@@ -43,7 +43,7 @@ import (
"github.com/go-redis/redis/v7"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
var redispder = &Provider{}

2
server/web/session/redis_sentinel/sess_redis_sentinel_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
func TestRedisSentinel(t *testing.T) {

2
server/web/session/sess_utils.go
View File

@@ -29,7 +29,7 @@ import (
"strconv"
"time"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego/core/utils"
)
func init() {

2
server/web/session/session.go
View File

@@ -16,7 +16,7 @@
//
// Usage:
// import(
// "github.com/astaxie/beego/session"
// "github.com/beego/beego/session"
// )
//
// func init() {

2
server/web/session/ssdb/sess_ssdb.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/ssdb/gossdb/ssdb"
"github.com/astaxie/beego/server/web/session"
"github.com/beego/beego/server/web/session"
)
var ssdbProvider = &Provider{}

4
server/web/staticfile.go
View File

@@ -26,10 +26,10 @@ import (
"sync"
"time"
"github.com/astaxie/beego/core/logs"
"github.com/beego/beego/core/logs"
lru "github.com/hashicorp/golang-lru"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
var errNotStaticRequest = errors.New("request not a static file request")

2
server/web/statistics.go
View File

@@ -19,7 +19,7 @@ import (
"sync"
"time"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego/core/utils"
)
// Statistics struct

4
server/web/template.go
View File

@@ -27,8 +27,8 @@ import (
"strings"
"sync"
"github.com/astaxie/beego/core/logs"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego/core/logs"
"github.com/beego/beego/core/utils"
)
var (

2
server/web/template_test.go
View File

@@ -24,7 +24,7 @@ import (
assetfs "github.com/elazarl/go-bindata-assetfs"
"github.com/stretchr/testify/assert"
"github.com/astaxie/beego/test"
"github.com/beego/beego/test"
)
var header = `{{define "header"}}

4
server/web/tree.go
View File

@@ -19,9 +19,9 @@ import (
"regexp"
"strings"
"github.com/astaxie/beego/core/utils"
"github.com/beego/beego/core/utils"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
var (

6
server/web/tree_test.go
View File

@@ -18,7 +18,7 @@ import (
"strings"
"testing"
"github.com/astaxie/beego/server/web/context"
"github.com/beego/beego/server/web/context"
)
type testInfo struct {
@@ -93,7 +93,7 @@ func init() {
//not match example
// https://github.com/astaxie/beego/issues/3865
// https://github.com/beego/beego/issues/3865
routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", "/read_222htm"))
routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", "/read_222_htm"))
routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", " /read_262shtm"))
@@ -336,4 +336,4 @@ func TestSplitSegment(t *testing.T) {
t.Fatalf("%s should return %t,%s,%q, got %t,%s,%q", pattern, v.isReg, v.params, v.regStr, b, w, r)
}
}
}
}