xorm地址:|
1. 修改interval/dao/dao.go
1.1 引入的包model忽略,demo与wagent是包名决定的
1.2 注释或删除原来的"github.com/go-kratos/kratos/pkg/database/sql"包
1.3 导入xorm.io/xorm
1.4 将db字段类型由*sql.DB改为*xorm.Engine
whz:wagent apple$ diff internal/dao/dao.go ../demo/internal/dao/dao.go
6a7
> "demo/internal/model"
10c11
< //"github.com/go-kratos/kratos/pkg/database/sql"
---
> "github.com/go-kratos/kratos/pkg/database/sql"
13,14d13
< "wagent/internal/model"
< "xorm.io/xorm"
32c31
< db *xorm.Engine
---
> db *sql.DB
40c39
< func New(r *redis.Redis, mc *memcache.Memcache, db *xorm.Engine) (d Dao, cf func(), err error) {
---
> func New(r *redis.Redis, mc *memcache.Memcache, db *sql.DB) (d Dao, cf func(), err error) {
44c43
< func newDao(r *redis.Redis, mc *memcache.Memcache, db *xorm.Engine) (d *dao, cf func(), err error) {
---
> func newDao(r *redis.Redis, mc *memcache.Memcache, db *sql.DB) (d *dao, cf func(), err error) {
2. 修改db.go
2.1 fmt只是为打印配置文件信息,确认无误,无实质作用,可忽略
2.2 model字段可忽略,与包名一致
2.3 注释或删除原来的"github.com/go-kratos/kratos/pkg/database/sql"包
2.4 导入_ "github.com/go-sql-driver/mysql"
2.5 导入"xorm.io/xorm"
2.6 导入"xorm.io/xorm/names"
2.7 新建dbCfg结构体,用于获取mysql配置信息,结构体名自定义
2.8 修改sql.Config为新建的结构体dbCfg类型
2.9 其他详见注释
whz:wagent apple$ diff internal/dao/db.go ../demo/internal/dao/db.go
5c5,6
< "fmt"
---
>
> "demo/internal/model"
7,11c8
< _ "github.com/go-sql-driver/mysql"
< //"github.com/go-kratos/kratos/pkg/database/sql"
< "wagent/internal/model"
< "xorm.io/xorm"
< "xorm.io/xorm/names"
---
> "github.com/go-kratos/kratos/pkg/database/sql"
14,19c11
< type dbCfg struct{
< DriverName string `toml:"driverName"`
< DataSourceName string `toml:"dataSourceName"`
< }
<
< func NewDB() (db *xorm.Engine, cf func(), err error) {
---
> func NewDB() (db *sql.DB, cf func(), err error) {
21c13
< cfg dbCfg
---
> cfg sql.Config
30,48c22
<
< fmt.Printf("%s %s", cfg.DriverName, cfg.DataSourceName)
<
< // xorm engine初始化
< db, err = xorm.NewEngine(cfg.DriverName, cfg.DataSourceName)
< if err != nil{
< panic(err)
< }
< // 名称映射规则,对于特定词支持更好,比如ID会翻译成id而不是i_d
< db.SetMapper(names.GonicMapper{})
< // 打印sql语句
< db.ShowSQL(true)
< // 可不用此句,直接使用Sync2即可创建并同步
< //err = db.CreateTables(model.User{},model.Article{})
< // 同步到数据库,推荐使用Sync2
< err = db.Sync2(new(model.User), new(model.Article))
< if err != nil{
< panic(err)
< }
---
> db = sql.NewMySQL(&cfg)
3. 修改db.toml
3.1 修改为未注释内容
3.2 注:dataSourceName注释内容更详细,可自行决定使用
#[Client]
# addr = "127.0.0.1:3306"
# dsn = "{user}:{password}@tcp(127.0.0.1:3306)/{database}?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"
# readDSN = ["{user}:{password}@tcp(127.0.0.2:3306)/{database}?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8","{user}:{password}@tcp(127.0.0.3:3306)/{database}?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8,utf8mb4"]
# active = 20
# idle = 10
# idleTimeout ="4h"
# queryTimeout = "200ms"
# execTimeout = "300ms"
# tranTimeout = "400ms"
[Client]
driverName = "mysql"
dataSourceName = "root:123456@tcp(192.168.51.242:3306)/watch_everything?
charset=utf8"
// dataSourceName = "root:123456@tcp(192.168.51.242:3306)/watch_everything?timeout=5s&readTimeout=5s&writeTimeout=5s&parseTime=true&loc=Local&charset=utf8"