Merge pull request #4249 from flycash/rft/moveSession

move core/session to web/session

pkg/adapter/session/couchbase/sess_couchbase.go

@@ -37,7 +37,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	beecb "github.com/astaxie/beego/pkg/core/session/couchbase"
+	beecb "github.com/astaxie/beego/pkg/server/web/session/couchbase"
 )
 
 // SessionStore store each session

pkg/adapter/session/ledis/ledis_session.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	beeLedis "github.com/astaxie/beego/pkg/core/session/ledis"
+	beeLedis "github.com/astaxie/beego/pkg/server/web/session/ledis"
 )
 
 // SessionStore ledis session store

pkg/adapter/session/memcache/sess_memcache.go

@@ -38,7 +38,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	beemem "github.com/astaxie/beego/pkg/core/session/memcache"
+	beemem "github.com/astaxie/beego/pkg/server/web/session/memcache"
 )
 
 // SessionStore memcache session store

pkg/adapter/session/mysql/sess_mysql.go

@@ -45,7 +45,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	"github.com/astaxie/beego/pkg/core/session/mysql"
+	"github.com/astaxie/beego/pkg/server/web/session/mysql"
 
 	// import mysql driver
 	_ "github.com/go-sql-driver/mysql"

pkg/adapter/session/postgres/sess_postgresql.go

@@ -58,7 +58,7 @@ import (
 	// import postgresql Driver
 	_ "github.com/lib/pq"
 
-	"github.com/astaxie/beego/pkg/core/session/postgres"
+	"github.com/astaxie/beego/pkg/server/web/session/postgres"
 )
 
 // SessionStore postgresql session store

pkg/adapter/session/provider_adapter.go

@@ -17,7 +17,7 @@ package session
 import (
 	"context"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 type oldToNewProviderAdapter struct {

pkg/adapter/session/redis/sess_redis.go

@@ -38,7 +38,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	beeRedis "github.com/astaxie/beego/pkg/core/session/redis"
+	beeRedis "github.com/astaxie/beego/pkg/server/web/session/redis"
 )
 
 // MaxPoolSize redis max pool size

pkg/adapter/session/redis_cluster/redis_cluster.go

@@ -37,7 +37,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	cluster "github.com/astaxie/beego/pkg/core/session/redis_cluster"
+	cluster "github.com/astaxie/beego/pkg/server/web/session/redis_cluster"
 )
 
 // MaxPoolSize redis_cluster max pool size

pkg/adapter/session/redis_sentinel/sess_redis_sentinel.go

@@ -38,7 +38,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	sentinel "github.com/astaxie/beego/pkg/core/session/redis_sentinel"
+	sentinel "github.com/astaxie/beego/pkg/server/web/session/redis_sentinel"
 )
 
 // DefaultPoolSize redis_sentinel default pool size

pkg/adapter/session/sess_cookie.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 // CookieSessionStore Cookie SessionStore

pkg/adapter/session/sess_file.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 // FileSessionStore File session store

pkg/adapter/session/sess_mem.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 // MemSessionStore memory session store.

pkg/adapter/session/sess_utils.go

@@ -15,7 +15,7 @@
 package session
 
 import (
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 // EncodeGob encode the obj to gob

pkg/adapter/session/session.go

@@ -32,7 +32,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 // Store contains all data for one session process with specific id.

pkg/adapter/session/ssdb/sess_ssdb.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	beeSsdb "github.com/astaxie/beego/pkg/core/session/ssdb"
+	beeSsdb "github.com/astaxie/beego/pkg/server/web/session/ssdb"
 )
 
 // Provider holds ssdb client and configs

pkg/adapter/session/store_adapter.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 type NewToOldStoreAdapter struct {

pkg/server/web/config.go

@@ -27,7 +27,7 @@ import (
 	"github.com/astaxie/beego/pkg"
 	"github.com/astaxie/beego/pkg/core/config"
 	"github.com/astaxie/beego/pkg/core/logs"
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 
 	"github.com/astaxie/beego/pkg/core/utils"
 	"github.com/astaxie/beego/pkg/server/web/context"

pkg/server/web/context/input.go

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

pkg/server/web/controller.go

@@ -28,7 +28,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 
 	"github.com/astaxie/beego/pkg/server/web/context"
 	"github.com/astaxie/beego/pkg/server/web/context/param"

pkg/server/web/hooks.go

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

pkg/server/web/session/couchbase/sess_couchbase.go

@@ -40,7 +40,7 @@ import (
 
 	couchbase "github.com/couchbase/go-couchbase"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 var couchbpder = &Provider{}

pkg/server/web/session/ledis/ledis_session.go

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

pkg/server/web/session/memcache/sess_memcache.go

@@ -38,7 +38,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 
 	"github.com/bradfitz/gomemcache/memcache"
 )

pkg/server/web/session/mysql/sess_mysql.go

@@ -47,7 +47,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 	// import mysql driver
 	_ "github.com/go-sql-driver/mysql"
 )

pkg/server/web/session/postgres/sess_postgresql.go

@@ -57,7 +57,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 	// import postgresql Driver
 	_ "github.com/lib/pq"
 )

pkg/server/web/session/redis/sess_redis.go

@@ -40,7 +40,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 
 	"github.com/go-redis/redis/v7"
 )

pkg/server/web/session/redis/sess_redis_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 func TestRedis(t *testing.T) {

pkg/server/web/session/redis_cluster/redis_cluster.go

@@ -40,7 +40,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 	rediss "github.com/go-redis/redis/v7"
 )
 

pkg/server/web/session/redis_sentinel/sess_redis_sentinel.go

@@ -40,7 +40,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 	"github.com/go-redis/redis/v7"
 )
 

pkg/server/web/session/redis_sentinel/sess_redis_sentinel_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/astaxie/beego/pkg/core/session"
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 func TestRedisSentinel(t *testing.T) {

pkg/server/web/session/ssdb/sess_ssdb.go

@@ -8,8 +8,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/astaxie/beego/pkg/core/session"
 	"github.com/ssdb/gossdb/ssdb"
+
+	"github.com/astaxie/beego/pkg/server/web/session"
 )
 
 var ssdbProvider = &Provider{}
@@ -87,7 +88,7 @@ func (p *Provider) SessionExist(ctx context.Context, sid string) (bool, error) {
 
 // SessionRegenerate regenerate session with new sid and delete oldsid
 func (p *Provider) SessionRegenerate(ctx context.Context, oldsid, sid string) (session.Store, error) {
-	//conn.Do("setx", key, v, ttl)
+	// conn.Do("setx", key, v, ttl)
 	if p.client == nil {
 		if err := p.connectInit(); err != nil {
 			return nil, err