chore: release v0.5.1 (#554)

.github/workflows/tests.yml

@@ -31,4 +31,34 @@ jobs:
         run: go test -race -covermode=atomic -coverprofile=coverage.txt ./...
 
       - name: Codecov
-        run: bash <(curl -s https://codecov.io/bash)
+        run: bash <(curl -s https://codecov.io/bash)
+
+  lint-and-ut-windows:
+    strategy:
+      matrix:
+        version: [ 1.18, 1.19 ]
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.version }}
+
+      - uses: actions/cache@v3
+        with:
+          path: $HOME/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      - name: Lint
+        run: |
+          go vet -stdmethods=false $(go list ./...)
+          go install mvdan.cc/[email protected]
+          test -z "$(gofumpt -l -extra .)"
+      - name: Unit Test
+        run: go test -race -covermode=atomic -coverprofile=coverage.txt ./...
+#
+#      - name: Codecov
+#        run: bash <(curl -s https://codecov.io/bash)

cmd/hz/app/app.go

@@ -141,6 +141,7 @@ func Init() *cli.App {
 	outDirFlag := cli.StringFlag{Name: "out_dir", Usage: "Specify the project path.", Destination: &globalArgs.OutDir}
 	handlerDirFlag := cli.StringFlag{Name: "handler_dir", Usage: "Specify the handler path.", Destination: &globalArgs.HandlerDir}
 	modelDirFlag := cli.StringFlag{Name: "model_dir", Usage: "Specify the model path.", Destination: &globalArgs.ModelDir}
+	baseDomainFlag := cli.StringFlag{Name: "base_domain", Usage: "Specify the request domain.", Destination: &globalArgs.BaseDomain}
 	clientDirFlag := cli.StringFlag{Name: "client_dir", Usage: "Specify the client path. If not specified, IDL generated path is used for 'client' command; no client code is generated for 'new' command", Destination: &globalArgs.ClientDir}
 
 	optPkgFlag := cli.StringSliceFlag{Name: "option_package", Aliases: []string{"P"}, Usage: "Specify the package path. ({include_path}={import_path})"}
@@ -262,6 +263,7 @@ func Init() *cli.App {
 			Flags: []cli.Flag{
 				&idlFlag,
 				&moduleFlag,
+				&baseDomainFlag,
 				&modelDirFlag,
 				&clientDirFlag,
 

cmd/hz/config/argument.go

@@ -37,6 +37,7 @@ type Argument struct {
 	ModelDir   string // model path
 	RouterDir  string // router path
 	ClientDir  string // client path
+	BaseDomain string // request domain
 
 	IdlType   string   // idl type
 	IdlPaths  []string // master idl path

cmd/hz/generator/client.go

@@ -35,6 +35,7 @@ type ClientMethod struct {
 
 type ClientFile struct {
 	FilePath      string
+	PackageName   string
 	ServiceName   string
 	BaseDomain    string
 	Imports       map[string]*model.Model
@@ -49,17 +50,22 @@ func (pkgGen *HttpPackageGenerator) genClient(pkg *HttpPackage, clientDir string
 		if err != nil {
 			return err
 		}
-		if !isExist {
-			err := pkgGen.TemplateGenerator.Generate(nil, hertzClientTplName, hertzClientPath, false)
-			if err != nil {
-				return err
-			}
+		baseDomain := s.BaseDomain
+		if len(pkgGen.BaseDomain) != 0 {
+			baseDomain = pkgGen.BaseDomain
 		}
 		client := ClientFile{
 			FilePath:      filepath.Join(cliDir, util.ToSnakeCase(s.Name)+".go"),
+			PackageName:   util.ToSnakeCase(s.Name),
 			ServiceName:   util.ToCamelCase(s.Name),
 			ClientMethods: s.ClientMethods,
-			BaseDomain:    s.BaseDomain,
+			BaseDomain:    baseDomain,
+		}
+		if !isExist {
+			err := pkgGen.TemplateGenerator.Generate(client, hertzClientTplName, hertzClientPath, false)
+			if err != nil {
+				return err
+			}
 		}
 		client.Imports = make(map[string]*model.Model, len(client.ClientMethods))
 		for _, m := range client.ClientMethods {
@@ -72,7 +78,7 @@ func (pkgGen *HttpPackageGenerator) genClient(pkg *HttpPackage, clientDir string
 				client.Imports[mm.PackageName] = mm
 			}
 		}
-		err = pkgGen.TemplateGenerator.Generate(client, serviceClientName, client.FilePath, false)
+		err = pkgGen.TemplateGenerator.Generate(client, idlClientName, client.FilePath, false)
 		if err != nil {
 			return err
 		}