change api version to config version
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
index 3c003e1..793cbaa 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/OverrideUtils.java
@@ -19,7 +19,6 @@
import org.apache.dubbo.admin.model.domain.*;
import org.apache.dubbo.admin.model.domain.Override;
import org.apache.dubbo.admin.model.dto.BalancingDTO;
-import org.apache.dubbo.admin.model.dto.Config;
import org.apache.dubbo.admin.model.dto.DynamicConfigDTO;
import org.apache.dubbo.admin.model.dto.WeightDTO;
import org.apache.dubbo.admin.model.store.OverrideConfig;
@@ -72,7 +71,7 @@
public static DynamicConfigDTO createFromOverride(OverrideDTO overrideDTO) {
DynamicConfigDTO dynamicConfigDTO = new DynamicConfigDTO();
- dynamicConfigDTO.setApiVersion(overrideDTO.getApiVersion());
+ dynamicConfigDTO.setConfigVersion(overrideDTO.getConfigVersion());
List<OverrideConfig> configs = new ArrayList<>();
for (OverrideConfig overrideConfig : overrideDTO.getConfigs()) {
if (overrideConfig.getType() == null) {
@@ -96,7 +95,7 @@
overrideDTO.setScope(Constants.SERVICE);
overrideDTO.setKey(dynamicConfigDTO.getService());
}
- overrideDTO.setApiVersion(dynamicConfigDTO.getApiVersion());
+ overrideDTO.setConfigVersion(dynamicConfigDTO.getConfigVersion());
overrideDTO.setConfigs(dynamicConfigDTO.getConfigs());
return overrideDTO;
}
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java
index f44afa7..183ff3c 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/dto/DynamicConfigDTO.java
@@ -23,7 +23,7 @@
public class DynamicConfigDTO extends BaseDTO {
- private String apiVersion;
+ private String configVersion;
private boolean dynamic;
private boolean enabled;
private List<OverrideConfig> configs;
@@ -37,12 +37,12 @@
this.configs = configs;
}
- public String getApiVersion() {
- return apiVersion;
+ public String getConfigVersion() {
+ return configVersion;
}
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
+ public void setConfigVersion(String configVersion) {
+ this.configVersion = configVersion;
}
public boolean isDynamic() {
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java
index 7c929d8..0a1862a 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/model/store/OverrideDTO.java
@@ -17,14 +17,12 @@
package org.apache.dubbo.admin.model.store;
-import org.apache.dubbo.admin.model.dto.Config;
-
import java.util.List;
public class OverrideDTO {
private String key;
private String scope;
- private String apiVersion;
+ private String configVersion;
private boolean dynamic;
private boolean enabled;
private List<OverrideConfig> configs;
@@ -45,12 +43,12 @@
this.scope = scope;
}
- public String getApiVersion() {
- return apiVersion;
+ public String getConfigVersion() {
+ return configVersion;
}
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
+ public void setConfigVersion(String configVersion) {
+ this.configVersion = configVersion;
}
public boolean isDynamic() {
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index cec8aec..6c773bc 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -186,7 +186,7 @@
],
template:
- 'apiVersion: v2.7\n' +
+ 'configVersion: v2.7\n' +
'enabled: true\n' +
'runtime: true\n' +
'force: true\n' +
