zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ISSUE 321]Merge pull request #324 from jameslcj/hotfix_321

Browse Source 
fix #321
This commit is contained in:
zhichen 2018-11-21 13:57:41 +08:00 committed by GitHub
commit 46648dbdce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
console/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js
View File

@ -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;

2
console/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js
View File

@ -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);

4
console/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js
View File

@ -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;

2
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js
View File

@ -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() {

4
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
View File

@ -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',

6
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js
View File

@ -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 = {};
}

6
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
View File

@ -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 {
</div>
),
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',

2
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js
View File

@ -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;

2
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js
View File

@ -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) {

4
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js
View File

@ -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,

2
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js
View File

@ -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',

8
console/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js
View File

@ -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;

2
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js
View File

@ -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,

2
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js
View File

@ -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(),

2
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js
View File

@ -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 }),

4
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
View File

@ -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(),

2
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js
View File

@ -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(),

4
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
View File

@ -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 => {

0
console/src/main/resources/static/css/main.8ecdd1f2.css → console/src/main/resources/static/css/main.a1b00967.css
View File

4
console/src/main/resources/static/index.html
View File

@ -28,7 +28,7 @@
<link rel="stylesheet" type="text/css" href="css/icon.css">
<link rel="stylesheet" type="text/css" href="css/font-awesome.css">
<!-- 第三方css结束 -->
<link href="./css/main.8ecdd1f2.css" rel="stylesheet"></head>
<link href="./css/main.a1b00967.css" rel="stylesheet"></head>
<body>
<div id="root" style="overflow:hidden"></div>
@ -49,6 +49,6 @@
<script src="js/merge.js"></script>
<script src="js/loader.js"></script>
<!-- 第三方js结束 -->
<script type="text/javascript" src="./js/main.26f10b18.js"></script></body>
<script type="text/javascript" src="./js/main.23a1a48a.js"></script></body>
</html>

4
console/src/main/resources/static/js/main.26f10b18.js → console/src/main/resources/static/js/main.23a1a48a.js
View File

File diff suppressed because one or more lines are too long