diff --git a/app/app.go b/app/app.go index 13bd54d..ee94ba7 100644 --- a/app/app.go +++ b/app/app.go @@ -24,13 +24,13 @@ import ( "strings" "github.com/urfave/cli/v2" - "gr_hz/config" - "gr_hz/generator" - "gr_hz/meta" - "gr_hz/protobuf" - "gr_hz/thrift" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/config" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/protobuf" + "std.gaore.com/Gaore-Go/gr_hz/thrift" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) // global args. MUST fork it when use diff --git a/config/argument.go b/config/argument.go index 97cebd5..553811d 100644 --- a/config/argument.go +++ b/config/argument.go @@ -23,9 +23,9 @@ import ( "strings" "github.com/urfave/cli/v2" - "gr_hz/meta" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) type Argument struct { diff --git a/config/cmd.go b/config/cmd.go index 292ff1d..87287dc 100644 --- a/config/cmd.go +++ b/config/cmd.go @@ -24,9 +24,9 @@ import ( "strings" "syscall" - "gr_hz/meta" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) func lookupTool(idlType string) (string, error) { diff --git a/generator/client.go b/generator/client.go index 8c137f6..5835850 100644 --- a/generator/client.go +++ b/generator/client.go @@ -20,8 +20,8 @@ import ( "path/filepath" "strings" - "gr_hz/generator/model" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/util" ) type ClientMethod struct { diff --git a/generator/custom_files.go b/generator/custom_files.go index 186930a..bc9188e 100644 --- a/generator/custom_files.go +++ b/generator/custom_files.go @@ -24,8 +24,8 @@ import ( "strings" "text/template" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) type FilePathRenderInfo struct { diff --git a/generator/file.go b/generator/file.go index 1008ebf..9c567ce 100644 --- a/generator/file.go +++ b/generator/file.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util" ) type File struct { diff --git a/generator/handler.go b/generator/handler.go index 17283f2..80e8502 100644 --- a/generator/handler.go +++ b/generator/handler.go @@ -23,9 +23,9 @@ import ( "path/filepath" "strings" - "gr_hz/generator/model" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) type HttpMethod struct { diff --git a/generator/layout.go b/generator/layout.go index 3425b04..ed9ef39 100644 --- a/generator/layout.go +++ b/generator/layout.go @@ -26,8 +26,8 @@ import ( "strings" "gopkg.in/yaml.v2" - "gr_hz/meta" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" ) // Layout contains the basic information of idl diff --git a/generator/model.go b/generator/model.go index 3549e46..8dd1f2f 100644 --- a/generator/model.go +++ b/generator/model.go @@ -22,10 +22,10 @@ import ( "strings" "text/template" - "gr_hz/generator/model" - "gr_hz/generator/model/golang" - "gr_hz/meta" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/generator/model/golang" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" ) //---------------------------------Backend---------------------------------- diff --git a/generator/model_test.go b/generator/model_test.go index 0806492..87438f8 100644 --- a/generator/model_test.go +++ b/generator/model_test.go @@ -20,8 +20,8 @@ import ( "testing" "text/template" - "gr_hz/generator/model" - "gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/meta" ) type StringValue struct { diff --git a/generator/package.go b/generator/package.go index 43d10bd..27044c2 100644 --- a/generator/package.go +++ b/generator/package.go @@ -25,9 +25,9 @@ import ( "text/template" "gopkg.in/yaml.v2" - "gr_hz/generator/model" - "gr_hz/meta" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" ) type HttpPackage struct { diff --git a/generator/router.go b/generator/router.go index 1a4c335..7bb977c 100644 --- a/generator/router.go +++ b/generator/router.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util" ) type Router struct { diff --git a/generator/template.go b/generator/template.go index 609a6fe..31d88a1 100644 --- a/generator/template.go +++ b/generator/template.go @@ -25,9 +25,9 @@ import ( "strings" "text/template" - "gr_hz/meta" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) var DefaultDelimiters = [2]string{"{{", "}}"} diff --git a/generator/template_funcs.go b/generator/template_funcs.go index d736e3e..7756119 100644 --- a/generator/template_funcs.go +++ b/generator/template_funcs.go @@ -21,7 +21,7 @@ import ( "text/template" "github.com/Masterminds/sprig/v3" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util" ) var funcMap = func() template.FuncMap { diff --git a/go.mod b/go.mod index 4b94720..f251d29 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gr_hz +module std.gaore.com/Gaore-Go/gr_hz go 1.16 diff --git a/main.go b/main.go index 78d9208..bf97d2f 100644 --- a/main.go +++ b/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "gr_hz/app" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/app" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) func main() { diff --git a/protobuf/ast.go b/protobuf/ast.go index 40477b3..504a013 100644 --- a/protobuf/ast.go +++ b/protobuf/ast.go @@ -28,12 +28,12 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" "google.golang.org/protobuf/types/descriptorpb" - "gr_hz/generator" - "gr_hz/generator/model" - "gr_hz/meta" - "gr_hz/protobuf/api" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/protobuf/api" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) var BaseProto = descriptorpb.FileDescriptorProto{} diff --git a/protobuf/plugin.go b/protobuf/plugin.go index de2c256..851479e 100644 --- a/protobuf/plugin.go +++ b/protobuf/plugin.go @@ -60,12 +60,12 @@ import ( "google.golang.org/protobuf/runtime/protoimpl" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" - "gr_hz/config" - "gr_hz/generator" - "gr_hz/generator/model" - "gr_hz/meta" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/config" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) type Plugin struct { diff --git a/protobuf/plugin_test.go b/protobuf/plugin_test.go index 761cbdb..9784ab1 100644 --- a/protobuf/plugin_test.go +++ b/protobuf/plugin_test.go @@ -23,7 +23,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/pluginpb" - "gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/meta" ) func TestPlugin_Handle(t *testing.T) { diff --git a/protobuf/resolver.go b/protobuf/resolver.go index 662e285..bf2f112 100644 --- a/protobuf/resolver.go +++ b/protobuf/resolver.go @@ -22,8 +22,8 @@ import ( "github.com/jhump/protoreflect/desc" "google.golang.org/protobuf/types/descriptorpb" - "gr_hz/generator/model" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/util" ) type Symbol struct { diff --git a/protobuf/tags.go b/protobuf/tags.go index 0803220..10b38b8 100644 --- a/protobuf/tags.go +++ b/protobuf/tags.go @@ -26,11 +26,11 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" "google.golang.org/protobuf/types/descriptorpb" - "gr_hz/config" - "gr_hz/generator" - "gr_hz/generator/model" - "gr_hz/protobuf/api" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/config" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/protobuf/api" + "std.gaore.com/Gaore-Go/gr_hz/util" ) var ( diff --git a/test_hz_unix.sh b/test_hz_unix.sh index 302cd37..bfec31e 100644 --- a/test_hz_unix.sh +++ b/test_hz_unix.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash # const value define -moduleName="gr_hz/test" +moduleName="std.gaore.com/Gaore-Go/gr_hz/test" curDir=`pwd` thriftIDL=$curDir"/testdata/thrift/psm.thrift" protobuf2IDL=$curDir"/testdata/protobuf2/psm/psm.proto" diff --git a/test_hz_windows.sh b/test_hz_windows.sh index 132afde..7cacb36 100644 --- a/test_hz_windows.sh +++ b/test_hz_windows.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash # const value define -moduleName="gr_hz/test" +moduleName="std.gaore.com/Gaore-Go/gr_hz/test" curDir=`pwd` thriftIDL=$curDir"/testdata/thrift/psm.thrift" protobuf2IDL=$curDir"/testdata/protobuf2/psm/psm.proto" diff --git a/testdata/protobuf2/api.proto b/testdata/protobuf2/api.proto index 8c52d3c..a7b3637 100644 --- a/testdata/protobuf2/api.proto +++ b/testdata/protobuf2/api.proto @@ -4,7 +4,7 @@ package api; import "google/protobuf/descriptor.proto"; -option go_package = "gr_hz/test/hertz_model/api"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/api"; extend google.protobuf.FieldOptions { optional string raw_body = 50101; diff --git a/testdata/protobuf2/other/other.proto b/testdata/protobuf2/other/other.proto index a24e633..2d4ccbd 100644 --- a/testdata/protobuf2/other/other.proto +++ b/testdata/protobuf2/other/other.proto @@ -4,7 +4,7 @@ package hertz.other; import "other/other_base.proto"; -option go_package = "gr_hz/test/hertz_model/other"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; message OtherType { optional string IsBaseString = 1; diff --git a/testdata/protobuf2/other/other_base.proto b/testdata/protobuf2/other/other_base.proto index 986c532..de16772 100644 --- a/testdata/protobuf2/other/other_base.proto +++ b/testdata/protobuf2/other/other_base.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package hertz.other; -option go_package = "gr_hz/test/hertz_model/other"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; message OtherBaseType { optional string IsOtherBaseTypeString = 1; diff --git a/testdata/protobuf2/psm/base.proto b/testdata/protobuf2/psm/base.proto index 1bfacbd..b747230 100644 --- a/testdata/protobuf2/psm/base.proto +++ b/testdata/protobuf2/psm/base.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package base; -option go_package = "gr_hz/test/hertz_model/psm"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; message Base { optional string IsBaseString = 1; diff --git a/testdata/protobuf2/psm/psm.proto b/testdata/protobuf2/psm/psm.proto index f62391e..40b9cad 100644 --- a/testdata/protobuf2/psm/psm.proto +++ b/testdata/protobuf2/psm/psm.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package psm; -option go_package = "gr_hz/test/hertz_model/psm"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; import "api.proto"; import "base.proto"; diff --git a/testdata/protobuf3/api.proto b/testdata/protobuf3/api.proto index 8c52d3c..a7b3637 100644 --- a/testdata/protobuf3/api.proto +++ b/testdata/protobuf3/api.proto @@ -4,7 +4,7 @@ package api; import "google/protobuf/descriptor.proto"; -option go_package = "gr_hz/test/hertz_model/api"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/api"; extend google.protobuf.FieldOptions { optional string raw_body = 50101; diff --git a/testdata/protobuf3/other/other.proto b/testdata/protobuf3/other/other.proto index a24e633..2d4ccbd 100644 --- a/testdata/protobuf3/other/other.proto +++ b/testdata/protobuf3/other/other.proto @@ -4,7 +4,7 @@ package hertz.other; import "other/other_base.proto"; -option go_package = "gr_hz/test/hertz_model/other"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; message OtherType { optional string IsBaseString = 1; diff --git a/testdata/protobuf3/other/other_base.proto b/testdata/protobuf3/other/other_base.proto index 986c532..de16772 100644 --- a/testdata/protobuf3/other/other_base.proto +++ b/testdata/protobuf3/other/other_base.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package hertz.other; -option go_package = "gr_hz/test/hertz_model/other"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; message OtherBaseType { optional string IsOtherBaseTypeString = 1; diff --git a/testdata/protobuf3/psm/base.proto b/testdata/protobuf3/psm/base.proto index 8903f85..17d3bd6 100644 --- a/testdata/protobuf3/psm/base.proto +++ b/testdata/protobuf3/psm/base.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package base; -option go_package = "gr_hz/test/hertz_model/psm"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; message Base { optional string IsBaseString = 1; diff --git a/testdata/protobuf3/psm/psm.proto b/testdata/protobuf3/psm/psm.proto index c9de529..d01d54b 100644 --- a/testdata/protobuf3/psm/psm.proto +++ b/testdata/protobuf3/psm/psm.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package psm; -option go_package = "gr_hz/test/hertz_model/psm"; +option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; import "api.proto"; import "base.proto"; diff --git a/thrift/ast.go b/thrift/ast.go index 120fc9d..e0c88ed 100644 --- a/thrift/ast.go +++ b/thrift/ast.go @@ -25,12 +25,12 @@ import ( "github.com/cloudwego/thriftgo/generator/golang/styles" "github.com/cloudwego/thriftgo/parser" "github.com/cloudwego/thriftgo/semantic" - "gr_hz/config" - "gr_hz/generator" - "gr_hz/generator/model" - "gr_hz/meta" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/config" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) /*---------------------------Import-----------------------------*/ diff --git a/thrift/plugin.go b/thrift/plugin.go index f24c284..3e8d463 100644 --- a/thrift/plugin.go +++ b/thrift/plugin.go @@ -29,12 +29,12 @@ import ( "github.com/cloudwego/thriftgo/generator/golang/styles" "github.com/cloudwego/thriftgo/parser" thriftgo_plugin "github.com/cloudwego/thriftgo/plugin" - "gr_hz/config" - "gr_hz/generator" - "gr_hz/generator/model" - "gr_hz/meta" - "gr_hz/util" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/config" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) type Plugin struct { diff --git a/thrift/plugin_test.go b/thrift/plugin_test.go index e3a8e7d..377750a 100644 --- a/thrift/plugin_test.go +++ b/thrift/plugin_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/cloudwego/thriftgo/plugin" - "gr_hz/generator" - "gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/meta" ) func TestRun(t *testing.T) { diff --git a/thrift/resolver.go b/thrift/resolver.go index 20ea29c..92a63fe 100644 --- a/thrift/resolver.go +++ b/thrift/resolver.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/cloudwego/thriftgo/parser" - "gr_hz/generator/model" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/util" ) var ( diff --git a/thrift/tag_test.go b/thrift/tag_test.go index 9c7d779..bd24b7b 100644 --- a/thrift/tag_test.go +++ b/thrift/tag_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/cloudwego/thriftgo/plugin" - "gr_hz/config" + "std.gaore.com/Gaore-Go/gr_hz/config" ) func TestInsertTag(t *testing.T) { diff --git a/thrift/tags.go b/thrift/tags.go index aaed4e0..0735f05 100644 --- a/thrift/tags.go +++ b/thrift/tags.go @@ -23,10 +23,10 @@ import ( "strings" "github.com/cloudwego/thriftgo/parser" - "gr_hz/config" - "gr_hz/generator" - "gr_hz/generator/model" - "gr_hz/util" + "std.gaore.com/Gaore-Go/gr_hz/config" + "std.gaore.com/Gaore-Go/gr_hz/generator" + "std.gaore.com/Gaore-Go/gr_hz/generator/model" + "std.gaore.com/Gaore-Go/gr_hz/util" ) const ( diff --git a/util/data.go b/util/data.go index a7f8a40..a1e52dc 100644 --- a/util/data.go +++ b/util/data.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) func CopyStringSlice(from, to *[]string) { diff --git a/util/env.go b/util/env.go index 2a62f81..f561730 100644 --- a/util/env.go +++ b/util/env.go @@ -27,7 +27,7 @@ import ( "regexp" "strings" - "gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/meta" ) func GetGOPATH() (gopath string, err error) { diff --git a/util/tool_install.go b/util/tool_install.go index 6d96aa1..ad744e3 100644 --- a/util/tool_install.go +++ b/util/tool_install.go @@ -25,8 +25,8 @@ import ( "time" gv "github.com/hashicorp/go-version" - "gr_hz/meta" - "gr_hz/util/logs" + "std.gaore.com/Gaore-Go/gr_hz/meta" + "std.gaore.com/Gaore-Go/gr_hz/util/logs" ) const ThriftgoMiniVersion = "v0.2.0"