http server one shot

Author: XieBiao

config/http.toml

@@ -0,0 +1 @@
+listen = ":9010"

core/db.go renamed to db/config.go

@@ -1,20 +1,12 @@
-package core
+package db
 
 import (
-	"github.com/go-xorm/xorm"
-	"os"
 	"runtime"
 	"path"
 	"github.com/BurntSushi/toml"
 	"errors"
-	xcore "github.com/go-xorm/core"
 )
 
-type DB struct {
-	Cfg    Connection
-	Engine *xorm.Engine
-}
-
 type Connection struct {
 	Driver   string
 	Dsn      string
@@ -45,31 +37,3 @@ func GetDbConfig(id string) Connection {
 	}
 	return conn
 }
-
-func NewDB(conn string) *DB {
-	cfg := GetDbConfig(conn)
-	db := &DB{cfg, nil}
-
-	var err error
-	db.Engine, err = xorm.NewEngine(cfg.Driver, cfg.Dsn)
-	if err != nil {
-		panic(err)
-	}
-
-	if cfg.Log {
-		//log into file
-		if len(cfg.LogFile) > 0 {
-			f, err := os.OpenFile(cfg.LogFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-			if err != nil {
-				panic(err)
-			}
-			db.Engine.SetLogger(xorm.NewSimpleLogger(f))
-		} //else log into console
-
-		db.Engine.ShowSQL(true)
-		db.Engine.ShowExecTime(true)
-		db.Engine.Logger().SetLevel(xcore.LogLevel(cfg.LogLevel))
-	}
-
-	return db
-}

db/db.go

@@ -0,0 +1,40 @@
+package db
+
+import (
+	"github.com/go-xorm/xorm"
+	"os"
+	"github.com/go-xorm/core"
+)
+
+type DB struct {
+	Cfg    Connection
+	Engine *xorm.Engine
+}
+
+func NewDB(conn string) *DB {
+	cfg := GetDbConfig(conn)
+	db := &DB{cfg, nil}
+
+	var err error
+	db.Engine, err = xorm.NewEngine(cfg.Driver, cfg.Dsn)
+	if err != nil {
+		panic(err)
+	}
+
+	if cfg.Log {
+		//log into file
+		if len(cfg.LogFile) > 0 {
+			f, err := os.OpenFile(cfg.LogFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+			if err != nil {
+				panic(err)
+			}
+			db.Engine.SetLogger(xorm.NewSimpleLogger(f))
+		} //else log into console
+
+		db.Engine.ShowSQL(true)
+		db.Engine.ShowExecTime(true)
+		db.Engine.Logger().SetLevel(core.LogLevel(cfg.LogLevel))
+	}
+
+	return db
+}

models/base.go renamed to db/models/base.go

@@ -2,11 +2,11 @@ package models
 
 import (
 	xcore "github.com/go-xorm/core"
-	"github.com/hhxsv5/go-db-proxy-api/core"
+	"github.com/hhxsv5/go-db-proxy-api/db"
 )
 
-func NewDB(conn string) *core.DB {
-	db := core.NewDB(conn)
+func NewDB(conn string) *db.DB {
+	db := db.NewDB(conn)
 
 	//...some settings for xorm
 	db.Engine.SetMapper(xcore.GonicMapper{})

examples/main.go

@@ -1,12 +1,14 @@
 package main
 
 import (
-	"fmt"
-	"github.com/hhxsv5/go-db-proxy-api/models/mdefault"
+	"github.com/hhxsv5/go-db-proxy-api"
 )
 
 func main() {
-	user := mdefault.CreateUser("18780207350")
-	fmt.Println(user)
-	fmt.Printf("%p", user)
+	//user := mydefault.CreateUser("18780207350")
+	//fmt.Println(user)
+	//fmt.Printf("%p", user)
+
+	p := godpa.NewProxy()
+	p.Run()
 }

models/mdb1/base.go renamed to examples/models/db1/base.go

@@ -1,17 +1,17 @@
-package mdb1
+package db1
 
 import (
 	_ "github.com/go-sql-driver/mysql" //remember: import xxx driver to init
-	"github.com/hhxsv5/go-db-proxy-api/models"
-	"github.com/hhxsv5/go-db-proxy-api/core"
+	"github.com/hhxsv5/go-db-proxy-api/db/models"
+	mydb "github.com/hhxsv5/go-db-proxy-api/db"
 	"github.com/go-xorm/xorm"
 )
 
 //db1 connection in file db.toml
 const conn = "db1"
 
 var (
-	db  *core.DB
+	db  *mydb.DB
 	orm *xorm.Engine
 )
 

models/mdb2/user.go renamed to examples/models/db1/user.go

@@ -1,4 +1,4 @@
-package mdb2
+package db1
 
 import (
 	"github.com/go-xorm/builder"

models/mdb2/base.go renamed to examples/models/db2/base.go

@@ -1,17 +1,17 @@
-package mdb2
+package db2
 
 import (
 	_ "github.com/go-sql-driver/mysql" //remember: import xxx driver to init
-	"github.com/hhxsv5/go-db-proxy-api/models"
-	"github.com/hhxsv5/go-db-proxy-api/core"
+	"github.com/hhxsv5/go-db-proxy-api/db/models"
+	mydb "github.com/hhxsv5/go-db-proxy-api/db"
 	"github.com/go-xorm/xorm"
 )
 
 //db2 connection in file db.toml
 const conn = "db2"
 
 var (
-	db  *core.DB
+	db  *mydb.DB
 	orm *xorm.Engine
 )
 

models/mdb1/user.go renamed to examples/models/db2/user.go

@@ -1,4 +1,4 @@
-package mdb1
+package db2
 
 import (
 	"github.com/go-xorm/builder"

models/mdefault/base.go renamed to examples/models/mydefault/base.go

@@ -1,17 +1,17 @@
-package mdefault
+package mydefault
 
 import (
 	_ "github.com/go-sql-driver/mysql" //remember: import xxx driver to init
-	"github.com/hhxsv5/go-db-proxy-api/models"
-	"github.com/hhxsv5/go-db-proxy-api/core"
 	"github.com/go-xorm/xorm"
+	"github.com/hhxsv5/go-db-proxy-api/db/models"
+	mydb "github.com/hhxsv5/go-db-proxy-api/db"
 )
 
 //default connection in file db.toml
 const conn = "default"
 
 var (
-	db  *core.DB
+	db  *mydb.DB
 	orm *xorm.Engine
 )