GaoreGo/gr_hz
7
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

修改mod

Browse Source
This commit is contained in:
许 洋 2024-04-30 23:00:05 +08:00
parent 3de6747f6c
commit 77fb257246
42 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/app.go
View File

@ -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

6
config/argument.go
View File

@ -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 {

6
config/cmd.go
View File

@ -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) {

4
generator/client.go
View File

@ -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 {

4
generator/custom_files.go
View File

@ -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 {

2
generator/file.go
View File

@ -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 {

6
generator/handler.go
View File

@ -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 {

4
generator/layout.go
View File

@ -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

8
generator/model.go
View File

@ -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----------------------------------

4
generator/model_test.go
View File

@ -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 {

6
generator/package.go
View File

@ -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 {

2
generator/router.go
View File

@ -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 {

6
generator/template.go
View File

@ -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{"{{", "}}"}

2
generator/template_funcs.go
View File

@ -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 {

2
go.mod
View File

@ -1,4 +1,4 @@
module std.gaore.com/Gaore-Go/gr_hz
module golib.gaore.com/xuy2/gr_hz
go 1.16

4
main.go
View File

@ -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() {

12
protobuf/ast.go
View File

@ -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{}

12
protobuf/plugin.go
View File

@ -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 {

2
protobuf/plugin_test.go
View File

@ -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) {

4
protobuf/resolver.go
View File

@ -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 {

10
protobuf/tags.go
View File

@ -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 (

2
test_hz_unix.sh
View File

@ -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"

2
test_hz_windows.sh
View File

@ -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"

2
testdata/protobuf2/api.proto vendored
View File

@ -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;

2
testdata/protobuf2/other/other.proto vendored
View File

@ -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;

2
testdata/protobuf2/other/other_base.proto vendored
View File

@ -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;

2
testdata/protobuf2/psm/base.proto vendored
View File

@ -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;

2
testdata/protobuf2/psm/psm.proto vendored
View File

@ -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";

2
testdata/protobuf3/api.proto vendored
View File

@ -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;

2
testdata/protobuf3/other/other.proto vendored
View File

@ -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;

2
testdata/protobuf3/other/other_base.proto vendored
View File

@ -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;

2
testdata/protobuf3/psm/base.proto vendored
View File

@ -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;

2
testdata/protobuf3/psm/psm.proto vendored
View File

@ -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";

12
thrift/ast.go
View File

@ -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-----------------------------*/

12
thrift/plugin.go
View File

@ -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 {

4
thrift/plugin_test.go
View File

@ -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) {

4
thrift/resolver.go
View File

@ -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 (

2
thrift/tag_test.go
View File

@ -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) {

8
thrift/tags.go
View File

@ -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 (

2
util/data.go
View File

@ -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) {

2
util/env.go
View File

@ -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) {

4
util/tool_install.go
View File

@ -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"