Skip to content

Commit c2b8107

Browse files
author
XieBiao
committed
upgrade models
1 parent bd6c31d commit c2b8107

File tree

8 files changed

+141
-19
lines changed

8 files changed

+141
-19
lines changed

examples/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/hhxsv5/go-db-proxy-api/models"
5+
"github.com/hhxsv5/go-db-proxy-api/models/mdefault"
66
)
77

88
func main() {
9-
user := models.CreateUser("18780207350")
9+
user := mdefault.CreateUser("18780207350")
1010
fmt.Println(user)
1111
fmt.Printf("%p", user)
1212
}

models/base.go

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
package models
22

33
import (
4-
_ "github.com/go-sql-driver/mysql" //remember: import xxx driver to init
5-
"github.com/go-xorm/xorm"
64
xcore "github.com/go-xorm/core"
75
"github.com/hhxsv5/go-db-proxy-api/core"
86
)
97

10-
const connection = "default" //default connection in file db.toml
11-
12-
var (
13-
Db *core.DB
14-
Orm *xorm.Engine
15-
)
16-
17-
func init() {
18-
Db = core.NewDB(connection)
19-
Orm = Db.Engine
8+
func NewDB(conn string) *core.DB {
9+
db := core.NewDB(conn)
2010

2111
//...some settings for xorm
22-
Orm.SetMapper(xcore.GonicMapper{})
12+
db.Engine.SetMapper(xcore.GonicMapper{})
13+
return db
2314
}

models/mdb1/base.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package mdb1
2+
3+
import (
4+
_ "github.com/go-sql-driver/mysql" //remember: import xxx driver to init
5+
"github.com/hhxsv5/go-db-proxy-api/models"
6+
"github.com/hhxsv5/go-db-proxy-api/core"
7+
"github.com/go-xorm/xorm"
8+
)
9+
10+
//db1 connection in file db.toml
11+
const conn = "db1"
12+
13+
var (
14+
db *core.DB
15+
orm *xorm.Engine
16+
)
17+
18+
func init() {
19+
db = models.NewDB(conn)
20+
orm = db.Engine
21+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package models
1+
package mdb1
22

33
import (
44
"github.com/go-xorm/builder"
@@ -14,7 +14,7 @@ type User struct {
1414
func CreateUser(cellphone string) *User {
1515
user := new(User)
1616
user.Cellphone = cellphone
17-
_, err := Orm.Insert(user)
17+
_, err := orm.Insert(user)
1818
if err != nil {
1919
return nil
2020
}
@@ -23,12 +23,12 @@ func CreateUser(cellphone string) *User {
2323

2424
func GetUserById(id uint32) *User {
2525
var user *User
26-
Orm.Where("id=?", id).Limit(1, 0).Get(user)
26+
orm.Where("id=?", id).Limit(1, 0).Get(user)
2727
return user
2828
}
2929

3030
func GetUsersByIds(ids []uint32) *[]User {
3131
var users *[]User
32-
Orm.Where(builder.In("id", ids)).Find(users)
32+
orm.Where(builder.In("id", ids)).Find(users)
3333
return users
3434
}

models/mdb2/base.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package mdb2
2+
3+
import (
4+
_ "github.com/go-sql-driver/mysql" //remember: import xxx driver to init
5+
"github.com/hhxsv5/go-db-proxy-api/models"
6+
"github.com/hhxsv5/go-db-proxy-api/core"
7+
"github.com/go-xorm/xorm"
8+
)
9+
10+
//db2 connection in file db.toml
11+
const conn = "db2"
12+
13+
var (
14+
db *core.DB
15+
orm *xorm.Engine
16+
)
17+
18+
func init() {
19+
db = models.NewDB(conn)
20+
orm = db.Engine
21+
}

models/mdb2/user.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package mdb2
2+
3+
import (
4+
"github.com/go-xorm/builder"
5+
)
6+
7+
type User struct {
8+
Id uint32
9+
Cellphone string
10+
InsertTime uint32 `xorm:"created"`
11+
ModifyTime uint32 `xorm:"updated"`
12+
}
13+
14+
func CreateUser(cellphone string) *User {
15+
user := new(User)
16+
user.Cellphone = cellphone
17+
_, err := orm.Insert(user)
18+
if err != nil {
19+
return nil
20+
}
21+
return user
22+
}
23+
24+
func GetUserById(id uint32) *User {
25+
var user *User
26+
orm.Where("id=?", id).Limit(1, 0).Get(user)
27+
return user
28+
}
29+
30+
func GetUsersByIds(ids []uint32) *[]User {
31+
var users *[]User
32+
orm.Where(builder.In("id", ids)).Find(users)
33+
return users
34+
}

models/mdefault/base.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package mdefault
2+
3+
import (
4+
_ "github.com/go-sql-driver/mysql" //remember: import xxx driver to init
5+
"github.com/hhxsv5/go-db-proxy-api/models"
6+
"github.com/hhxsv5/go-db-proxy-api/core"
7+
"github.com/go-xorm/xorm"
8+
)
9+
10+
//default connection in file db.toml
11+
const conn = "default"
12+
13+
var (
14+
db *core.DB
15+
orm *xorm.Engine
16+
)
17+
18+
func init() {
19+
db = models.NewDB(conn)
20+
orm = db.Engine
21+
}

models/mdefault/user.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package mdefault
2+
3+
import (
4+
"github.com/go-xorm/builder"
5+
)
6+
7+
type User struct {
8+
Id uint32
9+
Cellphone string
10+
InsertTime uint32 `xorm:"created"`
11+
ModifyTime uint32 `xorm:"updated"`
12+
}
13+
14+
func CreateUser(cellphone string) *User {
15+
user := new(User)
16+
user.Cellphone = cellphone
17+
_, err := orm.Insert(user)
18+
if err != nil {
19+
return nil
20+
}
21+
return user
22+
}
23+
24+
func GetUserById(id uint32) *User {
25+
var user *User
26+
orm.Where("id=?", id).Limit(1, 0).Get(user)
27+
return user
28+
}
29+
30+
func GetUsersByIds(ids []uint32) *[]User {
31+
var users *[]User
32+
orm.Where(builder.In("id", ids)).Find(users)
33+
return users
34+
}

0 commit comments

Comments
 (0)