Merge 7eaa226b41 into eb3adf0f0a

tiny fix
2025-05-30 09:52:57 +08:00 · 2024-02-28 15:34:18 +08:00 · 2024-02-28 15:29:07 +08:00 · 2024-01-12 10:32:59 +08:00
1 changed files with 5 additions and 2 deletions
--- a/clients/config_client/config_client.go
+++ b/clients/config_client/config_client.go
@ -507,14 +507,17 @@ func (client *ConfigClient) refreshContentAndCheck(cacheData cacheData, notify b
 			cacheData.group, cacheData.tenant)
 		return
 	}
-	if configQueryResponse != nil && configQueryResponse.Response != nil && !configQueryResponse.IsSuccess() {
+	if configQueryResponse != nil && configQueryResponse.Response != nil &&
+		!configQueryResponse.IsSuccess() && configQueryResponse.GetErrorCode() != 300 {
 		logger.Errorf("refresh cached config from server error:%v, dataId=%s, group=%s", configQueryResponse.GetMessage(),
 			cacheData.dataId, cacheData.group)
 		return
 	}
 	cacheData.content = configQueryResponse.Content
-	cacheData.contentType = configQueryResponse.ContentType
 	cacheData.encryptedDataKey = configQueryResponse.EncryptedDataKey
+	if len(strings.TrimSpace(configQueryResponse.ContentType)) > 0 {
+		cacheData.contentType = configQueryResponse.ContentType
+	}
 	if notify {
 		logger.Infof("[config_rpc_client] [data-received] dataId=%s, group=%s, tenant=%s, md5=%s, content=%s, type=%s",
 			cacheData.dataId, cacheData.group, cacheData.tenant, cacheData.md5,
Author	SHA1	Message	Date
brother-戎	856962fa10	Merge `7eaa226b41` into `eb3adf0f0a`	2025-05-30 09:52:57 +08:00
liurong.liu	7eaa226b41	tiny fix	2024-02-28 15:34:18 +08:00
liurong.liu	a7143099e8	tiny fix	2024-02-28 15:29:07 +08:00
liurong	37002fe12b	fix up	2024-01-12 10:32:59 +08:00