chore(template): update .template go-zero/model

jzero-io · Nov 18, 2024 · c07b527 · c07b527
1 parent 0f3a0ad
commit c07b527
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.template/go-zero/model/model-new.tpl b/.template/go-zero/model/model-new.tpl
@@ -1,9 +1,15 @@
 func new{{.upperStartCamelObject}}Model(conn sqlx.SqlConn, op ...opts.Opt[modelx.ModelOpts]) *default{{.upperStartCamelObject}}Model {
-	{{if .withCache}}o := opts.DefaultApply(op...){{end}}
+	o := opts.DefaultApply(op...)
+    var cachedConn sqlc.CachedConn
+    if len(o.CacheConf) > 0 {
+    	cachedConn = sqlc.NewConn(conn, o.CacheConf, o.CacheOpts...)
+    }
+    if o.CachedConn != nil {
+    	cachedConn = *o.CachedConn
+    }
 	return &default{{.upperStartCamelObject}}Model{
-		{{if .withCache}}cachedConn: sqlc.NewConn(conn, o.CacheConf, o.CacheOpts...),{{end}}
+		cachedConn: cachedConn,
 		conn: conn,
 		table:      {{.table}},
 	}
-}
-
+}