Upgrade components.

8treenet · May 8, 2021 · 81a73d6 · 81a73d6
1 parent 16fa742
commit 81a73d6
Show file tree

Hide file tree

Showing 52 changed files with 476 additions and 443 deletions.
diff --git a/example/base/adapter/repository/default.go b/example/base/adapter/repository/default.go
@@ -3,7 +3,7 @@ package repository
 
 import (
 	"github.com/8treenet/freedom"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 func init() {
@@ -38,8 +38,6 @@ func (repo *Default) db() *gorm.DB {
 	if err := repo.FetchDB(&db); err != nil {
 		panic(err)
 	}
-	db = db.New()
-	db.SetLogger(repo.Worker().Logger())
 	return db
 }
 

diff --git a/example/base/server/main.go b/example/base/server/main.go
@@ -12,8 +12,8 @@ import (
 	"github.com/8treenet/freedom/infra/requests"
 	"github.com/8treenet/freedom/middleware"
 	"github.com/go-redis/redis"
-	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
 )
 
 func main() {
@@ -65,14 +65,18 @@ func installMiddleware(app freedom.Application) {
 func installDatabase(app freedom.Application) {
 	app.InstallDB(func() interface{} {
 		conf := conf.Get().DB
-		db, e := gorm.Open("mysql", conf.Addr)
+		db, e := gorm.Open(mysql.Open(conf.Addr), &gorm.Config{})
 		if e != nil {
 			freedom.Logger().Fatal(e.Error())
 		}
 
-		db.DB().SetMaxIdleConns(conf.MaxIdleConns)
-		db.DB().SetMaxOpenConns(conf.MaxOpenConns)
-		db.DB().SetConnMaxLifetime(time.Duration(conf.ConnMaxLifeTime) * time.Second)
+		sqlDB, err := db.DB()
+		if err != nil {
+			freedom.Logger().Fatal(e.Error())
+		}
+		sqlDB.SetMaxIdleConns(conf.MaxIdleConns)
+		sqlDB.SetMaxOpenConns(conf.MaxOpenConns)
+		sqlDB.SetConnMaxLifetime(time.Duration(conf.ConnMaxLifeTime) * time.Second)
 		return db
 	})
 }

diff --git a/example/fshop/adapter/repository/admin.go b/example/fshop/adapter/repository/admin.go
@@ -3,7 +3,7 @@ package repository
 import (
 	"github.com/8treenet/freedom/example/fshop/domain/dependency"
 	"github.com/8treenet/freedom/example/fshop/domain/entity"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 
 	"github.com/8treenet/freedom"
 )
@@ -29,7 +29,7 @@ type Admin struct {
 func (repo *Admin) Get(id int) (adminEntity *entity.Admin, e error) {
 	adminEntity = &entity.Admin{}
 	adminEntity.ID = id
-	e = findUser(repo, adminEntity)
+	e = findAdmin(repo, &adminEntity.Admin)
 	if e != nil {
 		return
 	}
@@ -44,7 +44,5 @@ func (repo *Admin) db() *gorm.DB {
 	if err := repo.FetchDB(&db); err != nil {
 		panic(err)
 	}
-	db = db.New()
-	db.SetLogger(repo.Worker().Logger())
 	return db
 }
diff --git a/example/fshop/adapter/repository/cart.go b/example/fshop/adapter/repository/cart.go
@@ -6,7 +6,7 @@ import (
 	"github.com/8treenet/freedom/example/fshop/domain/dependency"
 	"github.com/8treenet/freedom/example/fshop/domain/entity"
 	"github.com/8treenet/freedom/example/fshop/domain/po"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 
 	"github.com/8treenet/freedom"
 )
@@ -30,11 +30,14 @@ type Cart struct {
 
 // FindAll 获取用户购物车实体
 func (repo *Cart) FindAll(userID int) (entitys []*entity.Cart, e error) {
-	e = findCartList(repo, po.Cart{UserID: userID}, &entitys)
+	list, e := findCartList(repo, po.Cart{UserID: userID})
 	if e != nil {
 		return
 	}
 
+	for _, obj := range list {
+		entitys = append(entitys, &entity.Cart{Cart: obj})
+	}
 	//注入基础Entity
 	repo.InjectBaseEntitys(entitys)
 	return
@@ -43,7 +46,7 @@ func (repo *Cart) FindAll(userID int) (entitys []*entity.Cart, e error) {
 // FindByGoodsID 获取用户某商品的购物车
 func (repo *Cart) FindByGoodsID(userID, goodsID int) (cartEntity *entity.Cart, e error) {
 	cartEntity = &entity.Cart{Cart: po.Cart{UserID: userID, GoodsID: goodsID}}
-	e = findCart(repo, cartEntity)
+	e = findCart(repo, &cartEntity.Cart)
 	if e != nil {
 		return
 	}
@@ -81,7 +84,5 @@ func (repo *Cart) db() *gorm.DB {
 	if err := repo.FetchDB(&db); err != nil {
 		panic(err)
 	}
-	db = db.New()
-	db.SetLogger(repo.Worker().Logger())
 	return db
 }
diff --git a/example/fshop/adapter/repository/delivery.go b/example/fshop/adapter/repository/delivery.go
@@ -7,7 +7,7 @@ import (
 	"github.com/8treenet/freedom/example/fshop/domain/dependency"
 	"github.com/8treenet/freedom/example/fshop/domain/entity"
 	"github.com/8treenet/freedom/example/fshop/domain/po"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 func init() {
@@ -51,7 +51,5 @@ func (repo *Delivery) db() *gorm.DB {
 	if err := repo.FetchDB(&db); err != nil {
 		panic(err)
 	}
-	db = db.New()
-	db.SetLogger(repo.Worker().Logger())
 	return db
 }