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

Merge pull request #4464 from jihoon-seo/210128-Update-beego-pkg-paths

Browse Source 
Update beego pkg paths in codes, comments and READMEs
This commit is contained in:
Ming Deng 2021-01-28 16:17:01 +08:00 committed by GitHub
commit 8806d2599e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
94 changed files with 170 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adapter/cache/cache.go vendored
View File

@ -16,7 +16,7 @@
// Usage: // Usage:
// //
// import( // import(
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// ) // )
// //
// bm, err := cache.NewCache("memory", `{"interval":60}`) // bm, err := cache.NewCache("memory", `{"interval":60}`)

4
adapter/cache/memcache/memcache.go vendored
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/cache/memcache" // _ "github.com/beego/beego/v2/client/cache/memcache"
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// ) // )
// //
// bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`) // bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`)

4
adapter/cache/redis/redis.go vendored
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/cache/redis" // _ "github.com/beego/beego/v2/client/cache/redis"
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// ) // )
// //
// bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`) // bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`)

2
adapter/config/config.go
View File

@ -14,7 +14,7 @@
// Package config is used to parse config. // Package config is used to parse config.
// Usage: // Usage:
// import "github.com/beego/beego/v2/config" // import "github.com/beego/beego/v2/core/config"
// Examples. // Examples.
// //
// cnf, err := config.NewConfig("ini", "config.conf") // cnf, err := config.NewConfig("ini", "config.conf")

4
adapter/config/xml/xml.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/config/xml" // _ "github.com/beego/beego/v2/core/config/xml"
// "github.com/beego/beego/v2/config" // "github.com/beego/beego/v2/core/config"
// ) // )
// //
// cnf, err := config.NewConfig("xml", "config.xml") // cnf, err := config.NewConfig("xml", "config.xml")

4
adapter/config/yaml/yaml.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/config/yaml" // _ "github.com/beego/beego/v2/core/config/yaml"
// "github.com/beego/beego/v2/config" // "github.com/beego/beego/v2/core/config"
// ) // )
// //
// cnf, err := config.NewConfig("yaml", "config.yaml") // cnf, err := config.NewConfig("yaml", "config.yaml")

2
adapter/context/context.go
View File

@ -15,7 +15,7 @@
// Package context provide the context utils // Package context provide the context utils
// Usage: // Usage:
// //
// import "github.com/beego/beego/v2/context" // import "github.com/beego/beego/v2/server/web/context"
// //
// ctx := context.Context{Request:req,ResponseWriter:rw} // ctx := context.Context{Request:req,ResponseWriter:rw}
// //

3
adapter/context/param/conv_test.go
View File

@ -23,7 +23,7 @@ import (
"github.com/beego/beego/v2/adapter/context" "github.com/beego/beego/v2/adapter/context"
) )
func Demo(i int) { func Demo(i int) {
} }
@ -37,4 +37,3 @@ func TestConvertParams(t *testing.T) {
}, reflect.TypeOf(Demo), ctx) }, reflect.TypeOf(Demo), ctx)
assert.Equal(t, int64(11), res[0].Int()) assert.Equal(t, int64(11), res[0].Int())
} }

2
adapter/grace/grace.go
View File

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

2
adapter/httplib/httplib.go
View File

@ -15,7 +15,7 @@
// Package httplib is used as http.Client // Package httplib is used as http.Client
// Usage: // Usage:
// //
// import "github.com/beego/beego/v2/httplib" // import "github.com/beego/beego/v2/client/httplib"
// //
// b := httplib.Post("http://beego.me/") // b := httplib.Post("http://beego.me/")
// b.Param("username","astaxie") // b.Param("username","astaxie")

32
adapter/log.go
View File

