fix:xds server resource build cache fail

polarismesh · Mar 4, 2024 · f955f09 · f955f09
1 parent eb9c3da
commit f955f09
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/common/model/contract.go b/common/model/contract.go
@@ -98,6 +98,7 @@ func (e *EnrichServiceContract) ToSpec() *apiservice.ServiceContract {
 		interfaces = append(interfaces, &apiservice.InterfaceDescriptor{
 			Id:       item.ID,
 			Path:     item.Path,
+			Name:     item.Name,
 			Method:   item.Method,
 			Source:   item.Source,
 			Content:  item.Content,

diff --git a/service/client_v1.go b/service/client_v1.go
@@ -673,26 +673,12 @@ func (s *Server) serviceContractCheckDiscoverRequest(req *apiservice.ServiceCont
 		resp.ServiceContract = req
 		return false
 	}
-	if req.GetService() == "" {
-		resp.Code = utils.NewUInt32Value(uint32(apimodel.Code_InvalidServiceName))
-		resp.Info = utils.NewStringValue(api.Code2Info(resp.GetCode().GetValue()))
-		resp.Service = svc
-		resp.ServiceContract = req
-		return false
-	}
 	if req.GetProtocol() == "" {
 		resp.Code = utils.NewUInt32Value(uint32(apimodel.Code_InvalidParameter))
 		resp.Info = utils.NewStringValue(api.Code2Info(resp.GetCode().GetValue()))
 		resp.Service = svc
 		resp.ServiceContract = req
 		return false
 	}
-	if req.GetVersion() == "" {
-		resp.Code = utils.NewUInt32Value(uint32(apimodel.Code_InvalidParameter))
-		resp.Info = utils.NewStringValue(api.Code2Info(resp.GetCode().GetValue()))
-		resp.Service = svc
-		resp.ServiceContract = req
-		return false
-	}
 	return true
 }
diff --git a/store/mysql/service_contract.go b/store/mysql/service_contract.go
@@ -150,7 +150,7 @@ func (s *serviceContractStore) AddServiceContractInterfaces(contract *model.Enri
 			addSql := "REPLACE INTO service_contract_detail(`id`, `contract_id`, `name`, `method`, `path` " +
 				" ,`content`,`revision`" +
 				",`flag`,`ctime`, `mtime`, `source`" +
-				") VALUES (?,?,?,?,?,?,?,sysdate(),sysdate(),?)"
+				") VALUES (?,?,?,?,?,?,?,?,sysdate(),sysdate(),?)"
 			if _, err := tx.Exec(addSql, []interface{}{
 				item.ID,
 				contract.ID,
@@ -182,7 +182,7 @@ func (s *serviceContractStore) AppendServiceContractInterfaces(contract *model.E
 			addSql := "REPLACE INTO service_contract_detail(`id`,`contract_id`, `name`, `method`, " +
 				" `path` ,`content`,`revision`" +
 				",`flag`,`ctime`, `mtime`,`source`" +
-				") VALUES (?,?,?,?,?,?,?,sysdate(),sysdate(),?)"
+				") VALUES (?,?,?,?,?,?,?,?,sysdate(),sysdate(),?)"
 
 			if _, err := tx.Exec(addSql, []interface{}{
 				item.ID,