diff --git a/console/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js b/console/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js index dcdbbb5ee..d76bb7d57 100644 --- a/console/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js +++ b/console/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js @@ -60,7 +60,7 @@ class EditorNameSpace extends React.Component { this.field.setValues(record); request({ type: 'get', - url: `/nacos/v1/console/namespaces?show=all&namespaceId=${record.namespace}`, + url: `v1/console/namespaces?show=all&namespaceId=${record.namespace}`, success: res => { if (res !== null) { this.field.setValue('namespaceDesc', res.namespaceDesc); @@ -89,7 +89,7 @@ class EditorNameSpace extends React.Component { beforeSend: () => { this.openLoading(); }, - url: '/nacos/v1/console/namespaces', + url: 'v1/console/namespaces', contentType: 'application/x-www-form-urlencoded', data: { namespace: values.namespace, @@ -120,7 +120,7 @@ class EditorNameSpace extends React.Component { setTimeout(() => { request({ type: 'get', - url: '/nacos/v1/console/namespaces', + url: 'v1/console/namespaces', success: res => { if (res.code === 200) { window.namespaceList = res.data; diff --git a/console/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js b/console/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js index 3a06c07d3..ef2235abc 100644 --- a/console/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js +++ b/console/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js @@ -99,7 +99,7 @@ class NameSpaceList extends React.Component { } else { request({ type: 'get', - url: '/nacos/v1/console/namespaces', + url: 'v1/console/namespaces', success: res => { if (res.code === 200) { this.handleNameSpaces(res.data); diff --git a/console/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js b/console/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js index a587129dc..853fc88c4 100644 --- a/console/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js +++ b/console/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js @@ -103,7 +103,7 @@ class NewNameSpace extends React.Component { }); request({ type: 'post', - url: '/nacos/v1/console/namespaces', + url: 'v1/console/namespaces', contentType: 'application/x-www-form-urlencoded', beforeSend: () => { this.openLoading(); @@ -140,7 +140,7 @@ class NewNameSpace extends React.Component { setTimeout(() => { request({ type: 'get', - url: '/nacos/v1/console/namespaces', + url: 'v1/console/namespaces', success: res => { if (res.code === 200) { window.namespaceList = res.data; diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js index d733990e7..2b02570f6 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js @@ -96,7 +96,7 @@ class ConfigDetail extends React.Component { this.tenant = getParams('namespace') || ''; this.edasAppName = getParams('edasAppName') || ''; this.inApp = this.edasAppName; - const url = `/nacos/v1/cs/configs?show=all&dataId=${this.dataId}&group=${this.group}`; + const url = `v1/cs/configs?show=all&dataId=${this.dataId}&group=${this.group}`; request({ url, beforeSend() { diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js index c138d0998..0ee6e0032 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js @@ -157,7 +157,7 @@ class ConfigEditor extends React.Component { const self = this; this.tenant = getParams('namespace') || ''; this.serverId = getParams('serverId') || 'center'; - const url = `/nacos/v1/cs/configs?show=all&dataId=${this.dataId}&group=${this.group}`; + const url = `v1/cs/configs?show=all&dataId=${this.dataId}&group=${this.group}`; request({ url, beforeSend() { @@ -343,7 +343,7 @@ class ConfigEditor extends React.Component { content, tenant: this.tenant, }; - const url = '/nacos/v1/cs/configs'; + const url = 'v1/cs/configs'; request({ type: 'post', contentType: 'application/x-www-form-urlencoded', diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js index 68958ebbb..5ad2509ef 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js @@ -60,7 +60,7 @@ class ConfigRollback extends React.Component { const self = this; this.tenant = getParams('namespace') || ''; this.serverId = getParams('serverId') || 'center'; - const url = `/nacos/v1/cs/history?dataId=${this.dataId}&group=${this.group}&nid=${this.nid}`; + const url = `v1/cs/history?dataId=${this.dataId}&group=${this.group}&nid=${this.nid}`; request({ url, success(result) { @@ -131,9 +131,9 @@ class ConfigRollback extends React.Component { tenant: self.tenant, }; - let url = '/nacos/v1/cs/configs'; + let url = 'v1/cs/configs'; if (self.opType.trim() === 'I') { - url = `/nacos/v1/cs/configs?dataId=${self.dataId}&group=${self.group}`; + url = `v1/cs/configs?dataId=${self.dataId}&group=${self.group}`; postData = {}; } diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js index bbbee89dc..65057e4b4 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js @@ -344,9 +344,9 @@ class ConfigurationManagement extends React.Component { this.serverId = getParams('serverId') || ''; let urlPrefix = ''; if (this.dataId.indexOf('*') !== -1 || this.group.indexOf('*') !== -1) { - urlPrefix = '/nacos/v1/cs/configs?search=blur'; + urlPrefix = 'v1/cs/configs?search=blur'; } else { - urlPrefix = '/nacos/v1/cs/configs?search=accurate'; + urlPrefix = 'v1/cs/configs?search=accurate'; } request({ @@ -432,7 +432,7 @@ class ConfigurationManagement extends React.Component { ), onOk: () => { - const url = `/nacos/v1/cs/configs?dataId=${record.dataId}&group=${record.group}`; + const url = `v1/cs/configs?dataId=${record.dataId}&group=${record.group}`; request({ url, type: 'delete', diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js index a8f0d2195..c24b8f7f2 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js @@ -59,7 +59,7 @@ class HistoryDetail extends React.Component { const self = this; request({ - url: `/nacos/v1/cs/history?dataId=${this.dataId}&group=${this.group}&nid=${this.nid}`, + url: `v1/cs/history?dataId=${this.dataId}&group=${this.group}&nid=${this.nid}`, success(result) { if (result != null) { const data = result; diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js index 535f799b4..498cac715 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js @@ -123,7 +123,7 @@ class HistoryRollback extends React.Component { beforeSend() { self.openLoading(); }, - url: `/nacos/v1/cs/history?search=accurate&dataId=${this.dataId}&group=${ + url: `v1/cs/history?search=accurate&dataId=${this.dataId}&group=${ this.group }&&pageNo=${pageNo}&pageSize=${this.state.pageSize}`, success(data) { diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js index 6b436abd4..07ce2514a 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js @@ -68,7 +68,7 @@ class ListeningToQuery extends React.Component { const type = this.getValue('type'); if (type === 1) { const ip = this.getValue('ip'); - queryUrl = `/nacos/v1/cs/listener?ip=${ip}`; + queryUrl = `v1/cs/listener?ip=${ip}`; const tenant = window.nownamespace || getParams('namespace') || ''; if (tenant) { queryUrl += `&tenant=${tenant}`; @@ -77,7 +77,7 @@ class ListeningToQuery extends React.Component { const dataId = this.getValue('dataId'); const group = this.getValue('group'); if (!dataId || !group) return false; - queryUrl = `/nacos/v1/cs/configs/listener?dataId=${dataId}&group=${group}`; + queryUrl = `v1/cs/configs/listener?dataId=${dataId}&group=${group}`; } request({ url: queryUrl, diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js index 5cabbfa45..1f0a03eda 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js +++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js @@ -239,7 +239,7 @@ class NewConfig extends React.Component { tenant: this.tenant, }; this.serverId = getParams('serverId') || 'center'; - const url = '/nacos/v1/cs/configs'; + const url = 'v1/cs/configs'; request({ type: 'post', contentType: 'application/x-www-form-urlencoded', diff --git a/console/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js b/console/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js index 717cb16f5..f92a52a2f 100644 --- a/console/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js +++ b/console/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js @@ -42,7 +42,7 @@ class NameSpace extends React.Component { request({ type: 'get', beforeSend() {}, - url: '/nacos/v1/console/namespaces', + url: 'v1/console/namespaces', success: res => { if (res.code === 200) { const data = res.data || []; @@ -98,7 +98,7 @@ class NameSpace extends React.Component { detailNamespace(record) { const { namespace } = record; // 获取ak,sk request({ - url: `/nacos/v1/console/namespaces?show=all&namespaceId=${namespace}`, + url: `v1/console/namespaces?show=all&namespaceId=${namespace}`, beforeSend: () => { this.openLoading(); }, @@ -177,7 +177,7 @@ class NameSpace extends React.Component { ), language: aliwareIntl.currentLanguageCode || 'zh-cn', onOk: () => { - const url = `/nacos/v1/console/namespaces?namespaceId=${record.namespace}`; + const url = `v1/console/namespaces?namespaceId=${record.namespace}`; request({ url, type: 'delete', @@ -214,7 +214,7 @@ class NameSpace extends React.Component { refreshNameSpace() { request({ type: 'get', - url: '/nacos/v1/console/namespaces', + url: 'v1/console/namespaces', success: res => { if (res.code === 200) { window.namespaceList = res.data; diff --git a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js index c0f0aa090..82785d369 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js +++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js @@ -54,7 +54,7 @@ class EditClusterDialog extends React.Component { } = this.state.editCluster; request({ method: 'POST', - url: '/nacos/v1/ns/cluster/update', + url: 'v1/ns/cluster/update', data: { serviceName, clusterName: name, diff --git a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js index 4c29bc6e8..c7216ca99 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js +++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js @@ -46,7 +46,7 @@ class EditInstanceDialog extends React.Component { const { ip, port, weight, enabled, metadataText } = this.state.editInstance; request({ method: 'POST', - url: '/nacos/v1/ns/instance/update', + url: 'v1/ns/instance/update', data: { serviceName, clusterName, ip, port, weight, enable: enabled, metadata: metadataText }, dataType: 'text', beforeSend: () => openLoading(), diff --git a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js index e0248973d..5c782df73 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js +++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js @@ -48,7 +48,7 @@ class EditServiceDialog extends React.Component { const { name, protectThreshold, healthCheckMode, metadataText } = editService; request({ method: isCreate ? 'PUT' : 'POST', - url: `/nacos/v1/ns/service/${isCreate ? 'create' : 'update'}`, + url: `v1/ns/service/${isCreate ? 'create' : 'update'}`, data: { serviceName: name, protectThreshold, healthCheckMode, metadata: metadataText }, dataType: 'text', beforeSend: () => this.setState({ loading: true }), diff --git a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js index 4eef3f481..5e7214bf1 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js +++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js @@ -51,7 +51,7 @@ class InstanceTable extends React.Component { if (!clusterName) return; const { pageSize, pageNum } = this.state; request({ - url: '/nacos/v1/ns/catalog/instanceList', + url: 'v1/ns/catalog/instanceList', data: { serviceName, clusterName, @@ -76,7 +76,7 @@ class InstanceTable extends React.Component { newVal.list[index].enabled = !enabled; request({ method: 'POST', - url: '/nacos/v1/ns/instance/update', + url: 'v1/ns/instance/update', data: { serviceName, clusterName, ip, port, weight, enable: !enabled }, dataType: 'text', beforeSend: () => this.openLoading(), diff --git a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js index 4b240c6fb..2cacfccd6 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js +++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js @@ -53,7 +53,7 @@ class ServiceDetail extends React.Component { getServiceDetail() { const { serviceName } = this.state; request({ - url: `/nacos/v1/ns/catalog/serviceDetail?serviceName=${serviceName}`, + url: `v1/ns/catalog/serviceDetail?serviceName=${serviceName}`, beforeSend: () => this.openLoading(), success: ({ clusters = [], service = {} }) => this.setState({ service, clusters }), complete: () => this.closeLoading(), diff --git a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js index ff2584a6a..d6754dd4d 100644 --- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js +++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js @@ -69,7 +69,7 @@ class ServiceList extends React.Component { const { currentPage, pageSize, keyword } = this.state; const parameter = [`startPg=${currentPage}`, `pgSize=${pageSize}`, `keyword=${keyword}`]; request({ - url: `/nacos/v1/ns/catalog/serviceList?${parameter.join('&')}`, + url: `v1/ns/catalog/serviceList?${parameter.join('&')}`, beforeSend: () => this.openLoading(), success: ({ count = 0, serviceList = [] } = {}) => { this.setState({ @@ -98,7 +98,7 @@ class ServiceList extends React.Component { onOk: () => { request({ method: 'DELETE', - url: `/nacos/v1/ns/service/remove?serviceName=${serviceName}`, + url: `v1/ns/service/remove?serviceName=${serviceName}`, dataType: 'text', beforeSend: () => this.openLoading(), success: res => { diff --git a/console/src/main/resources/static/css/main.8ecdd1f2.css b/console/src/main/resources/static/css/main.a1b00967.css similarity index 100% rename from console/src/main/resources/static/css/main.8ecdd1f2.css rename to console/src/main/resources/static/css/main.a1b00967.css diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html index 051b592bf..04a7e070f 100644 --- a/console/src/main/resources/static/index.html +++ b/console/src/main/resources/static/index.html @@ -28,7 +28,7 @@ - +
@@ -49,6 +49,6 @@ - +