@ -23,7 +23,7 @@ import (
) )
// Log levels to control the logging output. // Log levels to control the logging output.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
const ( const (
LevelEmergency = webLog.LevelEmergency LevelEmergency = webLog.LevelEmergency
LevelAlert = webLog.LevelAlert LevelAlert = webLog.LevelAlert
@ -36,90 +36,90 @@ const (
) )
// BeeLogger references the used application logger. // BeeLogger references the used application logger.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
var BeeLogger = logs.GetBeeLogger() var BeeLogger = logs.GetBeeLogger()
// SetLevel sets the global log level used by the simple logger. // SetLevel sets the global log level used by the simple logger.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func SetLevel(l int) { func SetLevel(l int) {
logs.SetLevel(l) logs.SetLevel(l)
} }
// SetLogFuncCall set the CallDepth, default is 3 // SetLogFuncCall set the CallDepth, default is 3
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func SetLogFuncCall(b bool) { func SetLogFuncCall(b bool) {
logs.SetLogFuncCall(b) logs.SetLogFuncCall(b)
} }
// SetLogger sets a new logger. // SetLogger sets a new logger.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func SetLogger(adaptername string, config string) error { func SetLogger(adaptername string, config string) error {
return logs.SetLogger(adaptername, config) return logs.SetLogger(adaptername, config)
} }
// Emergency logs a message at emergency level. // Emergency logs a message at emergency level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Emergency(v ...interface{}) { func Emergency(v ...interface{}) {
logs.Emergency(generateFmtStr(len(v)), v...) logs.Emergency(generateFmtStr(len(v)), v...)
} }
// Alert logs a message at alert level. // Alert logs a message at alert level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Alert(v ...interface{}) { func Alert(v ...interface{}) {
logs.Alert(generateFmtStr(len(v)), v...) logs.Alert(generateFmtStr(len(v)), v...)
} }
// Critical logs a message at critical level. // Critical logs a message at critical level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Critical(v ...interface{}) { func Critical(v ...interface{}) {
logs.Critical(generateFmtStr(len(v)), v...) logs.Critical(generateFmtStr(len(v)), v...)
} }
// Error logs a message at error level. // Error logs a message at error level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Error(v ...interface{}) { func Error(v ...interface{}) {
logs.Error(generateFmtStr(len(v)), v...) logs.Error(generateFmtStr(len(v)), v...)
} }
// Warning logs a message at warning level. // Warning logs a message at warning level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Warning(v ...interface{}) { func Warning(v ...interface{}) {
logs.Warning(generateFmtStr(len(v)), v...) logs.Warning(generateFmtStr(len(v)), v...)
} }
// Warn compatibility alias for Warning() // Warn compatibility alias for Warning()
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Warn(v ...interface{}) { func Warn(v ...interface{}) {
logs.Warn(generateFmtStr(len(v)), v...) logs.Warn(generateFmtStr(len(v)), v...)
} }
// Notice logs a message at notice level. // Notice logs a message at notice level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Notice(v ...interface{}) { func Notice(v ...interface{}) {
logs.Notice(generateFmtStr(len(v)), v...) logs.Notice(generateFmtStr(len(v)), v...)
} }
// Informational logs a message at info level. // Informational logs a message at info level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Informational(v ...interface{}) { func Informational(v ...interface{}) {
logs.Informational(generateFmtStr(len(v)), v...) logs.Informational(generateFmtStr(len(v)), v...)
} }
// Info compatibility alias for Warning() // Info compatibility alias for Warning()
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Info(v ...interface{}) { func Info(v ...interface{}) {
logs.Info(generateFmtStr(len(v)), v...) logs.Info(generateFmtStr(len(v)), v...)
} }
// Debug logs a message at debug level. // Debug logs a message at debug level.
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Debug(v ...interface{}) { func Debug(v ...interface{}) {
logs.Debug(generateFmtStr(len(v)), v...) logs.Debug(generateFmtStr(len(v)), v...)
} }
// Trace logs a message at trace level. // Trace logs a message at trace level.
// compatibility alias for Warning() // compatibility alias for Warning()
// Deprecated: use github.com/beego/beego/v2/logs instead. // Deprecated: use github.com/beego/beego/v2/core/logs instead.
func Trace(v ...interface{}) { func Trace(v ...interface{}) {
logs.Trace(generateFmtStr(len(v)), v...) logs.Trace(generateFmtStr(len(v)), v...)
} }

2
adapter/logs/log.go
View File

@ -15,7 +15,7 @@
// Package logs provide a general log interface // Package logs provide a general log interface
// Usage: // Usage:
// //
// import "github.com/beego/beego/v2/logs" // import "github.com/beego/beego/v2/core/logs"
// //
// log := NewLogger(10000) // log := NewLogger(10000)
// log.SetLogger("console", "") // log.SetLogger("console", "")

1
adapter/orm/models_boot_test.go
View File

