From 7f229a10b55c6a98da8bb6a19a3abf8b4f0051ae Mon Sep 17 00:00:00 2001
From: liaochuntao <liaochuntao@live.com>
Date: Tue, 24 Oct 2023 09:21:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BD=AC=E6=8D=A2=E4=B8=8D=E5=AF=B9=20&=20?=
=?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=8F=E8=BF=B0=E4=B8=8D=E5=AF=B9=20(#1274?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/model/config_file.go | 2 +-
service/client_v1.go | 4 ++++
version | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/model/config_file.go b/common/model/config_file.go
index a8dc04f26..12057b708 100644
--- a/common/model/config_file.go
+++ b/common/model/config_file.go
@@ -424,7 +424,7 @@ func FromTagMap(kvs map[string]string) []*config_manage.ConfigFileTag {
func ToTagMap(tags []*config_manage.ConfigFileTag) map[string]string {
kvs := map[string]string{}
for i := range tags {
- kvs[tags[i].GetKey().GetValue()] = tags[i].GetKey().GetValue()
+ kvs[tags[i].GetKey().GetValue()] = tags[i].GetValue().GetValue()
}
return kvs
diff --git a/service/client_v1.go b/service/client_v1.go
index 2b900b51b..cb4214b9f 100644
--- a/service/client_v1.go
+++ b/service/client_v1.go
@@ -494,22 +494,26 @@ func (s *Server) getServiceCache(name string, namespace string) *model.Service {
func (s *Server) commonCheckDiscoverRequest(req *apiservice.Service, resp *apiservice.DiscoverResponse) bool {
if s.caches == nil {
resp.Code = utils.NewUInt32Value(uint32(apimodel.Code_ClientAPINotOpen))
+ resp.Info = utils.NewStringValue(api.Code2Info(resp.GetCode().GetValue()))
resp.Service = req
return false
}
if req == nil {
resp.Code = utils.NewUInt32Value(uint32(apimodel.Code_EmptyRequest))
+ resp.Info = utils.NewStringValue(api.Code2Info(resp.GetCode().GetValue()))
resp.Service = req
return false
}
if req.GetName().GetValue() == "" {
resp.Code = utils.NewUInt32Value(uint32(apimodel.Code_InvalidServiceName))
+ resp.Info = utils.NewStringValue(api.Code2Info(resp.GetCode().GetValue()))
resp.Service = req
return false
}
if req.GetNamespace().GetValue() == "" {
resp.Code = utils.NewUInt32Value(uint32(apimodel.Code_InvalidNamespaceName))
+ resp.Info = utils.NewStringValue(api.Code2Info(resp.GetCode().GetValue()))
resp.Service = req
return false
}
diff --git a/version b/version
index a2f6f2c9c..2b44162b1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v1.17.3
+v1.17.6