Merge pull request #12 from Dot-Liu/develop

修改库名
eolinker · Aug 13, 2021 · e030f0c · e030f0c
2 parents 5626c62 + 1a5c5b7
commit e030f0c
Show file tree

Hide file tree

Showing 69 changed files with 210 additions and 208 deletions.
diff --git a/app/goku-eosc/inner.go b/app/goku-eosc/inner.go
diff --git a/app/goku-eosc/.gitignore → app/goku/.gitignore b/app/goku-eosc/.gitignore → app/goku/.gitignore
diff --git a/app/goku-eosc/flag.go → app/goku/flag.go b/app/goku-eosc/flag.go → app/goku/flag.go
diff --git a/app/goku/inner.go b/app/goku/inner.go
@@ -0,0 +1,60 @@
+package main
+
+import (
+	"github.com/eolinker/goku/auth/aksk"
+	"github.com/eolinker/goku/auth/apikey"
+	"github.com/eolinker/goku/auth/basic"
+	"github.com/eolinker/goku/auth/jwt"
+	"github.com/eolinker/goku/discovery/consul"
+	"github.com/eolinker/goku/discovery/eureka"
+	"github.com/eolinker/goku/discovery/nacos"
+	"github.com/eolinker/goku/discovery/static"
+	http_router "github.com/eolinker/goku/router/http-router"
+	service_http "github.com/eolinker/goku/service/service-http"
+	store_memory "github.com/eolinker/goku/store-memory"
+	upstream_http "github.com/eolinker/goku/upstream/upstream-http"
+)
+
+func Register() {
+	storeRegister()
+
+	routerRegister()
+
+	serviceRegister()
+
+	upstreamRegister()
+
+	discoveryRegister()
+
+	authRegister()
+}
+
+func authRegister() {
+	basic.Register()
+	apikey.Register()
+	aksk.Register()
+	jwt.Register()
+}
+
+func discoveryRegister() {
+	consul.Register()
+	eureka.Register()
+	nacos.Register()
+	static.Register()
+}
+
+func storeRegister() {
+	store_memory.Register()
+}
+
+func upstreamRegister() {
+	upstream_http.Register()
+}
+
+func serviceRegister() {
+	service_http.Register()
+}
+
+func routerRegister() {
+	http_router.Register()
+}
diff --git a/app/goku-eosc/main.go → app/goku/main.go b/app/goku-eosc/main.go → app/goku/main.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	reader_yaml "github.com/eolinker/goku-eosc/reader-yaml"
+	reader_yaml "github.com/eolinker/goku/reader-yaml"
 
 	_ "net/http/pprof"
 

diff --git a/app/goku-eosc/plugin.go → app/goku/plugin.go b/app/goku-eosc/plugin.go → app/goku/plugin.go
diff --git a/app/goku-eosc/profession.go → app/goku/profession.go b/app/goku-eosc/profession.go → app/goku/profession.go
diff --git a/app/goku-eosc/profession.yml → app/goku/profession.yml b/app/goku-eosc/profession.yml → app/goku/profession.yml
diff --git a/app/goku-eosc/store.go → app/goku/store.go b/app/goku-eosc/store.go → app/goku/store.go
diff --git a/app/goku-eosc/yaml-demo/auth.yml → app/goku/yaml-demo/auth.yml b/app/goku-eosc/yaml-demo/auth.yml → app/goku/yaml-demo/auth.yml
diff --git a/app/goku-eosc/yaml-demo/discovery.yml → app/goku/yaml-demo/discovery.yml b/app/goku-eosc/yaml-demo/discovery.yml → app/goku/yaml-demo/discovery.yml
diff --git a/app/goku-eosc/yaml-demo/service.yml → app/goku/yaml-demo/service.yml b/app/goku-eosc/yaml-demo/service.yml → app/goku/yaml-demo/service.yml
diff --git a/app/goku-eosc/yaml-demo/upstream.yml → app/goku/yaml-demo/upstream.yml b/app/goku-eosc/yaml-demo/upstream.yml → app/goku/yaml-demo/upstream.yml
diff --git a/auth/aksk/aksk.go b/auth/aksk/aksk.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/eolinker/eosc"
-	"github.com/eolinker/goku-eosc/auth"
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	"github.com/eolinker/goku/auth"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 //supportTypes 当前驱动支持的authorization type值

