From ff08df08cc8fa88cb6186a75e586d8c8e726d7f3 Mon Sep 17 00:00:00 2001
From: dengpengju <dengpju@163.com>
Date: Thu, 2 Nov 2023 22:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arm/IModel.go              |  2 +-
 arm/Model.go               |  2 +-
 gen/Entity.go              | 11 +++++------
 gen/stubs/model.stub       |  2 +-
 test/model/School/Model.go |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/arm/IModel.go b/arm/IModel.go
index c6d1a84..ea3dbde 100644
--- a/arm/IModel.go
+++ b/arm/IModel.go
@@ -12,7 +12,7 @@ type IModel interface {
 	TableName() *TableName
 	Apply(model *Model)
 	Exist() bool
-	IModel(properties ...him.IProperty) IModel
+	NewModel(properties ...him.IProperty) IModel
 	Begin(opts ...*sql.TxOptions) *him.TX
 	TX(tx *gorm.DB) *Model
 }
diff --git a/arm/Model.go b/arm/Model.go
index 6287f61..9a2c67d 100644
--- a/arm/Model.go
+++ b/arm/Model.go
@@ -110,7 +110,7 @@ func (this *Model) GormDB() *gorm.DB {
 }
 
 func (this *Model) Builder(dao IDao, fn func()) IDao {
-	model := this.model.IModel()
+	model := this.model.NewModel()
 	if this.begin {
 		model.TX(this.db.GormDB())
 	}
diff --git a/gen/Entity.go b/gen/Entity.go
index e188178..5622b3d 100644
--- a/gen/Entity.go
+++ b/gen/Entity.go
@@ -115,11 +115,10 @@ func (this *Entity) gen() {
 		rowProperty := this.replaceRowProperty(p.upperProperty, blankFirst, p.propertyType, blankSecond, blankThree, p.tableField, p.tableFieldComment)
 		if p.upperProperty == UpperCreateTime {
 			rowTimeNow = "time.Now()"
-			createTime = rowProperty
-		}
-		if p.upperProperty == UpperUpdateTime {
+			createTime = p.upperProperty
+		} else if p.upperProperty == UpperUpdateTime {
 			rowTimeNow = "time.Now()"
-			updateTime = rowProperty
+			updateTime = p.upperProperty
 		}
 		this.mergeProperty(rowProperty)
 	}
@@ -233,7 +232,7 @@ func (this *Entity) replaceUpperPrimaryKey(upperPrimaryKey string) {
 
 func (this *Entity) replaceTimeNow(timeNow string) {
 	if timeNow != "" {
-		timeNow = "\n" + LeftStrPad(fmt.Sprintf("%s", timeNow), 4, " ")
+		timeNow = "\n" + LeftStrPad(fmt.Sprintf("tn := %s", timeNow), 4, " ")
 	}
 	this.stubContext = strings.Replace(this.stubContext, "%TIME_NOW%", timeNow, 1)
 }
@@ -247,7 +246,7 @@ func (this *Entity) replaceCreateUpdateTime(createTime, updateTime string) {
 		if row != "" {
 			row += ", "
 		}
-		row = fmt.Sprintf("%s: tn", updateTime)
+		row += fmt.Sprintf("%s: tn", updateTime)
 	}
 	this.stubContext = strings.Replace(this.stubContext, "%CREATE_UPDATE_TIME%", row, 1)
 }
diff --git a/gen/stubs/model.stub b/gen/stubs/model.stub
index 69a20c0..cbebdb5 100644
--- a/gen/stubs/model.stub
+++ b/gen/stubs/model.stub
@@ -31,7 +31,7 @@ func (this *Model) New(properties ...him.IProperty) *Model {
     return this
 }
 
-func (this *Model) IModel(properties ...him.IProperty) arm.IModel {
+func (this *Model) NewModel(properties ...him.IProperty) arm.IModel {
     return New(properties...)
 }
 
diff --git a/test/model/School/Model.go b/test/model/School/Model.go
index a5a6399..ea92a8b 100644
--- a/test/model/School/Model.go
+++ b/test/model/School/Model.go
@@ -50,7 +50,7 @@ func (this *Model) New(properties ...him.IProperty) *Model {
 	return this
 }
 
-func (this *Model) IModel(properties ...him.IProperty) arm.IModel {
+func (this *Model) NewModel(properties ...him.IProperty) arm.IModel {
 	return New(properties...)
 }