Merge pull request #10 from luohuixi/main

111

Author: sunjunnan79

example/config/config.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"log"
-	"time"
 
-	"github.com/muxi-Infra/muxi-micro/pkg/config"
+	"github.com/muxi-Infra/muxi-micro/pkg/config/local"
+	"github.com/muxi-Infra/muxi-micro/pkg/config/nacos"
 )
 
 type DatabaseConfig struct {
@@ -29,74 +29,54 @@ type Config struct {
 }
 
 func Local() {
-	// 选择本地就newloaclconfig
-	cfg, err := config.NewLocalConfig(&Config{}, "config.yaml")
-	if err != nil { //结构体传入时不用指针就报错
-		log.Fatal(err)
-	}
-	// 加载配置
-	err = cfg.LoadData()
-	// 检查是否有错误
+	cfg, err := local.LoadLocalConfig[Config]("./example.yaml", local.WithWatchChanSize(10))
 	if err != nil {
-		log.Fatalf("加载配置失败: %v", err)
+		log.Fatal(err)
 	}
-	// 输出时需要类型断言
-	log.Println(cfg.GetData().(*Config).Database.MySQL.Host)
+	defer cfg.Close()
 
-	//ch用于监听热更新信号
-	ch := cfg.WatchData()
-
-	go func() {
-		for err := range ch {
-			// 用户自定义热更新后的操作
-			if err == nil {
-				log.Println(cfg.GetData().(*Config).Database.MySQL.Host)
-			} else {
-				log.Println("err: ", err)
-			}
-		}
-	}()
+	data := cfg.GetData()
+	log.Printf("MySQL Host: %s", data.Database.MySQL.Host)
+	log.Printf("Redis DB: %s", data.Database.Redis.DB)
 
-	time.Sleep(20 * time.Second)
-	// 其实local的关闭不会报错，nacos才会
-	err = cfg.Close()
-	if err != nil {
-		log.Println(err)
+	ch := cfg.WatchData()
+	for range ch {
+		updatedData := cfg.GetData()
+		log.Printf("MySQL Host: %s", updatedData.Database.MySQL.Host)
 	}
 }
 
 func Nacos() {
-	// 预先配置
-	c := config.NewClientConfig("public", "nacos", "nacos", 5000)
-	s := config.NewServerConfig([]string{"localhost"}, []uint64{8848})
-	// GET
-	cfg2, err := config.NewNacosConfig("key3", "1GRUOP", "", c, s)
+	clientAddr := []nacos.ClientAddr{
+		{Ip: "localhost", Port: 8848},
+	}
+	client, err := nacos.NewNacosClient(
+		"new",
+		"nacos",
+		"nacos",
+		"",
+		1000,
+		clientAddr,
+	)
 	if err != nil {
 		log.Fatal(err)
 	}
-	err = cfg2.LoadData()
+	defer client.CloseClient()
+
+	cfg, err := nacos.LoadNacosConfig[Config](client, "test", "test")
 	if err != nil {
 		log.Fatal(err)
 	}
-	log.Println(cfg2.GetData())
+	defer cfg.Close()
 
-	// 监听
-	ch := cfg2.WatchData()
-	go func() {
-		for err := range ch {
-			// 用户自定义热更新后的操作
-			if err != nil {
-				log.Println(err)
-			} else {
-				log.Println("配置已更新:", cfg2.GetData())
-			}
-		}
-	}()
+	data := cfg.GetData()
+	log.Printf("MySQL Host: %s", data.Database.MySQL.Host)
+	log.Printf("Redis DB: %s", data.Database.Redis.DB)
 
-	time.Sleep(10 * time.Second)
-	err = cfg2.Close()
-	if err != nil {
-		log.Println(err)
+	ch := cfg.WatchData()
+	for range ch {
+		updatedData := cfg.GetData()
+		log.Printf("MySQL Host: %s", updatedData.Database.MySQL.Host)
 	}
 }
 

example/config/example.yaml

@@ -0,0 +1,12 @@
+database:
+  mysql:
+    host: "localhost"
+    port: "3306"
+    username: "root"
+    password: "password"
+  redis:
+    host: "localhost"
+    port: "6379"
+    username: "root"
+    password: "password"
+    db: "0"

example/transport/grpc/client/main.go

@@ -0,0 +1,27 @@
+package micro
+
+import (
+	pb "github.com/muxi-Infra/muxi-micro/example/transport/grpc/proto"
+	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc"
+	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc/discovery/etcd"
+)
+
+// 和proto一起生成的客户端模板的大致形式
+func HelloClient() (pb.HelloServiceClient, error) {
+	center, err := etcd.NewEtcdDiscovery()
+	if err != nil {
+		return nil, err
+	}
+
+	client, err := grpc.NewGRPCClient(
+		grpc.WithServiceDiscovery(center),
+		grpc.WithDiscoveryName("test"),
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer client.Close()
+
+	c := pb.NewHelloServiceClient(client.Conn())
+	return c, nil
+}

tool/new/template/local/hello.pb.go.tpl example/transport/grpc/proto/hello.pb.gotool/new/template/local/hello.pb.go.tpl renamed to example/transport/grpc/proto/hello.pb.go

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "./v1";
+option go_package = ".;proto";
 
 message HelloRequest {
   string username = 1;
@@ -13,4 +13,4 @@ message HelloResponse {
 
 service HelloService {
   rpc Hello(HelloRequest) returns (HelloResponse);
-}
+}    

tool/new/template/local/hello.proto.tpl example/transport/grpc/proto/hello.prototool/new/template/local/hello.proto.tpl renamed to example/transport/grpc/proto/hello.proto

@@ -0,0 +1,21 @@
+package server
+
+import (
+	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc"
+	"github.com/muxi-Infra/muxi-micro/pkg/transport/grpc/registry/etcd"
+)
+
+// 和proto一起生成的服务端模板的大致形式
+func HelloServer() (*grpc.GRPCServer, error) {
+	center, err := etcd.NewEtcdRegistry()
+	if err != nil {
+		return nil, err
+	}
+
+	server := grpc.NewGRPCServer(
+		grpc.WithName("test"),
+		grpc.WithRegistrationCenter(center),
+	)
+
+	return server, nil
+}