rename g-server

myxy99 · myxy99 · commit 79a264c83258 · 2021-03-10T22:40:15.000+08:00
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-# Component
+# g-server
 
 Self-use microservice framework
 
 ![](https://img.shields.io/badge/windowns10-Development-d0d1d4)
 ![](https://img.shields.io/badge/golang-1.16-blue)
-[![](https://img.shields.io/badge/godoc-reference-3C57C4)](https://pkg.go.dev/github.com/coder2z/component)
+[![](https://img.shields.io/badge/godoc-reference-3C57C4)](https://pkg.go.dev/github.com/coder2z/g-server)
 ![](https://img.shields.io/badge/version-1.0.5-r)
 
 ## :rocket:Installation
 
 `
-go get -u github.com/coder2z/component
+go get -u github.com/coder2z/g-server
 `
 
 ## :bell:Features
@@ -57,9 +57,9 @@ import (
 	"github.com/coder2z/g-saber/xflag"
 	"github.com/coder2z/g-saber/xcfg"
 	"github.com/coder2z/g-saber/xcfg/datasource/manager"
-	"github.com/coder2z/component/xinvoker"
-	xgorm "github.com/coder2z/component/xinvoker/gorm"
-	xredis "github.com/coder2z/component/xinvoker/redis"
+	"github.com/coder2z/g-server/xinvoker"
+	xgorm "github.com/coder2z/g-server/xinvoker/gorm"
+	xredis "github.com/coder2z/g-server/xinvoker/redis"
 )
 
 func main() {
diff --git a/datasource/manager/manager.go b/datasource/manager/manager.go
@@ -2,11 +2,11 @@ package manager
 
 import (
 	"errors"
-	"github.com/coder2z/component/datasource/apollo"
-	"github.com/coder2z/component/datasource/etcdv3"
-	"github.com/coder2z/component/datasource/file"
 	"github.com/coder2z/g-saber/xcfg"
 	"github.com/coder2z/g-saber/xconsole"
+	"github.com/coder2z/g-server/datasource/apollo"
+	"github.com/coder2z/g-server/datasource/etcdv3"
+	"github.com/coder2z/g-server/datasource/file"
 	"net/url"
 )
 
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/coder2z/component
+module github.com/coder2z/g-server
 
 go 1.15
 
diff --git a/xapp/app.go b/xapp/app.go
@@ -7,10 +7,10 @@ package xapp
 
 import (
 	"github.com/coder2z/g-saber/xcfg"
-	"github.com/coder2z/component/xversion"
 	"github.com/coder2z/g-saber/xconsole"
 	"github.com/coder2z/g-saber/xnet"
 	"github.com/coder2z/g-saber/xstring"
+	"github.com/coder2z/g-server/xversion"
 	"os"
 	"runtime"
 	"sync"
diff --git a/xgovern/govern.go b/xgovern/govern.go
@@ -9,15 +9,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/coder2z/component/xapp"
 	"github.com/coder2z/g-saber/xcfg"
-	"github.com/coder2z/component/xcode"
-	"github.com/coder2z/component/xmonitor"
 	"github.com/coder2z/g-saber/xconsole"
 	"github.com/coder2z/g-saber/xdefer"
 	"github.com/coder2z/g-saber/xjson"
 	"github.com/coder2z/g-saber/xlog"
 	"github.com/coder2z/g-saber/xnet"
+	"github.com/coder2z/g-server/xapp"
+	"github.com/coder2z/g-server/xcode"
+	"github.com/coder2z/g-server/xmonitor"
 	"net/http"
 	"net/http/pprof"
 	"os"
diff --git a/xgrpc/balancer/consistent_hash/consistent_hash.go b/xgrpc/balancer/consistent_hash/consistent_hash.go
@@ -7,8 +7,8 @@ package consistent_hash
 
 import (
 	"fmt"
-	"github.com/coder2z/component/xgrpc"
-	"github.com/coder2z/component/xgrpc/balancer"
+	"github.com/coder2z/g-server/xgrpc"
+	"github.com/coder2z/g-server/xgrpc/balancer"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/base"
 )
diff --git a/xgrpc/balancer/p2c/p2c.go b/xgrpc/balancer/p2c/p2c.go
@@ -1,8 +1,8 @@
 package p2c
 
 import (
-	xbalancer "github.com/coder2z/component/xgrpc/balancer"
 	"github.com/coder2z/g-saber/xtime"
+	xbalancer "github.com/coder2z/g-server/xgrpc/balancer"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/base"
 	"google.golang.org/grpc/codes"
diff --git a/xgrpc/balancer/random/random.go b/xgrpc/balancer/random/random.go
@@ -6,7 +6,7 @@
 package random
 
 import (
-	"github.com/coder2z/component/xgrpc/balancer"
+	"github.com/coder2z/g-server/xgrpc/balancer"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/base"
 	"math/rand"
diff --git a/xgrpc/balancer/round_robin/round_robin.go b/xgrpc/balancer/round_robin/round_robin.go
@@ -6,7 +6,7 @@
 package round_robin
 
 import (
-	"github.com/coder2z/component/xgrpc/balancer"
+	"github.com/coder2z/g-server/xgrpc/balancer"
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/base"
 	"math/rand"
diff --git a/xgrpc/client/interceptor.go b/xgrpc/client/interceptor.go
@@ -9,12 +9,12 @@ import (
 	"errors"
 	"fmt"
 	"github.com/afex/hystrix-go/hystrix"
-	"github.com/coder2z/component/xapp"
-	"github.com/coder2z/component/xcode"
-	"github.com/coder2z/component/xmonitor"
-	"github.com/coder2z/component/xtrace"
 	"github.com/coder2z/g-saber/xcast"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xapp"
+	"github.com/coder2z/g-server/xcode"
+	"github.com/coder2z/g-server/xmonitor"
+	"github.com/coder2z/g-server/xtrace"
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/opentracing/opentracing-go/log"
 	"google.golang.org/grpc"
diff --git a/xgrpc/server/interceptor.go b/xgrpc/server/interceptor.go
@@ -8,12 +8,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/coder2z/component/xcode"
-	"github.com/coder2z/component/xgrpc"
-	"github.com/coder2z/component/xmonitor"
-	"github.com/coder2z/component/xtrace"
 	"github.com/coder2z/g-saber/xcast"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xcode"
+	"github.com/coder2z/g-server/xgrpc"
+	"github.com/coder2z/g-server/xmonitor"
+	"github.com/coder2z/g-server/xtrace"
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/opentracing/opentracing-go/log"
 	"google.golang.org/grpc"
diff --git a/xgrpc/xgrpc_test.go b/xgrpc/xgrpc_test.go
@@ -2,9 +2,9 @@ package xgrpc
 
 import (
 	"fmt"
-	"github.com/coder2z/component/xgrpc/balancer/least_connection"
-	clientinterceptors "github.com/coder2z/component/xgrpc/client"
-	serverinterceptors "github.com/coder2z/component/xgrpc/server"
+	"github.com/coder2z/g-server/xgrpc/balancer/least_connection"
+	clientinterceptors "github.com/coder2z/g-server/xgrpc/client"
+	serverinterceptors "github.com/coder2z/g-server/xgrpc/server"
 	"google.golang.org/grpc"
 	"net"
 	"testing"
diff --git a/xinvoker/email/invoker.go b/xinvoker/email/invoker.go
@@ -6,8 +6,8 @@
 package xemail
 
 import (
-	"github.com/coder2z/component/xinvoker"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xinvoker"
 	"sync"
 )
 
diff --git a/xinvoker/gorm/invoker.go b/xinvoker/gorm/invoker.go
@@ -6,8 +6,8 @@
 package xgorm
 
 import (
-	"github.com/coder2z/component/xinvoker"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xinvoker"
 	"gorm.io/gorm"
 	"sync"
 )
diff --git a/xinvoker/gorm/options.go b/xinvoker/gorm/options.go
@@ -32,17 +32,17 @@ type options struct {
 
 func newDatabaseOptions() *options {
 	return &options{
-		TablePrefix:        defaultTablePrefix,
-		Host:               "127.0.0.1",
-		Username:           "root",
-		Password:           "",
-		DBName:             "",
-		Type:               "mysql",
-		Port:               "3306",
-		Debug:              true,
-		MaxConnMaxIdleTime: time.Duration(10) * time.Second,
-		MaxOpenConnections: 100,
-		MaxIdleConn:        100,
+		TablePrefix:           defaultTablePrefix,
+		Host:                  "127.0.0.1",
+		Username:              "root",
+		Password:              "",
+		DBName:                "",
+		Type:                  "mysql",
+		Port:                  "3306",
+		Debug:                 true,
+		MaxConnMaxIdleTime:    time.Duration(10) * time.Second,
+		MaxOpenConnections:    100,
+		MaxIdleConn:           100,
 		MaxConnectionLifeTime: time.Duration(10) * time.Second,
 	}
 }
diff --git a/xinvoker/mongo/invoker.go b/xinvoker/mongo/invoker.go
@@ -6,8 +6,8 @@
 package xmongo
 
 import (
-	"github.com/coder2z/component/xinvoker"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xinvoker"
 	"sync"
 )
 
diff --git a/xinvoker/oss/alioss/alioss.go b/xinvoker/oss/alioss/alioss.go
@@ -7,7 +7,7 @@ package alioss
 
 import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/coder2z/component/xinvoker/oss/standard"
+	"github.com/coder2z/g-server/xinvoker/oss/standard"
 	"io"
 	"io/ioutil"
 	"os"
diff --git a/xinvoker/oss/file/file.go b/xinvoker/oss/file/file.go
@@ -7,7 +7,7 @@ package file
 
 import (
 	"errors"
-	"github.com/coder2z/component/xinvoker/oss/standard"
+	"github.com/coder2z/g-server/xinvoker/oss/standard"
 	"io"
 	"io/ioutil"
 	"os"
diff --git a/xinvoker/oss/invoker.go b/xinvoker/oss/invoker.go
@@ -6,9 +6,9 @@
 package xoss
 
 import (
-	"github.com/coder2z/component/xinvoker"
-	"github.com/coder2z/component/xinvoker/oss/standard"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xinvoker"
+	"github.com/coder2z/g-server/xinvoker/oss/standard"
 	"sync"
 )
 
diff --git a/xinvoker/oss/oss.go b/xinvoker/oss/oss.go
@@ -7,11 +7,11 @@ package xoss
 
 import (
 	"errors"
-	"github.com/coder2z/component/xinvoker/oss/alioss"
-	"github.com/coder2z/component/xinvoker/oss/file"
-	"github.com/coder2z/component/xinvoker/oss/standard"
 	"github.com/coder2z/g-saber/xcfg"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xinvoker/oss/alioss"
+	"github.com/coder2z/g-server/xinvoker/oss/file"
+	"github.com/coder2z/g-server/xinvoker/oss/standard"
 )
 
 func (i *ossInvoker) loadConfig() map[string]*options {
diff --git a/xinvoker/redis/invoker.go b/xinvoker/redis/invoker.go
@@ -6,8 +6,8 @@
 package xredis
 
 import (
-	"github.com/coder2z/component/xinvoker"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xinvoker"
 	"github.com/go-redis/redis/v8"
 	"sync"
 )
diff --git a/xinvoker/sms/invoker.go b/xinvoker/sms/invoker.go
@@ -6,8 +6,8 @@
 package xsms
 
 import (
-	"github.com/coder2z/component/xinvoker"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xinvoker"
 	"sync"
 )
 
diff --git a/xinvoker/sms/sms.go b/xinvoker/sms/sms.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/dysmsapi"
 	"github.com/coder2z/g-saber/xcfg"
-	xlog "github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-saber/xlog"
 )
 
 type (
diff --git a/xmonitor/init.go b/xmonitor/init.go
@@ -6,8 +6,8 @@
 package xmonitor
 
 import (
-	"github.com/coder2z/component/xapp"
 	cfg "github.com/coder2z/g-saber/xcfg"
+	"github.com/coder2z/g-server/xapp"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"net/http"
 	"time"
diff --git a/xregistry/xdirect/discovery.go b/xregistry/xdirect/discovery.go
@@ -6,9 +6,9 @@ package xdirect
 
 import (
 	"fmt"
-	xbalancer "github.com/coder2z/component/xgrpc/balancer"
-	"github.com/coder2z/component/xregistry"
 	"github.com/coder2z/g-saber/xlog"
+	xbalancer "github.com/coder2z/g-server/xgrpc/balancer"
+	"github.com/coder2z/g-server/xregistry"
 	"google.golang.org/grpc/metadata"
 	"net/url"
 	"strings"
diff --git a/xregistry/xdirect/register.go b/xregistry/xdirect/register.go
@@ -7,7 +7,7 @@ package xdirect
 import (
 	"github.com/coder2z/g-saber/xconsole"
 	"github.com/coder2z/g-saber/xlog"
-	"github.com/coder2z/component/xregistry"
+	"github.com/coder2z/g-server/xregistry"
 	"google.golang.org/grpc/resolver"
 	"time"
 )
diff --git a/xregistry/xetcd/discovery.go b/xregistry/xetcd/discovery.go
@@ -7,10 +7,10 @@ package xetcd
 import (
 	"context"
 	"fmt"
-	"github.com/coder2z/component/xregistry"
 	"github.com/coder2z/g-saber/xjson"
 	"github.com/coder2z/g-saber/xlog"
 	"github.com/coder2z/g-saber/xstring"
+	"github.com/coder2z/g-server/xregistry"
 	"go.etcd.io/etcd/clientv3"
 )
 
diff --git a/xregistry/xetcd/etcd_test.go b/xregistry/xetcd/etcd_test.go
@@ -3,12 +3,12 @@ package xetcd
 import (
 	"context"
 	"fmt"
-	"github.com/coder2z/component/xgrpc"
-	xbalancer "github.com/coder2z/component/xgrpc/balancer"
-	"github.com/coder2z/component/xgrpc/balancer/least_connection"
-	clientinterceptors "github.com/coder2z/component/xgrpc/client"
-	serverinterceptors "github.com/coder2z/component/xgrpc/server"
-	"github.com/coder2z/component/xregistry"
+	"github.com/coder2z/g-server/xgrpc"
+	xbalancer "github.com/coder2z/g-server/xgrpc/balancer"
+	"github.com/coder2z/g-server/xgrpc/balancer/least_connection"
+	clientinterceptors "github.com/coder2z/g-server/xgrpc/client"
+	serverinterceptors "github.com/coder2z/g-server/xgrpc/server"
+	"github.com/coder2z/g-server/xregistry"
 	"github.com/coder2z/g-saber/xlog"
 	"github.com/coder2z/g-saber/xtime"
 	proto "github.com/grpc-ecosystem/go-grpc-prometheus/examples/grpc-server-with-prometheus/protobuf"
diff --git a/xregistry/xetcd/register.go b/xregistry/xetcd/register.go
@@ -6,9 +6,9 @@ package xetcd
 
 import (
 	"fmt"
-	"github.com/coder2z/component/xregistry"
 	"github.com/coder2z/g-saber/xconsole"
 	"github.com/coder2z/g-saber/xlog"
+	"github.com/coder2z/g-server/xregistry"
 	"go.etcd.io/etcd/clientv3"
 	"google.golang.org/grpc/resolver"
 	"time"
diff --git a/xregistry/xetcd/xetcd.go b/xregistry/xetcd/xetcd.go
@@ -7,11 +7,11 @@ package xetcd
 import (
 	"context"
 	"fmt"
-	"github.com/coder2z/component/xapp"
-	"github.com/coder2z/component/xregistry"
 	"github.com/coder2z/g-saber/xconsole"
 	"github.com/coder2z/g-saber/xlog"
 	"github.com/coder2z/g-saber/xstring"
+	"github.com/coder2z/g-server/xapp"
+	"github.com/coder2z/g-server/xregistry"
 	"go.etcd.io/etcd/clientv3"
 	"sync"
 	"time"
diff --git a/xregistry/xk8s/discovery.go b/xregistry/xk8s/discovery.go
@@ -7,7 +7,7 @@ package xk8s
 import (
 	"context"
 	"fmt"
-	"github.com/coder2z/component/xregistry"
+	"github.com/coder2z/g-server/xregistry"
 	"github.com/coder2z/g-saber/xconsole"
 	"github.com/coder2z/g-saber/xlog"
 	"github.com/coder2z/g-saber/xstring"
diff --git a/xregistry/xk8s/register.go b/xregistry/xk8s/register.go
diff --git a/xregistry/xregistry.go b/xregistry/xregistry.go
diff --git a/xtrace/jaeger/config.go b/xtrace/jaeger/config.go
diff --git a/xtrace/xtrace.go b/xtrace/xtrace.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/coder2z/component`
	`1`	`+module github.com/coder2z/g-server`
`2`	`2`
`3`	`3`	`go 1.15`
`4`	`4`