@ -25,6 +25,7 @@ type User struct {
type Seller struct { type Seller struct {
Id int Id int
} }
func TestRegisterModelWithPrefix(t *testing.T) { func TestRegisterModelWithPrefix(t *testing.T) {
RegisterModelWithPrefix("test", &User{}, &Seller{}) RegisterModelWithPrefix("test", &User{}, &Seller{})
} }

2
adapter/orm/orm.go
View File

@ -21,7 +21,7 @@
// //
// import ( // import (
// "fmt" // "fmt"
// "github.com/beego/beego/v2/orm" // "github.com/beego/beego/v2/client/orm"
// _ "github.com/go-sql-driver/mysql" // import your used driver // _ "github.com/go-sql-driver/mysql" // import your used driver
// ) // )
// //

2
adapter/plugins/apiauth/apiauth.go
View File

@ -17,7 +17,7 @@
// Simple Usage: // Simple Usage:
// import( // import(
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/apiauth" // "github.com/beego/beego/v2/server/web/filter/apiauth"
// ) // )
// //
// func main(){ // func main(){

2
adapter/plugins/auth/basic.go
View File

@ -16,7 +16,7 @@
// Simple Usage: // Simple Usage:
// import( // import(
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/auth" // "github.com/beego/beego/v2/server/web/filter/auth"
// ) // )
// //
// func main(){ // func main(){

2
adapter/plugins/authz/authz.go
View File

@ -16,7 +16,7 @@
// Simple Usage: // Simple Usage:
// import( // import(
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/authz" // "github.com/beego/beego/v2/server/web/filter/authz"
// "github.com/casbin/casbin" // "github.com/casbin/casbin"
// ) // )
// //

2
adapter/plugins/cors/cors.go
View File

@ -16,7 +16,7 @@
// Usage // Usage
// import ( // import (
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/cors" // "github.com/beego/beego/v2/server/web/filter/cors"
// ) // )
// //
// func main() { // func main() {

4
adapter/session/couchbase/sess_couchbase.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/couchbase" // _ "github.com/beego/beego/v2/server/web/session/couchbase"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

4
adapter/session/memcache/sess_memcache.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/memcache" // _ "github.com/beego/beego/v2/server/web/session/memcache"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

4
adapter/session/mysql/sess_mysql.go
View File

@ -28,8 +28,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/mysql" // _ "github.com/beego/beego/v2/server/web/session/mysql"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

4
adapter/session/postgres/sess_postgresql.go
View File

@ -38,8 +38,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/postgresql" // _ "github.com/beego/beego/v2/server/web/session/postgresql"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

4
adapter/session/redis/sess_redis.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/redis" // _ "github.com/beego/beego/v2/server/web/session/redis"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

4
adapter/session/redis_cluster/redis_cluster.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/redis_cluster" // _ "github.com/beego/beego/v2/server/web/session/redis_cluster"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

4
adapter/session/redis_sentinel/sess_redis_sentinel.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/redis_sentinel" // _ "github.com/beego/beego/v2/server/web/session/redis_sentinel"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

2
adapter/session/session.go
View File

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

4
adapter/utils/captcha/README.md
View File

@ -7,8 +7,8 @@ package controllers
import ( import (
"github.com/beego/beego/v2" "github.com/beego/beego/v2"
"github.com/beego/beego/v2/cache" "github.com/beego/beego/v2/client/cache"
"github.com/beego/beego/v2/utils/captcha" "github.com/beego/beego/v2/server/web/captcha"
) )
var cpt *captcha.Captcha var cpt *captcha.Captcha

4
adapter/utils/captcha/captcha.go
View File

@ -20,8 +20,8 @@
// //
// import ( // import (
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// "github.com/beego/beego/v2/utils/captcha" // "github.com/beego/beego/v2/server/web/captcha"
// ) // )
// //
// var cpt *captcha.Captcha // var cpt *captcha.Captcha

2
adapter/utils/pagination/doc.go
View File

@ -8,7 +8,7 @@ In your beego.Controller:
package controllers package controllers
import "github.com/beego/beego/v2/utils/pagination" import "github.com/beego/beego/v2/server/web/pagination"
type PostsController struct { type PostsController struct {
beego.Controller beego.Controller

2
adapter/validation/validation.go
View File

@ -15,7 +15,7 @@
// Package validation for validations // Package validation for validations
// //
// import ( // import (
// "github.com/beego/beego/v2/validation" // "github.com/beego/beego/v2/core/validation"
// "log" // "log"
// ) // )
// //

4
client/cache/README.md vendored
View File

@ -4,7 +4,7 @@ cache is a Go cache manager. It can use many cache adapters. The repo is inspire
## How to install? ## How to install?
go get github.com/beego/beego/v2/cache go get github.com/beego/beego/v2/client/cache
## What adapters are supported? ## What adapters are supported?
@ -15,7 +15,7 @@ As of now this cache support memory, Memcache and Redis.
First you must import it First you must import it
import ( import (
"github.com/beego/beego/v2/cache" "github.com/beego/beego/v2/client/cache"
) )
Then init a Cache (example with memory adapter) Then init a Cache (example with memory adapter)

2
client/cache/cache.go vendored
View File

@ -16,7 +16,7 @@
// Usage: // Usage:
// //
// import( // import(
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// ) // )
// //
// bm, err := cache.NewCache("memory", `{"interval":60}`) // bm, err := cache.NewCache("memory", `{"interval":60}`)

4
client/cache/calc_utils_test.go vendored
View File

@ -19,7 +19,7 @@ func TestIncr(t *testing.T) {
t.Errorf("incr failed, expect %v, but %v actually", updateVal, val) t.Errorf("incr failed, expect %v, but %v actually", updateVal, val)
return return
} }
_, err = incr(int(1 << (strconv.IntSize - 1) - 1)) _, err = incr(int(1<<(strconv.IntSize-1) - 1))
if err == nil { if err == nil {
t.Error("incr failed") t.Error("incr failed")
return return
@ -73,7 +73,7 @@ func TestIncr(t *testing.T) {
t.Errorf("incr failed, expect %v, but %v actually", updateVal, val) t.Errorf("incr failed, expect %v, but %v actually", updateVal, val)
return return
} }
_, err = incr(uint(1 << (strconv.IntSize) - 1)) _, err = incr(uint(1<<(strconv.IntSize) - 1))
if err == nil { if err == nil {
t.Error("incr failed") t.Error("incr failed")
return return

4
client/cache/memcache/memcache.go vendored
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/cache/memcache" // _ "github.com/beego/beego/v2/client/cache/memcache"
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// ) // )
// //
// bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`) // bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`)

4
client/cache/redis/redis.go vendored
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/cache/redis" // _ "github.com/beego/beego/v2/client/cache/redis"
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// ) // )
// //
// bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`) // bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`)

4
client/httplib/README.md
View File

@ -8,7 +8,7 @@ httplib is an libs help you to curl remote url.
you can use Get to crawl data. you can use Get to crawl data.
import "github.com/beego/beego/v2/httplib" import "github.com/beego/beego/v2/client/httplib"
str, err := httplib.Get("http://beego.me/").String() str, err := httplib.Get("http://beego.me/").String()
if err != nil { if err != nil {
@ -95,4 +95,4 @@ httplib support mutil file upload, use `req.PostFile()`
See godoc for further documentation and examples. See godoc for further documentation and examples.
* [godoc.org/github.com/beego/beego/v2/httplib](https://godoc.org/github.com/beego/beego/v2/httplib) * [godoc.org/github.com/beego/beego/v2/client/httplib](https://godoc.org/github.com/beego/beego/v2/client/httplib)

5
client/httplib/error_code.go
View File

@ -51,7 +51,6 @@ Sometimes you got JSON document and you want to make it as request body. So you
If you do this, you got this code. Instead, you should call Header to set Content-type and call Body to set body data. If you do this, you got this code. Instead, you should call Header to set Content-type and call Body to set body data.
`) `)
// start with 5 -------------------------------------------------------------------------- // start with 5 --------------------------------------------------------------------------
var CreateFormFileFailed = berror.DefineCode(5001001, moduleName, "CreateFormFileFailed", ` var CreateFormFileFailed = berror.DefineCode(5001001, moduleName, "CreateFormFileFailed", `
@ -125,7 +124,3 @@ Make sure that:
1. You pass valid structure pointer to the function; 1. You pass valid structure pointer to the function;
2. The body is valid YAML document 2. The body is valid YAML document
`) `)

1
client/httplib/http_response_test.go
View File

@ -20,7 +20,6 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func TestNewHttpResponseWithJsonBody(t *testing.T) { func TestNewHttpResponseWithJsonBody(t *testing.T) {
// string // string
resp := NewHttpResponseWithJsonBody("{}") resp := NewHttpResponseWithJsonBody("{}")

2
client/httplib/httplib.go
View File

@ -15,7 +15,7 @@
// Package httplib is used as http.Client // Package httplib is used as http.Client
// Usage: // Usage:
// //
// import "github.com/beego/beego/v2/httplib" // import "github.com/beego/beego/v2/client/httplib"
// //
// b := httplib.Post("http://beego.me/") // b := httplib.Post("http://beego.me/")
// b.Param("username","astaxie") // b.Param("username","astaxie")

5
client/httplib/httplib_test.go
View File

@ -309,7 +309,6 @@ func TestFilterChainOrder(t *testing.T) {
} }
}) })
req.AddFilters(func(next Filter) Filter { req.AddFilters(func(next Filter) Filter {
return func(ctx context.Context, req *BeegoHTTPRequest) (*http.Response, error) { return func(ctx context.Context, req *BeegoHTTPRequest) (*http.Response, error) {
return NewHttpResponseWithJsonBody("second"), nil return NewHttpResponseWithJsonBody("second"), nil
@ -396,7 +395,7 @@ func TestBeegoHTTPRequest_Param(t *testing.T) {
req.Param(key, value) req.Param(key, value)
assert.Equal(t, value, req.params[key][0]) assert.Equal(t, value, req.params[key][0])
value1 := "test-param-value-1" value1 := "test-param-value-1"
req.Param(key, value1) req.Param(key, value1)
assert.Equal(t, value1, req.params[key][1]) assert.Equal(t, value1, req.params[key][1])
} }
@ -419,10 +418,10 @@ func TestBeegoHTTPRequest_Body(t *testing.T) {
req.Body(13) req.Body(13)
} }
type user struct { type user struct {
Name string `xml:"name"` Name string `xml:"name"`
} }
func TestBeegoHTTPRequest_XMLBody(t *testing.T) { func TestBeegoHTTPRequest_XMLBody(t *testing.T) {
req := Post("http://beego.me") req := Post("http://beego.me")
body := &user{ body := &user{

6
client/httplib/mock/mock.go
View File

@ -44,7 +44,7 @@ func StartMock() Stub {
return mockFilter return mockFilter
} }
func CtxWithMock(ctx context.Context, mock... *Mock) context.Context { func CtxWithMock(ctx context.Context, mock ...*Mock) context.Context {
return context.WithValue(ctx, mockCtxKey, mock) return context.WithValue(ctx, mockCtxKey, mock)
} }
@ -73,8 +73,6 @@ func NewMock(con RequestCondition, resp *http.Response, err error) *Mock {
return &Mock{ return &Mock{
cond: con, cond: con,
resp: resp, resp: resp,
err: err, err: err,
} }
} }

1
client/httplib/mock/mock_condition.go
View File

@ -120,7 +120,6 @@ func (sc *SimpleCondition) matchBodyFields(ctx context.Context, req *httplib.Bee
return false return false
} }
m := make(map[string]interface{}) m := make(map[string]interface{})
err = json.Unmarshal(bytes, &m) err = json.Unmarshal(bytes, &m)

2
client/httplib/mock/mock_test.go
View File

@ -72,6 +72,6 @@ func OriginnalCodeUsingHttplibPassCtx(ctx context.Context) (*http.Response, erro
return httplib.Get("http://localhost:7777/abc").DoRequestWithCtx(ctx) return httplib.Get("http://localhost:7777/abc").DoRequestWithCtx(ctx)
} }
func OriginalCodeUsingHttplib() (*http.Response, error){ func OriginalCodeUsingHttplib() (*http.Response, error) {
return httplib.Get("http://localhost:7777/abc").DoRequest() return httplib.Get("http://localhost:7777/abc").DoRequest()
} }

4
client/orm/README.md
View File

@ -27,7 +27,7 @@ more features please read the docs
**Install:** **Install:**
go get github.com/beego/beego/v2/orm go get github.com/beego/beego/v2/client/orm
## Changelog ## Changelog
@ -45,7 +45,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/beego/beego/v2/orm" "github.com/beego/beego/v2/client/orm"
_ "github.com/go-sql-driver/mysql" // import your used driver _ "github.com/go-sql-driver/mysql" // import your used driver
) )

4
client/orm/clauses/const.go
View File

@ -1,6 +1,6 @@
package clauses package clauses
const ( const (
ExprSep = "__" ExprSep = "__"
ExprDot = "." ExprDot = "."
) )

3
client/orm/clauses/order_clause/order.go
View File

@ -1,8 +1,9 @@
package order_clause package order_clause
import ( import (
"github.com/beego/beego/v2/client/orm/clauses"
"strings" "strings"
"github.com/beego/beego/v2/client/orm/clauses"
) )
type Sort int8 type Sort int8

5
client/orm/db_tables.go
View File

@ -16,10 +16,11 @@ package orm
import ( import (
"fmt" "fmt"
"github.com/beego/beego/v2/client/orm/clauses"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"strings" "strings"
"time" "time"
"github.com/beego/beego/v2/client/orm/clauses"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
) )
// table info struct. // table info struct.

4
client/orm/mock/condition.go
View File

@ -23,14 +23,14 @@ import (
type Mock struct { type Mock struct {
cond Condition cond Condition
resp []interface{} resp []interface{}
cb func(inv *orm.Invocation) cb func(inv *orm.Invocation)
} }
func NewMock(cond Condition, resp []interface{}, cb func(inv *orm.Invocation)) *Mock { func NewMock(cond Condition, resp []interface{}, cb func(inv *orm.Invocation)) *Mock {
return &Mock{ return &Mock{
cond: cond, cond: cond,
resp: resp, resp: resp,
cb: cb, cb: cb,
} }
} }

4
client/orm/mock/mock_orm_test.go
View File

@ -24,7 +24,9 @@ import (
"github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/client/orm"
) )
const mockErrorMsg = "mock error" const mockErrorMsg = "mock error"
func init() { func init() {
orm.RegisterModel(&User{}) orm.RegisterModel(&User{})
} }
@ -239,7 +241,7 @@ func TestTransactionRollback(t *testing.T) {
assert.Equal(t, mock, err) assert.Equal(t, mock, err)
} }
func TestTransactionCommit(t *testing.T) { func TestTransactionCommit(t *testing.T) {
s := StartMock() s := StartMock()
defer s.Clear() defer s.Clear()
mock := errors.New(mockErrorMsg) mock := errors.New(mockErrorMsg)

7
client/orm/mock/mock_queryM2Mer.go
View File

@ -23,7 +23,6 @@ import (
// DoNothingQueryM2Mer do nothing // DoNothingQueryM2Mer do nothing
// use it to build mock orm.QueryM2Mer // use it to build mock orm.QueryM2Mer
type DoNothingQueryM2Mer struct { type DoNothingQueryM2Mer struct {
} }
func (d *DoNothingQueryM2Mer) AddWithCtx(ctx context.Context, i ...interface{}) (int64, error) { func (d *DoNothingQueryM2Mer) AddWithCtx(ctx context.Context, i ...interface{}) (int64, error) {
@ -68,13 +67,13 @@ func (d *DoNothingQueryM2Mer) Count() (int64, error) {
type QueryM2MerCondition struct { type QueryM2MerCondition struct {
tableName string tableName string
name string name string
} }
func NewQueryM2MerCondition(tableName string, name string) *QueryM2MerCondition { func NewQueryM2MerCondition(tableName string, name string) *QueryM2MerCondition {
return &QueryM2MerCondition{ return &QueryM2MerCondition{
tableName: tableName, tableName: tableName,
name: name, name: name,
} }
} }
@ -88,5 +87,3 @@ func (q *QueryM2MerCondition) Match(ctx context.Context, inv *orm.Invocation) bo
} }
return res return res
} }

2
client/orm/models.go
View File

@ -369,7 +369,7 @@ func (mc *_modelCache) register(prefixOrSuffixStr string, prefixOrSuffix bool, m
} }
if _, ok := mc.get(table); ok { if _, ok := mc.get(table); ok {
return nil return nil
} }
mi := newModelInfo(val) mi := newModelInfo(val)

3
client/orm/orm.go
View File

@ -58,11 +58,12 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"os" "os"
"reflect" "reflect"
"time" "time"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"github.com/beego/beego/v2/client/orm/hints" "github.com/beego/beego/v2/client/orm/hints"
"github.com/beego/beego/v2/core/utils" "github.com/beego/beego/v2/core/utils"

3
client/orm/orm_conds.go
View File

@ -16,8 +16,9 @@ package orm
import ( import (
"fmt" "fmt"
"github.com/beego/beego/v2/client/orm/clauses"
"strings" "strings"
"github.com/beego/beego/v2/client/orm/clauses"
) )
// ExprSep define the expression separation // ExprSep define the expression separation

3
client/orm/orm_test.go
View File

@ -21,7 +21,6 @@ import (
"context" "context"
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"io/ioutil" "io/ioutil"
"math" "math"
"os" "os"
@ -32,6 +31,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"github.com/beego/beego/v2/client/orm/hints" "github.com/beego/beego/v2/client/orm/hints"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

17
core/berror/codes.go
View File

@ -19,8 +19,6 @@ import (
"sync" "sync"
) )
// A Code is an unsigned 32-bit error code as defined in the beego spec. // A Code is an unsigned 32-bit error code as defined in the beego spec.
type Code interface { type Code interface {
Code() uint32 Code() uint32
@ -38,9 +36,9 @@ var defaultCodeRegistry = &codeRegistry{
// desc could be markdown doc // desc could be markdown doc
func DefineCode(code uint32, module string, name string, desc string) Code { func DefineCode(code uint32, module string, name string, desc string) Code {
res := &codeDefinition{ res := &codeDefinition{
code: code, code: code,
module: module, module: module,
desc: desc, desc: desc,
} }
defaultCodeRegistry.lock.Lock() defaultCodeRegistry.lock.Lock()
defer defaultCodeRegistry.lock.Unlock() defer defaultCodeRegistry.lock.Unlock()
@ -53,11 +51,10 @@ func DefineCode(code uint32, module string, name string, desc string) Code {
} }
type codeRegistry struct { type codeRegistry struct {
lock sync.RWMutex lock sync.RWMutex
codes map[uint32]*codeDefinition codes map[uint32]*codeDefinition
} }
func (cr *codeRegistry) Get(code uint32) (Code, bool) { func (cr *codeRegistry) Get(code uint32) (Code, bool) {
cr.lock.RLock() cr.lock.RLock()
defer cr.lock.RUnlock() defer cr.lock.RUnlock()
@ -66,13 +63,12 @@ func (cr *codeRegistry) Get(code uint32) (Code, bool) {
} }
type codeDefinition struct { type codeDefinition struct {
code uint32 code uint32
module string module string
desc string desc string
name string name string
} }
func (c *codeDefinition) Name() string { func (c *codeDefinition) Name() string {
return c.name return c.name
} }
@ -88,4 +84,3 @@ func (c *codeDefinition) Module() string {
func (c *codeDefinition) Desc() string { func (c *codeDefinition) Desc() string {
return c.desc return c.desc
} }

3
core/berror/pre_define_code.go
View File

@ -21,7 +21,7 @@ import (
// pre define code // pre define code
// Unknown indicates got some error which is not defined // Unknown indicates got some error which is not defined
var Unknown = DefineCode(5000001, "error", "Unknown",fmt.Sprintf(` var Unknown = DefineCode(5000001, "error", "Unknown", fmt.Sprintf(`
Unknown error code. Usually you will see this code in three cases: Unknown error code. Usually you will see this code in three cases:
1. You forget to define Code or function DefineCode not being executed; 1. You forget to define Code or function DefineCode not being executed;
2. This is not Beego's error but you call FromError(); 2. This is not Beego's error but you call FromError();
@ -49,4 +49,3 @@ func goCodeBlock(code string) string {
func codeBlock(lan string, code string) string { func codeBlock(lan string, code string) string {
return fmt.Sprintf("```%s\n%s\n```", lan, code) return fmt.Sprintf("```%s\n%s\n```", lan, code)
} }

2
core/config/config.go
View File

@ -14,7 +14,7 @@
// Package config is used to parse config. // Package config is used to parse config.
// Usage: // Usage:
// import "github.com/beego/beego/v2/config" // import "github.com/beego/beego/v2/core/config"
// Examples. // Examples.
// //
// cnf, err := config.NewConfig("ini", "config.conf") // cnf, err := config.NewConfig("ini", "config.conf")

4
core/config/xml/xml.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/config/xml" // _ "github.com/beego/beego/v2/core/config/xml"
// "github.com/beego/beego/v2/config" // "github.com/beego/beego/v2/core/config"
// ) // )
// //
// cnf, err := config.NewConfig("xml", "config.xml") // cnf, err := config.NewConfig("xml", "config.xml")

4
core/config/yaml/yaml.go
View File

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/config/yaml" // _ "github.com/beego/beego/v2/core/config/yaml"
// "github.com/beego/beego/v2/config" // "github.com/beego/beego/v2/core/config"
// ) // )
// //
// cnf, err := config.NewConfig("yaml", "config.yaml") // cnf, err := config.NewConfig("yaml", "config.yaml")

4
core/logs/README.md
View File

@ -4,7 +4,7 @@ logs is a Go logs manager. It can use many logs adapters. The repo is inspired b
## How to install? ## How to install?
go get github.com/beego/beego/v2/logs go get github.com/beego/beego/v2/core/logs
## What adapters are supported? ## What adapters are supported?
@ -16,7 +16,7 @@ First you must import it
```golang ```golang
import ( import (
"github.com/beego/beego/v2/logs" "github.com/beego/beego/v2/core/logs"
) )
``` ```

2
core/logs/es/es.go
View File

@ -29,7 +29,7 @@ func NewES() logs.Logger {
// please import this package // please import this package
// usually means that you can import this package in your main package // usually means that you can import this package in your main package
// for example, anonymous: // for example, anonymous:
// import _ "github.com/beego/beego/v2/logs/es" // import _ "github.com/beego/beego/v2/core/logs/es"
type esLogger struct { type esLogger struct {
*elasticsearch.Client *elasticsearch.Client
DSN string `json:"dsn"` DSN string `json:"dsn"`

2
core/logs/log.go
View File

@ -15,7 +15,7 @@
// Package logs provide a general log interface // Package logs provide a general log interface
// Usage: // Usage:
// //
// import "github.com/beego/beego/v2/logs" // import "github.com/beego/beego/v2/core/logs"
// //
// log := NewLogger(10000) // log := NewLogger(10000)
// log.SetLogger("console", "") // log.SetLogger("console", "")

10
core/validation/README.md
View File

@ -7,18 +7,18 @@ validation is a form validation for a data validation and error collecting using
Install: Install:
go get github.com/beego/beego/v2/validation go get github.com/beego/beego/v2/core/validation
Test: Test:
go test github.com/beego/beego/v2/validation go test github.com/beego/beego/v2/core/validation
## Example ## Example
Direct Use: Direct Use:
import ( import (
"github.com/beego/beego/v2/validation" "github.com/beego/beego/v2/core/validation"
"log" "log"
) )
@ -49,7 +49,7 @@ Direct Use:
Struct Tag Use: Struct Tag Use:
import ( import (
"github.com/beego/beego/v2/validation" "github.com/beego/beego/v2/core/validation"
) )
// validation function follow with "valid" tag // validation function follow with "valid" tag
@ -81,7 +81,7 @@ Struct Tag Use:
Use custom function: Use custom function:
import ( import (
"github.com/beego/beego/v2/validation" "github.com/beego/beego/v2/core/validation"
) )
type user struct { type user struct {

2
core/validation/validation.go
View File

@ -15,7 +15,7 @@
// Package validation for validations // Package validation for validations
// //
// import ( // import (
// "github.com/beego/beego/v2/validation" // "github.com/beego/beego/v2/core/validation"
// "log" // "log"
// ) // )
// //

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

@ -7,8 +7,8 @@ package controllers
import ( import (
"github.com/beego/beego/v2" "github.com/beego/beego/v2"
"github.com/beego/beego/v2/cache" "github.com/beego/beego/v2/client/cache"
"github.com/beego/beego/v2/utils/captcha" "github.com/beego/beego/v2/server/web/captcha"
) )
var cpt *captcha.Captcha var cpt *captcha.Captcha

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

@ -20,8 +20,8 @@
// //
// import ( // import (
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/cache" // "github.com/beego/beego/v2/client/cache"
// "github.com/beego/beego/v2/utils/captcha" // "github.com/beego/beego/v2/server/web/captcha"
// ) // )
// //
// var cpt *captcha.Captcha // var cpt *captcha.Captcha

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

@ -15,7 +15,7 @@
// Package context provide the context utils // Package context provide the context utils
// Usage: // Usage:
// //
// import "github.com/beego/beego/v2/context" // import "github.com/beego/beego/v2/server/web/context"
// //
// ctx := context.Context{Request:req,ResponseWriter:rw} // ctx := context.Context{Request:req,ResponseWriter:rw}
// //
@ -29,13 +29,14 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
"github.com/beego/beego/v2/server/web/session"
"net" "net"
"net/http" "net/http"
"strconv" "strconv"
"strings" "strings"
"time" "time"
"github.com/beego/beego/v2/server/web/session"
"github.com/beego/beego/v2/core/utils" "github.com/beego/beego/v2/core/utils"
) )

3
server/web/context/context_test.go
View File

@ -15,10 +15,11 @@
package context package context
import ( import (
"github.com/beego/beego/v2/server/web/session"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/beego/beego/v2/server/web/session"
) )
func TestXsrfReset_01(t *testing.T) { func TestXsrfReset_01(t *testing.T) {

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

@ -17,7 +17,7 @@
// Simple Usage: // Simple Usage:
// import( // import(
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/apiauth" // "github.com/beego/beego/v2/server/web/filter/apiauth"
// ) // )
// //
// func main(){ // func main(){

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

@ -16,7 +16,7 @@
// Simple Usage: // Simple Usage:
// import( // import(
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/auth" // "github.com/beego/beego/v2/server/web/filter/auth"
// ) // )
// //
// func main(){ // func main(){

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

@ -16,7 +16,7 @@
// Simple Usage: // Simple Usage:
// import( // import(
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/authz" // "github.com/beego/beego/v2/server/web/filter/authz"
// "github.com/casbin/casbin" // "github.com/casbin/casbin"
// ) // )
// //

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

@ -16,7 +16,7 @@
// Usage // Usage
// import ( // import (
// "github.com/beego/beego/v2" // "github.com/beego/beego/v2"
// "github.com/beego/beego/v2/plugins/cors" // "github.com/beego/beego/v2/server/web/filter/cors"
// ) // )
// //
// func main() { // func main() {

1
server/web/filter/session/filter.go
View File

@ -2,6 +2,7 @@ package session
import ( import (
"context" "context"
"github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/core/logs"
"github.com/beego/beego/v2/server/web" "github.com/beego/beego/v2/server/web"
webContext "github.com/beego/beego/v2/server/web/context" webContext "github.com/beego/beego/v2/server/web/context"

7
server/web/filter/session/filter_test.go
View File

@ -1,13 +1,14 @@
package session package session
import ( import (
"net/http"
"net/http/httptest"
"testing"
"github.com/beego/beego/v2/server/web" "github.com/beego/beego/v2/server/web"
webContext "github.com/beego/beego/v2/server/web/context" webContext "github.com/beego/beego/v2/server/web/context"
"github.com/beego/beego/v2/server/web/session" "github.com/beego/beego/v2/server/web/session"
"github.com/google/uuid" "github.com/google/uuid"
"net/http"
"net/http/httptest"
"testing"
) )
func testRequest(t *testing.T, handler *web.ControllerRegister, path string, method string, code int) { func testRequest(t *testing.T, handler *web.ControllerRegister, path string, method string, code int) {

1
server/web/filter_chain_test.go
View File

@ -60,7 +60,6 @@ func TestControllerRegister_InsertFilterChain_Order(t *testing.T) {
} }
}) })
InsertFilterChain("/abc", func(next FilterFunc) FilterFunc { InsertFilterChain("/abc", func(next FilterFunc) FilterFunc {
return func(ctx *context.Context) { return func(ctx *context.Context) {
ctx.Output.Header("second", fmt.Sprintf("%d", time.Now().UnixNano())) ctx.Output.Header("second", fmt.Sprintf("%d", time.Now().UnixNano()))

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

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

2
server/web/parser.go
View File

@ -70,7 +70,7 @@ var (
} }
) )
const commentFilename = "commentsRouter.go" const commentFilename = "commentsRouter.go"
func init() { func init() {
pkgLastupdate = make(map[string]int64) pkgLastupdate = make(map[string]int64)

2
server/web/parser_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
func Test_getRouterDir(t *testing.T) { func Test_getRouterDir(t *testing.T) {
pkg := filepath.Dir(os.TempDir()) pkg := filepath.Dir(os.TempDir())
res := getRouterDir(pkg) res := getRouterDir(pkg)

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

@ -6,7 +6,7 @@ and `database/sql/driver`.
## How to install? ## How to install?
go get github.com/beego/beego/v2/session go get github.com/beego/beego/v2/server/web/session
## What providers are supported? ## What providers are supported?
@ -17,7 +17,7 @@ As of now this session manager support memory, file, Redis and MySQL.
First you must import it First you must import it
import ( import (
"github.com/beego/beego/v2/session" "github.com/beego/beego/v2/server/web/session"
) )
Then in you web app init the global session manager Then in you web app init the global session manager

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

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/couchbase" // _ "github.com/beego/beego/v2/server/web/session/couchbase"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

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

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/memcache" // _ "github.com/beego/beego/v2/server/web/session/memcache"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

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

@ -28,8 +28,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/mysql" // _ "github.com/beego/beego/v2/server/web/session/mysql"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

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

@ -38,8 +38,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/postgresql" // _ "github.com/beego/beego/v2/server/web/session/postgresql"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

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

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/redis" // _ "github.com/beego/beego/v2/server/web/session/redis"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

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

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/redis_cluster" // _ "github.com/beego/beego/v2/server/web/session/redis_cluster"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

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

@ -20,8 +20,8 @@
// //
// Usage: // Usage:
// import( // import(
// _ "github.com/beego/beego/v2/session/redis_sentinel" // _ "github.com/beego/beego/v2/server/web/session/redis_sentinel"
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {

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

@ -16,7 +16,7 @@
// //
// Usage: // Usage:
// import( // import(
// "github.com/beego/beego/v2/session" // "github.com/beego/beego/v2/server/web/session"
// ) // )
// //
// func init() { // func init() {
@ -221,7 +221,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se
HttpOnly: !manager.config.DisableHTTPOnly, HttpOnly: !manager.config.DisableHTTPOnly,
Secure: manager.isSecure(r), Secure: manager.isSecure(r),
Domain: manager.config.Domain, Domain: manager.config.Domain,
SameSite: manager.config.CookieSameSite, SameSite: manager.config.CookieSameSite,
} }
if manager.config.CookieLifeTime > 0 { if manager.config.CookieLifeTime > 0 {
cookie.MaxAge = manager.config.CookieLifeTime cookie.MaxAge = manager.config.CookieLifeTime

2
server/web/tree.go
View File

@ -342,7 +342,7 @@ func (t *Tree) match(treePattern string, pattern string, wildcardValues []string
if runObject == nil && len(t.fixrouters) > 0 { if runObject == nil && len(t.fixrouters) > 0 {
// Filter the .json .xml .html extension // Filter the .json .xml .html extension
for _, str := range allowSuffixExt { for _, str := range allowSuffixExt {
if strings.HasSuffix(seg, str) && strings.HasSuffix(treePattern, seg){ if strings.HasSuffix(seg, str) && strings.HasSuffix(treePattern, seg) {
for _, subTree := range t.fixrouters { for _, subTree := range t.fixrouters {
// strings.HasSuffix(treePattern, seg) avoid cases: /aaa.html/bbb could access /aaa/bbb // strings.HasSuffix(treePattern, seg) avoid cases: /aaa.html/bbb could access /aaa/bbb
if subTree.prefix == seg[:len(seg)-len(str)] { if subTree.prefix == seg[:len(seg)-len(str)] {