From 92b96ce0b5dac8e8d78f3864e0039787344d18d3 Mon Sep 17 00:00:00 2001 From: jaron Date: Wed, 18 Dec 2024 09:29:32 +0800 Subject: [PATCH] fix(jzero): fix https://github.com/jzero-io/jzero/issues/149 --- .template/frame/api/app/.jzero.yaml.tpl | 2 +- cmd/serverless.go | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.template/frame/api/app/.jzero.yaml.tpl b/.template/frame/api/app/.jzero.yaml.tpl index ff063f1f..bcaab0ac 100644 --- a/.template/frame/api/app/.jzero.yaml.tpl +++ b/.template/frame/api/app/.jzero.yaml.tpl @@ -5,7 +5,7 @@ gen: {{ if or (has "serverless" .Features) (has "serverless_core" .Features) }}before: - gorename {{ .Module }}/server {{ .Module }}/internal{{ end }} after: - {{ if has "serverless" .Features }}- gorename {{ .Module }}/internal {{ .Module }}/server{{ end }} + {{ if or (has "serverless" .Features) (has "serverless_core" .Features) }}- gorename {{ .Module }}/internal {{ .Module }}/server{{ end }} - jzero gen swagger split-api-types-dir: true \ No newline at end of file diff --git a/cmd/serverless.go b/cmd/serverless.go index 408d1208..d9cb20cd 100644 --- a/cmd/serverless.go +++ b/cmd/serverless.go @@ -5,9 +5,6 @@ Copyright © 2024 jaronnie package cmd import ( - "os" - "path/filepath" - "github.com/spf13/cobra" "github.com/jzero-io/jzero/config" @@ -59,14 +56,12 @@ var serverlessDeleteCmd = &cobra.Command{ } func init() { - wd, _ := os.Getwd() - rootCmd.AddCommand(serverlessCmd) serverlessCmd.AddCommand(serverlessBuildCmd) serverlessCmd.AddCommand(serverlessDeleteCmd) serverlessCmd.AddCommand(serverlessNewCmd) - serverlessCmd.PersistentFlags().StringP("home", "", filepath.Join(wd, ".template"), "set templates path") + serverlessCmd.PersistentFlags().StringP("home", "", "", "set templates path") serverlessNewCmd.Flags().BoolP("core", "", false, "is core serverless") serverlessNewCmd.Flags().StringP("module", "m", "", "set go module") serverlessNewCmd.Flags().StringP("remote", "r", "https://github.com/jzero-io/templates", "remote templates repo")