移除dapr,naas作为单独的基础服务存在

Author: DeyiXu

Makefile

@@ -0,0 +1,32 @@
+#.PHONY是一个伪目标，可以防止在Makefile中定义的执行命令的目标和工作目录下的实际文件出现名字冲突，另一种是提高执行makefile时的效率
+.PHONY: debug build swagger debug-naas debug-token-server test clean
+
+BIN_PATH = ./bin
+BIN_OUTPUT_NAAS_NAME = naas
+BIN_OUTPUT_NAAS_TOKEN_SERVER_NAME = token-server
+
+build:
+	@go build -ldflags "-w -s" -o $(BIN_PATH)/$(BIN_OUTPUT_NAAS_NAME) ./cmd/main.go
+	@go build -ldflags "-w -s" -o $(BIN_PATH)/$(BIN_OUTPUT_NAAS_TOKEN_SERVER_NAME) ./cmd/token-server/main.go
+
+debug-naas: swagger
+	@export GRPC_ENABLE="true"
+	@export GRPC_GATEWAY_ENABLE="true"
+	@export HTTP_ENABLE="true"
+	@go run ./cmd/main.go
+
+debug-token-server:
+	@export OAUTH2_SERVER="http://naas:8080/oauth2"
+	@export OAUTH2_CLIENT_ID="1000"
+	@export OAUTH2_CLIENT_SECRET="99799a6b-a289-4099-b4ad-b42603c17ffc"
+	@export OAUTH2_REDIRECT_URI="http://naas-admin.nilorg.com/admin/auth/callback"
+	@go run ./cmd/main.go
+
+swagger:
+	@swag init -g ./internal/server/server.go
+
+test:
+	@go test -cover -race ./...
+
+clean:
+	@rm -rf $(BIN_PATH)/*

README.md

@@ -141,8 +141,6 @@ spec:
               value: "true"
             - name: HTTP_ENABLE
               value: "true"
-            - name: DAPR_ENABLE # 只有在使用DApr的时候才会用
-              value: "false"
           volumeMounts:
             - name: config-cm # 配置文件
               mountPath: /workspace/configs/

cmd/main.go

@@ -50,7 +50,6 @@ func main() {
 	grpcEnable := os.Getenv("GRPC_ENABLE")
 	grpcGatewayEnable := os.Getenv("GRPC_GATEWAY_ENABLE")
 	httpEnable := os.Getenv("HTTP_ENABLE")
-	daprEnable := os.Getenv("DAPR_ENABLE")
 	if strings.EqualFold(grpcEnable, "true") {
 		server.RunGRpc()
 	}
@@ -60,8 +59,5 @@ func main() {
 	if strings.EqualFold(httpEnable, "true") {
 		server.RunHTTP()
 	}
-	if strings.EqualFold(daprEnable, "true") {
-		server.RunDapr()
-	}
 	<-ctx.Done()
 }

deployments/k8s/dapr/dapr-naas-admin-token-server.yaml

@@ -35,8 +35,6 @@ spec:
               value: "true"
             - name: HTTP_ENABLE
               value: "true"
-            - name: DAPR_ENABLE
-              value: "false"
           volumeMounts:
             - name: config-cm
               mountPath: /workspace/configs/

deployments/k8s/dapr/dapr-pod-daprgrpc.yaml

@@ -10,7 +10,6 @@ require (
 	github.com/appleboy/gin-jwt/v2 v2.6.4
 	github.com/casbin/casbin/v2 v2.17.1
 	github.com/casbin/gorm-adapter/v3 v3.0.3
-	github.com/dapr/go-sdk v1.1.0
 	github.com/deckarep/golang-set v1.7.1
 	github.com/gin-contrib/sessions v0.0.3
 	github.com/gin-gonic/gin v1.6.3
@@ -21,7 +20,9 @@ require (
 	github.com/gorilla/sessions v1.2.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mailru/easyjson v0.7.1 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/nilorg/geetest v1.0.0
 	github.com/nilorg/oauth2 v0.3.2
 	github.com/nilorg/pkg v0.0.0-20200923011256-287aac349757
@@ -38,10 +39,14 @@ require (
 	github.com/swaggo/swag v1.6.9
 	golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392 // indirect
 	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
+	golang.org/x/sys v0.0.0-20201202213521-69691e467435 // indirect
+	golang.org/x/text v0.3.4 // indirect
 	google.golang.org/genproto v0.0.0-20201204160425-06b3db808446
 	google.golang.org/grpc v1.34.0
 	google.golang.org/grpc/examples v0.0.0-20200826230536-d31b6710005d // indirect
 	google.golang.org/protobuf v1.25.0
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
 	gorm.io/driver/mysql v1.0.3
 	gorm.io/gorm v1.20.6
 )

deployments/k8s/dapr/dapr-pod-grpc.yaml

@@ -107,8 +107,6 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/dapr/go-sdk v1.1.0 h1:OfhGdSDMRaTlDmaTDlo1POW9FMFxdox/PFlapEdBug0=
-github.com/dapr/go-sdk v1.1.0/go.mod h1:zyhsocIKv4pqQ2VtvWvf2CK1UhP7Z2OAOXgEpVxMgIs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=