修改服务发现

service/connect/alarm.go

@@ -2,6 +2,8 @@ package connect
 
 import (
 	"context"
+	"fmt"
+	"google.golang.org/grpc"
 	"speech-nlu-parse/global"
 	"speech-nlu-parse/model"
 	"speech-nlu-parse/pkg/logger"
@@ -14,11 +16,24 @@ const (
 )
 
 func AlarmGrpc(params *model.SpeechDomainParams, api, extra, object string) (*proto.AlarmRemindSkillResponse, error) {
-	conn, err := GrpcConn(Alarm)
+	//conn, err := GrpcConn(Alarm)
+	//if err != nil {
+	//	global.Logger.Errorf("faild to connect: %v", err)
+	//	return nil, err
+	//}
+
+	// consul注册中心获取host port
+	serviceInfo, err := global.ConsulObj.GetService(Alarm, "")
+	if err != nil {
+		return nil, err
+	}
+	// conn, err := grpc.Dial(fmt.Sprintf("%s:%d", global.AuthSetting.Ip, global.AuthSetting.GrpcPort), grpc.WithInsecure())
+	conn, err := grpc.Dial(fmt.Sprintf("%s:%d", serviceInfo.GetAddress(), serviceInfo.GetPort()), grpc.WithInsecure(), grpc.WithNoProxy())
+
 	if err != nil {
-		global.Logger.Errorf("faild to connect: %v", err)
 		return nil, err
 	}
+	defer conn.Close()
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
 	defer cancel()

service/connect/music.go

@@ -2,6 +2,8 @@ package connect
 
 import (
 	"context"
+	"fmt"
+	"google.golang.org/grpc"
 	"speech-nlu-parse/global"
 	"speech-nlu-parse/model"
 	"speech-nlu-parse/pkg/logger"
@@ -14,11 +16,24 @@ const (
 )
 
 func MusicGrpc(params *model.SpeechDomainParams) (*proto.MusicSpotResponse, error) {
-	conn, err := GrpcConn(MusicSpot)
+	//conn, err := GrpcConn(MusicSpot)
+	//if err != nil {
+	//	global.Logger.Errorf("faild to connect: %v", err)
+	//	return nil, err
+	//}
+
+	// consul注册中心获取host port
+	serviceInfo, err := global.ConsulObj.GetService(MusicSpot, "")
+	if err != nil {
+		return nil, err
+	}
+	// conn, err := grpc.Dial(fmt.Sprintf("%s:%d", global.AuthSetting.Ip, global.AuthSetting.GrpcPort), grpc.WithInsecure())
+	conn, err := grpc.Dial(fmt.Sprintf("%s:%d", serviceInfo.GetAddress(), serviceInfo.GetPort()), grpc.WithInsecure(), grpc.WithNoProxy())
+
 	if err != nil {
-		global.Logger.Errorf("faild to connect: %v", err)
 		return nil, err
 	}
+	defer conn.Close()
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
 	defer cancel()