From 77fb257246a8867116439d43bbf6875f4d02d813 Mon Sep 17 00:00:00 2001 From: xuyang Date: Tue, 30 Apr 2024 23:00:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.go | 14 +++++++------- config/argument.go | 6 +++--- config/cmd.go | 6 +++--- generator/client.go | 4 ++-- generator/custom_files.go | 4 ++-- generator/file.go | 2 +- generator/handler.go | 6 +++--- generator/layout.go | 4 ++-- generator/model.go | 8 ++++---- generator/model_test.go | 4 ++-- generator/package.go | 6 +++--- generator/router.go | 2 +- generator/template.go | 6 +++--- generator/template_funcs.go | 2 +- go.mod | 2 +- main.go | 4 ++-- protobuf/ast.go | 12 ++++++------ protobuf/plugin.go | 12 ++++++------ protobuf/plugin_test.go | 2 +- protobuf/resolver.go | 4 ++-- protobuf/tags.go | 10 +++++----- test_hz_unix.sh | 2 +- test_hz_windows.sh | 2 +- testdata/protobuf2/api.proto | 2 +- testdata/protobuf2/other/other.proto | 2 +- testdata/protobuf2/other/other_base.proto | 2 +- testdata/protobuf2/psm/base.proto | 2 +- testdata/protobuf2/psm/psm.proto | 2 +- testdata/protobuf3/api.proto | 2 +- testdata/protobuf3/other/other.proto | 2 +- testdata/protobuf3/other/other_base.proto | 2 +- testdata/protobuf3/psm/base.proto | 2 +- testdata/protobuf3/psm/psm.proto | 2 +- thrift/ast.go | 12 ++++++------ thrift/plugin.go | 12 ++++++------ thrift/plugin_test.go | 4 ++-- thrift/resolver.go | 4 ++-- thrift/tag_test.go | 2 +- thrift/tags.go | 8 ++++---- util/data.go | 2 +- util/env.go | 2 +- util/tool_install.go | 4 ++-- 42 files changed, 97 insertions(+), 97 deletions(-) diff --git a/app/app.go b/app/app.go index ee94ba7..ead3078 100644 --- a/app/app.go +++ b/app/app.go @@ -24,13 +24,13 @@ import ( "strings" "github.com/urfave/cli/v2" - "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" + "golib.gaore.com/xuy2/gr_hz/config" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/protobuf" + "golib.gaore.com/xuy2/gr_hz/thrift" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) // global args. MUST fork it when use diff --git a/config/argument.go b/config/argument.go index 553811d..7bd4d6d 100644 --- a/config/argument.go +++ b/config/argument.go @@ -23,9 +23,9 @@ import ( "strings" "github.com/urfave/cli/v2" - "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" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) type Argument struct { diff --git a/config/cmd.go b/config/cmd.go index 87287dc..27904ed 100644 --- a/config/cmd.go +++ b/config/cmd.go @@ -24,9 +24,9 @@ import ( "strings" "syscall" - "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" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) func lookupTool(idlType string) (string, error) { diff --git a/generator/client.go b/generator/client.go index 5835850..2739b19 100644 --- a/generator/client.go +++ b/generator/client.go @@ -20,8 +20,8 @@ import ( "path/filepath" "strings" - "std.gaore.com/Gaore-Go/gr_hz/generator/model" - "std.gaore.com/Gaore-Go/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/util" ) type ClientMethod struct { diff --git a/generator/custom_files.go b/generator/custom_files.go index bc9188e..b23b007 100644 --- a/generator/custom_files.go +++ b/generator/custom_files.go @@ -24,8 +24,8 @@ import ( "strings" "text/template" - "std.gaore.com/Gaore-Go/gr_hz/util" - "std.gaore.com/Gaore-Go/gr_hz/util/logs" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) type FilePathRenderInfo struct { diff --git a/generator/file.go b/generator/file.go index 9c567ce..935ca71 100644 --- a/generator/file.go +++ b/generator/file.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "std.gaore.com/Gaore-Go/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util" ) type File struct { diff --git a/generator/handler.go b/generator/handler.go index 80e8502..38c3a9b 100644 --- a/generator/handler.go +++ b/generator/handler.go @@ -23,9 +23,9 @@ import ( "path/filepath" "strings" - "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" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) type HttpMethod struct { diff --git a/generator/layout.go b/generator/layout.go index ed9ef39..f4ab1bc 100644 --- a/generator/layout.go +++ b/generator/layout.go @@ -25,9 +25,9 @@ import ( "reflect" "strings" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" "gopkg.in/yaml.v2" - "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 8dd1f2f..d1c3ca3 100644 --- a/generator/model.go +++ b/generator/model.go @@ -22,10 +22,10 @@ import ( "strings" "text/template" - "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" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/generator/model/golang" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" ) //---------------------------------Backend---------------------------------- diff --git a/generator/model_test.go b/generator/model_test.go index 87438f8..a2f67e5 100644 --- a/generator/model_test.go +++ b/generator/model_test.go @@ -20,8 +20,8 @@ import ( "testing" "text/template" - "std.gaore.com/Gaore-Go/gr_hz/generator/model" - "std.gaore.com/Gaore-Go/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/meta" ) type StringValue struct { diff --git a/generator/package.go b/generator/package.go index 27044c2..0f17c64 100644 --- a/generator/package.go +++ b/generator/package.go @@ -24,10 +24,10 @@ import ( "reflect" "text/template" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" "gopkg.in/yaml.v2" - "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 7bb977c..cf328bb 100644 --- a/generator/router.go +++ b/generator/router.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "std.gaore.com/Gaore-Go/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util" ) type Router struct { diff --git a/generator/template.go b/generator/template.go index 31d88a1..6f3761b 100644 --- a/generator/template.go +++ b/generator/template.go @@ -25,9 +25,9 @@ import ( "strings" "text/template" - "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" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) var DefaultDelimiters = [2]string{"{{", "}}"} diff --git a/generator/template_funcs.go b/generator/template_funcs.go index 7756119..c1d974e 100644 --- a/generator/template_funcs.go +++ b/generator/template_funcs.go @@ -21,7 +21,7 @@ import ( "text/template" "github.com/Masterminds/sprig/v3" - "std.gaore.com/Gaore-Go/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util" ) var funcMap = func() template.FuncMap { diff --git a/go.mod b/go.mod index f251d29..aa025e2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module std.gaore.com/Gaore-Go/gr_hz +module golib.gaore.com/xuy2/gr_hz go 1.16 diff --git a/main.go b/main.go index bf97d2f..20f3cf8 100644 --- a/main.go +++ b/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "std.gaore.com/Gaore-Go/gr_hz/app" - "std.gaore.com/Gaore-Go/gr_hz/util/logs" + "golib.gaore.com/xuy2/gr_hz/app" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) func main() { diff --git a/protobuf/ast.go b/protobuf/ast.go index 504a013..31dd20c 100644 --- a/protobuf/ast.go +++ b/protobuf/ast.go @@ -23,17 +23,17 @@ import ( "strings" "github.com/jhump/protoreflect/desc" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/protobuf/api" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" "google.golang.org/protobuf/types/descriptorpb" - "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 851479e..7c24988 100644 --- a/protobuf/plugin.go +++ b/protobuf/plugin.go @@ -54,18 +54,18 @@ import ( "path/filepath" "strings" + "golib.gaore.com/xuy2/gr_hz/config" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" gengo "google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/runtime/protoimpl" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" - "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 9784ab1..9909f23 100644 --- a/protobuf/plugin_test.go +++ b/protobuf/plugin_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" + "golib.gaore.com/xuy2/gr_hz/meta" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/pluginpb" - "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 bf2f112..60dacc4 100644 --- a/protobuf/resolver.go +++ b/protobuf/resolver.go @@ -21,9 +21,9 @@ import ( "strings" "github.com/jhump/protoreflect/desc" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/util" "google.golang.org/protobuf/types/descriptorpb" - "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 10b38b8..35efe04 100644 --- a/protobuf/tags.go +++ b/protobuf/tags.go @@ -22,15 +22,15 @@ import ( "strconv" "strings" + "golib.gaore.com/xuy2/gr_hz/config" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/protobuf/api" + "golib.gaore.com/xuy2/gr_hz/util" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/runtime/protoimpl" "google.golang.org/protobuf/types/descriptorpb" - "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 bfec31e..4babe8c 100644 --- a/test_hz_unix.sh +++ b/test_hz_unix.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash # const value define -moduleName="std.gaore.com/Gaore-Go/gr_hz/test" +moduleName="golib.gaore.com/xuy2/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 7cacb36..21ef0c3 100644 --- a/test_hz_windows.sh +++ b/test_hz_windows.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash # const value define -moduleName="std.gaore.com/Gaore-Go/gr_hz/test" +moduleName="golib.gaore.com/xuy2/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 a7b3637..a51db30 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 = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/api"; +option go_package = "golib.gaore.com/xuy2/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 2d4ccbd..8584ee5 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 = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; +option go_package = "golib.gaore.com/xuy2/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 de16772..1058c68 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 = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; +option go_package = "golib.gaore.com/xuy2/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 b747230..211e7ab 100644 --- a/testdata/protobuf2/psm/base.proto +++ b/testdata/protobuf2/psm/base.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package base; -option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; +option go_package = "golib.gaore.com/xuy2/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 40b9cad..313b4ea 100644 --- a/testdata/protobuf2/psm/psm.proto +++ b/testdata/protobuf2/psm/psm.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package psm; -option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; +option go_package = "golib.gaore.com/xuy2/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 a7b3637..a51db30 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 = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/api"; +option go_package = "golib.gaore.com/xuy2/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 2d4ccbd..8584ee5 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 = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; +option go_package = "golib.gaore.com/xuy2/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 de16772..1058c68 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 = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/other"; +option go_package = "golib.gaore.com/xuy2/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 17d3bd6..7029545 100644 --- a/testdata/protobuf3/psm/base.proto +++ b/testdata/protobuf3/psm/base.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package base; -option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; +option go_package = "golib.gaore.com/xuy2/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 d01d54b..f70fd2b 100644 --- a/testdata/protobuf3/psm/psm.proto +++ b/testdata/protobuf3/psm/psm.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package psm; -option go_package = "std.gaore.com/Gaore-Go/gr_hz/test/hertz_model/psm"; +option go_package = "golib.gaore.com/xuy2/gr_hz/test/hertz_model/psm"; import "api.proto"; import "base.proto"; diff --git a/thrift/ast.go b/thrift/ast.go index e0c88ed..88fbeb4 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" - "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" + "golib.gaore.com/xuy2/gr_hz/config" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) /*---------------------------Import-----------------------------*/ diff --git a/thrift/plugin.go b/thrift/plugin.go index 3e8d463..1946584 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" - "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" + "golib.gaore.com/xuy2/gr_hz/config" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) type Plugin struct { diff --git a/thrift/plugin_test.go b/thrift/plugin_test.go index 377750a..8dc2355 100644 --- a/thrift/plugin_test.go +++ b/thrift/plugin_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/cloudwego/thriftgo/plugin" - "std.gaore.com/Gaore-Go/gr_hz/generator" - "std.gaore.com/Gaore-Go/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/meta" ) func TestRun(t *testing.T) { diff --git a/thrift/resolver.go b/thrift/resolver.go index 92a63fe..b9cac83 100644 --- a/thrift/resolver.go +++ b/thrift/resolver.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/cloudwego/thriftgo/parser" - "std.gaore.com/Gaore-Go/gr_hz/generator/model" - "std.gaore.com/Gaore-Go/gr_hz/util" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/util" ) var ( diff --git a/thrift/tag_test.go b/thrift/tag_test.go index bd24b7b..4db19db 100644 --- a/thrift/tag_test.go +++ b/thrift/tag_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/cloudwego/thriftgo/plugin" - "std.gaore.com/Gaore-Go/gr_hz/config" + "golib.gaore.com/xuy2/gr_hz/config" ) func TestInsertTag(t *testing.T) { diff --git a/thrift/tags.go b/thrift/tags.go index 0735f05..b9927d3 100644 --- a/thrift/tags.go +++ b/thrift/tags.go @@ -23,10 +23,10 @@ import ( "strings" "github.com/cloudwego/thriftgo/parser" - "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" + "golib.gaore.com/xuy2/gr_hz/config" + "golib.gaore.com/xuy2/gr_hz/generator" + "golib.gaore.com/xuy2/gr_hz/generator/model" + "golib.gaore.com/xuy2/gr_hz/util" ) const ( diff --git a/util/data.go b/util/data.go index a1e52dc..7c4689f 100644 --- a/util/data.go +++ b/util/data.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "std.gaore.com/Gaore-Go/gr_hz/util/logs" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) func CopyStringSlice(from, to *[]string) { diff --git a/util/env.go b/util/env.go index f561730..b625842 100644 --- a/util/env.go +++ b/util/env.go @@ -27,7 +27,7 @@ import ( "regexp" "strings" - "std.gaore.com/Gaore-Go/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/meta" ) func GetGOPATH() (gopath string, err error) { diff --git a/util/tool_install.go b/util/tool_install.go index ad744e3..509f046 100644 --- a/util/tool_install.go +++ b/util/tool_install.go @@ -25,8 +25,8 @@ import ( "time" gv "github.com/hashicorp/go-version" - "std.gaore.com/Gaore-Go/gr_hz/meta" - "std.gaore.com/Gaore-Go/gr_hz/util/logs" + "golib.gaore.com/xuy2/gr_hz/meta" + "golib.gaore.com/xuy2/gr_hz/util/logs" ) const ThriftgoMiniVersion = "v0.2.0"