diff --git a/auth/aksk/aksk_test.go b/auth/aksk/aksk_test.go
@@ -1,10 +1,11 @@
 package aksk
 
 import (
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
 	"io"
 	"net/http"
 	"testing"
+
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 var akskConfig = []AKSKConfig{{

diff --git a/auth/aksk/util.go b/auth/aksk/util.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/eolinker/goku-eosc/auth"
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	"github.com/eolinker/goku/auth"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 const dateHeader = "x-gateway-date"

diff --git a/auth/apikey/apikey.go b/auth/apikey/apikey.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/eolinker/eosc"
-	"github.com/eolinker/goku-eosc/auth"
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	"github.com/eolinker/goku/auth"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 //supportTypes 当前驱动支持的authorization type值

diff --git a/auth/apikey/apikey_test.go b/auth/apikey/apikey_test.go
@@ -3,15 +3,16 @@ package apikey
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/eolinker/goku-eosc/auth"
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	"errors"
 	"mime/multipart"
 	"net/http"
 	"net/url"
 	"strings"
 	"testing"
+
+	"github.com/eolinker/goku/auth"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
-import "errors"
 
 var (
 	users = []User{

diff --git a/auth/auth.go b/auth/auth.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 const (
@@ -27,7 +27,7 @@ var (
 
 //CheckSkill 检查能力
 func CheckSkill(skill string) bool {
-	return skill == "github.com/eolinker/goku-eosc/auth.auth.IAuth"
+	return skill == "github.com/eolinker/goku/auth.auth.IAuth"
 }
 
 //IAuth 鉴权接口声明

diff --git a/auth/basic/basic.go b/auth/basic/basic.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/eolinker/eosc"
 
-	"github.com/eolinker/goku-eosc/auth"
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	"github.com/eolinker/goku/auth"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 //supportTypes 当前驱动支持的authorization type值

diff --git a/auth/basic/basic_test.go b/auth/basic/basic_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/eolinker/goku-eosc/auth"
+	"github.com/eolinker/goku/auth"
 
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 var (

diff --git a/auth/jwt/jwt.go b/auth/jwt/jwt.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/eolinker/eosc"
-	"github.com/eolinker/goku-eosc/auth"
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	"github.com/eolinker/goku/auth"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 //supportTypes 当前驱动支持的authorization type值

diff --git a/auth/jwt/jwt_test.go b/auth/jwt/jwt_test.go
@@ -1,10 +1,11 @@
 package jwt
 
 import (
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
 	"io"
 	"net/http"
 	"testing"
+
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 type responseWriter struct{}

diff --git a/auth/jwt/verify.go b/auth/jwt/verify.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"time"
 
-	http_context "github.com/eolinker/goku-eosc/node/http-context"
+	http_context "github.com/eolinker/goku/node/http-context"
 )
 
 type jwtToken struct {

diff --git a/discovery/consul/clients.go b/discovery/consul/clients.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/eolinker/eosc/log"
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 	"github.com/hashicorp/consul/api"
 )
 

diff --git a/discovery/consul/consul.go b/discovery/consul/consul.go
@@ -9,7 +9,7 @@ import (
 	"github.com/eolinker/eosc"
 	"github.com/eolinker/eosc/log"
 
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 type consul struct {

diff --git a/discovery/consul/consul_test.go b/discovery/consul/consul_test.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 func TestConsulGetNodes(t *testing.T) {

diff --git a/discovery/consul/driver.go b/discovery/consul/driver.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 
 	"github.com/eolinker/eosc"
 )

diff --git a/discovery/discovery.go b/discovery/discovery.go
@@ -8,7 +8,7 @@ var (
 
 //CheckSkill 检查目标技能是否符合
 func CheckSkill(skill string) bool {
-	return skill == "github.com/eolinker/goku-eosc/discovery.discovery.IDiscovery"
+	return skill == "github.com/eolinker/goku/discovery.discovery.IDiscovery"
 }
 
 //IDiscovery 服务发现接口

diff --git a/discovery/eureka/client.go b/discovery/eureka/client.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 
 	"github.com/eolinker/eosc/log"
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 type client struct {

diff --git a/discovery/eureka/driver.go b/discovery/eureka/driver.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/eolinker/eosc"
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 const (

diff --git a/discovery/eureka/eureka.go b/discovery/eureka/eureka.go
@@ -9,7 +9,7 @@ import (
 	"github.com/eolinker/eosc/log"
 
 	"github.com/eolinker/eosc"
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 type eureka struct {

diff --git a/discovery/eureka/eureka_test.go b/discovery/eureka/eureka_test.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 func TestGetApp(t *testing.T) {

diff --git a/discovery/nacos/client.go b/discovery/nacos/client.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/eolinker/eosc/log"
 
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 type client struct {

diff --git a/discovery/nacos/driver.go b/discovery/nacos/driver.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/eolinker/eosc"
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 const (

diff --git a/discovery/nacos/nacos.go b/discovery/nacos/nacos.go
@@ -9,7 +9,7 @@ import (
 	"github.com/eolinker/eosc/log"
 
 	"github.com/eolinker/eosc"
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 const (

diff --git a/discovery/nacos/nacos_test.go b/discovery/nacos/nacos_test.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/eolinker/goku-eosc/discovery"
+	"github.com/eolinker/goku/discovery"
 )
 
 func TestGetApp(t *testing.T) {