From d9409704a00d8123d16b5ea3ec721c68af340fb5 Mon Sep 17 00:00:00 2001 From: jaron Date: Tue, 19 Nov 2024 14:32:52 +0800 Subject: [PATCH] feat(jzero): release v0.27.2 chore(template): update .template go-zero/model chore(deps): bump cross-spawn (#113) Bumps the npm_and_yarn group with 1 update in the /docs directory: [cross-spawn](https://github.com/moxystudio/node-cross-spawn). Updates `cross-spawn` from 7.0.3 to 7.0.6 - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .template/go-zero/model/import-no-cache.tpl | 1 + .template/go-zero/model/types.tpl | 4 ++-- docs/pnpm-lock.yaml | 8 ++++---- main.go | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.template/go-zero/model/import-no-cache.tpl b/.template/go-zero/model/import-no-cache.tpl index a151950c..69fb83c7 100644 --- a/.template/go-zero/model/import-no-cache.tpl +++ b/.template/go-zero/model/import-no-cache.tpl @@ -5,6 +5,7 @@ import ( {{if .time}}"time"{{end}} "github.com/zeromicro/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" "github.com/huandu/go-sqlbuilder" diff --git a/.template/go-zero/model/types.tpl b/.template/go-zero/model/types.tpl index d7f478b0..aae3dedc 100644 --- a/.template/go-zero/model/types.tpl +++ b/.template/go-zero/model/types.tpl @@ -12,8 +12,8 @@ type ( } default{{.upperStartCamelObject}}Model struct { - {{if .withCache}}cachedConn sqlc.CachedConn - conn sqlx.SqlConn{{else}}conn sqlx.SqlConn{{end}} + cachedConn sqlc.CachedConn + conn sqlx.SqlConn table string } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 0a4e3763..2b144120 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -914,8 +914,8 @@ packages: resolution: {integrity: sha512-ehJ0Zw5RSV2G4+/azUb7vEZWRSA/K9cW7HDock1Y9ViDexkgSJUZJRcObdw/YAWeXKjreEQV9l/igNSsJ1yw5A==} engines: {node: '>=18'} - cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} css-select@5.1.0: @@ -2654,7 +2654,7 @@ snapshots: create-codepen@2.0.0: {} - cross-spawn@7.0.3: + cross-spawn@7.0.6: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 @@ -2747,7 +2747,7 @@ snapshots: execa@9.2.0: dependencies: '@sindresorhus/merge-streams': 4.0.0 - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 figures: 6.1.0 get-stream: 9.0.1 human-signals: 7.0.0 diff --git a/main.go b/main.go index 2ea3c289..93d428b4 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ var ( // ldflags var ( - version = "0.27.1" + version = "0.27.2" commit string date string )