From 84032a536daae132a329814792e0e8d51f202ae8 Mon Sep 17 00:00:00 2001
From: "lin.huang" <lin.huang@apulis.com>
Date: Sun, 8 Oct 2023 19:43:15 +0800
Subject: [PATCH] fix bug:Implement option interface

---
 manifest/helm-charts/services/config.yaml        | 16 ++++++++--------
 .../discovery_register/k8s_discovery_register.go |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/manifest/helm-charts/services/config.yaml b/manifest/helm-charts/services/config.yaml
index 4d7178ebf..26a79d446 100644
--- a/manifest/helm-charts/services/config.yaml
+++ b/manifest/helm-charts/services/config.yaml
@@ -209,15 +209,15 @@ config:
   ###################### RPC Register Name Configuration ######################
   # RPC service names for registration, it's not recommended to modify these
   rpcRegisterName:
-    openImUserName: openimserver-openim-rpc-user
-    openImFriendName: openimserver-openim-rpc-friend
-    openImMsgName: openimserver-openim-rpc-msg
-    openImPushName: openimserver-openim-push
+    openImUserName: openimserver-openim-rpc-user:80
+    openImFriendName: openimserver-openim-rpc-friend:80
+    openImMsgName: openimserver-openim-rpc-msg:80
+    openImPushName: openimserver-openim-push:80
     openImMessageGatewayName: openimserver-openim-msggateway:88
-    openImGroupName: openimserver-openim-rpc-group
-    openImAuthName: openimserver-openim-rpc-auth
-    openImConversationName: openimserver-openim-rpc-conversation
-    openImThirdName: openimserver-openim-rpc-third
+    openImGroupName: openimserver-openim-rpc-group:80
+    openImAuthName: openimserver-openim-rpc-auth:80
+    openImConversationName: openimserver-openim-rpc-conversation:80
+    openImThirdName: openimserver-openim-rpc-third:80
 
   ###################### Log Configuration ######################
   # Log configuration
diff --git a/pkg/common/discovery_register/k8s_discovery_register.go b/pkg/common/discovery_register/k8s_discovery_register.go
index 06d8b2566..e97fcdc15 100644
--- a/pkg/common/discovery_register/k8s_discovery_register.go
+++ b/pkg/common/discovery_register/k8s_discovery_register.go
@@ -34,6 +34,7 @@ func NewDiscoveryRegister(envType string) (discoveryregistry.SvcDiscoveryRegistr
 }
 
 type K8sDR struct {
+	options         []grpc.DialOption
 	rpcRegisterAddr string
 }
 
@@ -65,19 +66,19 @@ func (cli *K8sDR) GetConfFromRegistry(key string) ([]byte, error) {
 }
 func (cli *K8sDR) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) {
 
-	conn, err := grpc.DialContext(ctx, serviceName, grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
 	return []*grpc.ClientConn{conn}, err
 }
 func (cli *K8sDR) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
 
-	return grpc.DialContext(ctx, serviceName, grpc.WithInsecure())
+	return grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
 }
 func (cli *K8sDR) GetSelfConnTarget() string {
 
 	return cli.rpcRegisterAddr
 }
 func (cli *K8sDR) AddOption(opts ...grpc.DialOption) {
-
+	cli.options = append(cli.options, opts...)
 }
 func (cli *K8sDR) CloseConn(conn *grpc.ClientConn) {
 	conn.Close()