3c91360d by astaxie

dictinct system pkg and third pkg

1 parent 983f2064
...@@ -2,9 +2,10 @@ package beego ...@@ -2,9 +2,10 @@ package beego
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 "github.com/astaxie/beego/toolbox"
6 "net/http" 5 "net/http"
7 "time" 6 "time"
7
8 "github.com/astaxie/beego/toolbox"
8 ) 9 )
9 10
10 var BeeAdminApp *AdminApp 11 var BeeAdminApp *AdminApp
......
...@@ -2,11 +2,12 @@ package beego ...@@ -2,11 +2,12 @@ package beego
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 "github.com/astaxie/beego/context"
6 "net" 5 "net"
7 "net/http" 6 "net/http"
8 "net/http/fcgi" 7 "net/http/fcgi"
9 "time" 8 "time"
9
10 "github.com/astaxie/beego/context"
10 ) 11 )
11 12
12 type FilterFunc func(*context.Context) 13 type FilterFunc func(*context.Context)
......
...@@ -3,6 +3,7 @@ package cache ...@@ -3,6 +3,7 @@ package cache
3 import ( 3 import (
4 "encoding/json" 4 "encoding/json"
5 "errors" 5 "errors"
6
6 "github.com/beego/memcache" 7 "github.com/beego/memcache"
7 ) 8 )
8 9
......
...@@ -3,6 +3,7 @@ package cache ...@@ -3,6 +3,7 @@ package cache
3 import ( 3 import (
4 "encoding/json" 4 "encoding/json"
5 "errors" 5 "errors"
6
6 "github.com/beego/redigo/redis" 7 "github.com/beego/redigo/redis"
7 ) 8 )
8 9
......
...@@ -26,7 +26,6 @@ var ( ...@@ -26,7 +26,6 @@ var (
26 HttpKeyFile string 26 HttpKeyFile string
27 RecoverPanic bool 27 RecoverPanic bool
28 AutoRender bool 28 AutoRender bool
29 PprofOn bool
30 ViewsPath string 29 ViewsPath string
31 RunMode string //"dev" or "prod" 30 RunMode string //"dev" or "prod"
32 AppConfig config.ConfigContainer 31 AppConfig config.ConfigContainer
...@@ -71,7 +70,6 @@ func InitConfig() { ...@@ -71,7 +70,6 @@ func InitConfig() {
71 RunMode = "dev" //default runmod 70 RunMode = "dev" //default runmod
72 AutoRender = true 71 AutoRender = true
73 RecoverPanic = true 72 RecoverPanic = true
74 PprofOn = false
75 ViewsPath = "views" 73 ViewsPath = "views"
76 SessionOn = false 74 SessionOn = false
77 SessionProvider = "memory" 75 SessionProvider = "memory"
......
...@@ -4,11 +4,12 @@ package config ...@@ -4,11 +4,12 @@ package config
4 4
5 import ( 5 import (
6 "errors" 6 "errors"
7 "github.com/beego/x2j"
8 "io/ioutil" 7 "io/ioutil"
9 "os" 8 "os"
10 "strconv" 9 "strconv"
11 "sync" 10 "sync"
11
12 "github.com/beego/x2j"
12 ) 13 )
13 14
14 type XMLConfig struct { 15 type XMLConfig struct {
......
...@@ -4,11 +4,12 @@ import ( ...@@ -4,11 +4,12 @@ import (
4 "bytes" 4 "bytes"
5 "encoding/json" 5 "encoding/json"
6 "errors" 6 "errors"
7 "github.com/beego/goyaml2"
8 "io/ioutil" 7 "io/ioutil"
9 "log" 8 "log"
10 "os" 9 "os"
11 "sync" 10 "sync"
11
12 "github.com/beego/goyaml2"
12 ) 13 )
13 14
14 type YAMLConfig struct { 15 type YAMLConfig struct {
......
1 package context 1 package context
2 2
3 import ( 3 import (
4 "github.com/astaxie/beego/middleware"
5 "net/http" 4 "net/http"
5
6 "github.com/astaxie/beego/middleware"
6 ) 7 )
7 8
8 type Context struct { 9 type Context struct {
......
...@@ -2,11 +2,12 @@ package context ...@@ -2,11 +2,12 @@ package context
2 2
3 import ( 3 import (
4 "bytes" 4 "bytes"
5 "github.com/astaxie/beego/session"
6 "io/ioutil" 5 "io/ioutil"
7 "net/http" 6 "net/http"
8 "strconv" 7 "strconv"
9 "strings" 8 "strings"
9
10 "github.com/astaxie/beego/session"
10 ) 11 )
11 12
12 type BeegoInput struct { 13 type BeegoInput struct {
......
...@@ -7,8 +7,6 @@ import ( ...@@ -7,8 +7,6 @@ import (
7 "encoding/base64" 7 "encoding/base64"
8 "errors" 8 "errors"
9 "fmt" 9 "fmt"
10 "github.com/astaxie/beego/context"
11 "github.com/astaxie/beego/session"
12 "html/template" 10 "html/template"
13 "io" 11 "io"
14 "io/ioutil" 12 "io/ioutil"
...@@ -20,6 +18,9 @@ import ( ...@@ -20,6 +18,9 @@ import (
20 "strconv" 18 "strconv"
21 "strings" 19 "strings"
22 "time" 20 "time"
21
22 "github.com/astaxie/beego/context"
23 "github.com/astaxie/beego/session"
23 ) 24 )
24 25
25 type Controller struct { 26 type Controller struct {
......
1 package beego 1 package beego
2 2
3 import ( 3 import (
4 "github.com/astaxie/beego/context"
5 "net/http" 4 "net/http"
6 "net/http/httptest" 5 "net/http/httptest"
7 "testing" 6 "testing"
7
8 "github.com/astaxie/beego/context"
8 ) 9 )
9 10
10 var FilterUser = func(ctx *context.Context) { 11 var FilterUser = func(ctx *context.Context) {
......
...@@ -2,9 +2,6 @@ package beego ...@@ -2,9 +2,6 @@ package beego
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 beecontext "github.com/astaxie/beego/context"
6 "github.com/astaxie/beego/middleware"
7 "github.com/astaxie/beego/toolbox"
8 "net/http" 5 "net/http"
9 "net/url" 6 "net/url"
10 "os" 7 "os"
...@@ -14,6 +11,10 @@ import ( ...@@ -14,6 +11,10 @@ import (
14 "strconv" 11 "strconv"
15 "strings" 12 "strings"
16 "time" 13 "time"
14
15 beecontext "github.com/astaxie/beego/context"
16 "github.com/astaxie/beego/middleware"
17 "github.com/astaxie/beego/toolbox"
17 ) 18 )
18 19
19 const ( 20 const (
......
...@@ -9,9 +9,10 @@ package session ...@@ -9,9 +9,10 @@ package session
9 9
10 import ( 10 import (
11 "database/sql" 11 "database/sql"
12 _ "github.com/go-sql-driver/mysql"
13 "sync" 12 "sync"
14 "time" 13 "time"
14
15 _ "github.com/go-sql-driver/mysql"
15 ) 16 )
16 17
17 var mysqlpder = &MysqlProvider{} 18 var mysqlpder = &MysqlProvider{}
......
1 package session 1 package session
2 2
3 import ( 3 import (
4 "github.com/beego/redigo/redis"
5 "strconv" 4 "strconv"
6 "strings" 5 "strings"
7 "sync" 6 "sync"
7
8 "github.com/beego/redigo/redis"
8 ) 9 )
9 10
10 var redispder = &RedisProvider{} 11 var redispder = &RedisProvider{}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!