Skip to content

GitLab

S
speech_nlu_parse
Commit 14380081 authored by 赵文静's avatar 赵文静
Browse files
Options

修改服务发现

parent 6d25bf66
Pipeline #5203 passed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 34 additions and 4 deletions
    service/connect/alarm.go
    View file @ 14380081
    ...@@ -2,6 +2,8 @@ package connect ...@@ -2,6 +2,8 @@ package connect
    import ( import (
    "context" "context"
    "fmt"
    "google.golang.org/grpc"
    "speech-nlu-parse/global" "speech-nlu-parse/global"
    "speech-nlu-parse/model" "speech-nlu-parse/model"
    "speech-nlu-parse/pkg/logger" "speech-nlu-parse/pkg/logger"
    ...@@ -14,11 +16,24 @@ const ( ...@@ -14,11 +16,24 @@ const (
    ) )
    func AlarmGrpc(params *model.SpeechDomainParams, api, extra, object string) (*proto.AlarmRemindSkillResponse, error) { 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 { if err != nil {
    global.Logger.Errorf("faild to connect: %v", err)
    return nil, err return nil, err
    } }
    defer conn.Close()
    ctx, cancel := context.WithTimeout(context.Background(), time.Second*2) ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
    defer cancel() defer cancel()
    ......
    service/connect/music.go
    View file @ 14380081
    ...@@ -2,6 +2,8 @@ package connect ...@@ -2,6 +2,8 @@ package connect
    import ( import (
    "context" "context"
    "fmt"
    "google.golang.org/grpc"
    "speech-nlu-parse/global" "speech-nlu-parse/global"
    "speech-nlu-parse/model" "speech-nlu-parse/model"
    "speech-nlu-parse/pkg/logger" "speech-nlu-parse/pkg/logger"
    ...@@ -14,11 +16,24 @@ const ( ...@@ -14,11 +16,24 @@ const (
    ) )
    func MusicGrpc(params *model.SpeechDomainParams) (*proto.MusicSpotResponse, error) { 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 { if err != nil {
    global.Logger.Errorf("faild to connect: %v", err)
    return nil, err return nil, err
    } }
    defer conn.Close()
    ctx, cancel := context.WithTimeout(context.Background(), time.Second*2) ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
    defer cancel() defer cancel()
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment