diff --git a/projects/WebMVC/wwwroot/js/axios.js b/projects/WebMVC/wwwroot/js/axios.js
index f0f7ef7d..cb711ded 100644
--- a/projects/WebMVC/wwwroot/js/axios.js
+++ b/projects/WebMVC/wwwroot/js/axios.js
@@ -35,7 +35,7 @@ axios.interceptors.response.use(function (response) {
.catch(function (error) {
if (error.response.status === 401) {
console.log('refreshToken 已过期');
- router.push('/router/login');
+ router.push('/routes/login.html');
}
else {
console.error(error);
diff --git a/projects/WebMVC/wwwroot/js/components.js b/projects/WebMVC/wwwroot/js/components.js
index 03f1bfe1..1b8aa852 100644
--- a/projects/WebMVC/wwwroot/js/components.js
+++ b/projects/WebMVC/wwwroot/js/components.js
@@ -1,25 +1,25 @@
Vue.component('pagination', function (resolve, reject) {
- axios.get("/router/shared/pagination.html").then(function (response) {
+ axios.get("/routes/shared/pagination.html").then(function (response) {
resolve(parseModel(response));
});
});
Vue.component('layout', function (resolve, reject) {
- axios.get("/router/shared/layout.html").then(function (response) {
+ axios.get("/routes/shared/layout.html").then(function (response) {
resolve(parseModel(response));
});
});
Vue.component('list', function (resolve, reject) {
- axios.get("/router/shared/list.html").then(function (response) {
+ axios.get("/routes/shared/list.html").then(function (response) {
resolve(parseModel(response));
});
});
Vue.component('display', function (resolve, reject) {
- axios.get("/router/shared/display.html").then(function (response) {
+ axios.get("/routes/shared/display.html").then(function (response) {
resolve(parseModel(response));
});
});
Vue.component('update', function (resolve, reject) {
- axios.get("/router/shared/update.html").then(function (response) {
+ axios.get("/routes/shared/update.html").then(function (response) {
resolve(parseModel(response));
});
});
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/js/form.js b/projects/WebMVC/wwwroot/js/form.js
index 848490c1..aff94c2f 100644
--- a/projects/WebMVC/wwwroot/js/form.js
+++ b/projects/WebMVC/wwwroot/js/form.js
@@ -21,6 +21,6 @@
];
for (var i = 0; i < formComponents.length; i++) {
var name = formComponents[i];
- var url = "/router/shared/" + name.replace('-', '/') + ".html";
+ var url = "/routes/shared/" + name.replace('-', '/') + ".html";
vueComponent(name, url);
}
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/js/route.js b/projects/WebMVC/wwwroot/js/route.js
index 22551892..278762e5 100644
--- a/projects/WebMVC/wwwroot/js/route.js
+++ b/projects/WebMVC/wwwroot/js/route.js
@@ -1,7 +1,7 @@
var routes = [];
const router = new VueRouter();
router.beforeEach((to, from, next) => {
- if (to.path !== '/router/login.html') {
+ if (to.path !== '/routes/login.html') {
var isAuthenticated = false;
if (store.state.token.accessToken) {
var jwt = jwt_decode(store.state.token.accessToken);
@@ -10,12 +10,12 @@ router.beforeEach((to, from, next) => {
if (!isAuthenticated) {
store.commit('logout');
setTimeout(function () {
- router.push('/router/login.html');
+ router.push('/routes/login.html');
}, 1000);
return;
}
}
- var url = to.path === '/' ? '/router/home.html' : to.path;
+ var url = to.path === '/' ? '/routes/home.html' : to.path;
var name = url.replace(/\//g, "-").replace(/\./g, "-").substring(1);
var route = routes[name];
if (!route) {
@@ -34,7 +34,7 @@ router.beforeEach((to, from, next) => {
}
else {
if (to.path === from.path) {
- router.push({ path: '/router/shared/redirect.html', query: { url: to.fullPath } })
+ router.push({ path: '/routes/shared/redirect.html', query: { url: to.fullPath } })
}
else {
next();
diff --git a/projects/WebMVC/wwwroot/router/admin/command/detail.html b/projects/WebMVC/wwwroot/routes/admin/command/detail.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/admin/command/detail.html
rename to projects/WebMVC/wwwroot/routes/admin/command/detail.html
diff --git a/projects/WebMVC/wwwroot/router/admin/command/edit.html b/projects/WebMVC/wwwroot/routes/admin/command/edit.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/admin/command/edit.html
rename to projects/WebMVC/wwwroot/routes/admin/command/edit.html
diff --git a/projects/WebMVC/wwwroot/router/admin/command/index.html b/projects/WebMVC/wwwroot/routes/admin/command/index.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/admin/command/index.html
rename to projects/WebMVC/wwwroot/routes/admin/command/index.html
diff --git a/projects/WebMVC/wwwroot/router/admin/index.html b/projects/WebMVC/wwwroot/routes/admin/index.html
similarity index 95%
rename from projects/WebMVC/wwwroot/router/admin/index.html
rename to projects/WebMVC/wwwroot/routes/admin/index.html
index 6a8d9862..7aa248fb 100644
--- a/projects/WebMVC/wwwroot/router/admin/index.html
+++ b/projects/WebMVC/wwwroot/routes/admin/index.html
@@ -9,7 +9,7 @@
{{item.name}}
{{item.deviceCount}}
-
+
@@ -23,7 +23,7 @@
{{item.name}}
{{item.deviceCount}}
-
+
-
+
diff --git a/projects/WebMVC/wwwroot/router/login.html b/projects/WebMVC/wwwroot/routes/login.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/login.html
rename to projects/WebMVC/wwwroot/routes/login.html
diff --git a/projects/WebMVC/wwwroot/router/node.html b/projects/WebMVC/wwwroot/routes/node.html
similarity index 99%
rename from projects/WebMVC/wwwroot/router/node.html
rename to projects/WebMVC/wwwroot/routes/node.html
index b08e9249..efeb1a17 100644
--- a/projects/WebMVC/wwwroot/router/node.html
+++ b/projects/WebMVC/wwwroot/routes/node.html
@@ -158,7 +158,7 @@
if (vm.node.id === item.id) {
if (method.indexOf('Deleted') >= 0) {
console.log('node has deleted');
- router.push('/router/nodes.html');
+ router.push('/routes/nodes.html');
}
else {
vm.load();
diff --git a/projects/WebMVC/wwwroot/router/nodes.html b/projects/WebMVC/wwwroot/routes/nodes.html
similarity index 98%
rename from projects/WebMVC/wwwroot/router/nodes.html
rename to projects/WebMVC/wwwroot/routes/nodes.html
index 77bfad41..1c702255 100644
--- a/projects/WebMVC/wwwroot/router/nodes.html
+++ b/projects/WebMVC/wwwroot/routes/nodes.html
@@ -26,7 +26,7 @@
{{item.count}}
-
+
diff --git a/projects/WebMVC/wwwroot/router/product.html b/projects/WebMVC/wwwroot/routes/product.html
similarity index 99%
rename from projects/WebMVC/wwwroot/router/product.html
rename to projects/WebMVC/wwwroot/routes/product.html
index 6603dc47..93ac378b 100644
--- a/projects/WebMVC/wwwroot/router/product.html
+++ b/projects/WebMVC/wwwroot/routes/product.html
@@ -40,7 +40,7 @@
-
+
diff --git a/projects/WebMVC/wwwroot/router/shared/add.html b/projects/WebMVC/wwwroot/routes/shared/add.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/add.html
rename to projects/WebMVC/wwwroot/routes/shared/add.html
diff --git a/projects/WebMVC/wwwroot/router/shared/detail.html b/projects/WebMVC/wwwroot/routes/shared/detail.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/detail.html
rename to projects/WebMVC/wwwroot/routes/shared/detail.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display.html b/projects/WebMVC/wwwroot/routes/shared/display.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display.html
rename to projects/WebMVC/wwwroot/routes/shared/display.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/boolean.html b/projects/WebMVC/wwwroot/routes/shared/display/boolean.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/boolean.html
rename to projects/WebMVC/wwwroot/routes/shared/display/boolean.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/cron.html b/projects/WebMVC/wwwroot/routes/shared/display/cron.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/cron.html
rename to projects/WebMVC/wwwroot/routes/shared/display/cron.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/html.html b/projects/WebMVC/wwwroot/routes/shared/display/html.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/html.html
rename to projects/WebMVC/wwwroot/routes/shared/display/html.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/imageurl.html b/projects/WebMVC/wwwroot/routes/shared/display/imageurl.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/imageurl.html
rename to projects/WebMVC/wwwroot/routes/shared/display/imageurl.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/integer.html b/projects/WebMVC/wwwroot/routes/shared/display/integer.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/integer.html
rename to projects/WebMVC/wwwroot/routes/shared/display/integer.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/multilinetext.html b/projects/WebMVC/wwwroot/routes/shared/display/multilinetext.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/multilinetext.html
rename to projects/WebMVC/wwwroot/routes/shared/display/multilinetext.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/multiselectlist.html b/projects/WebMVC/wwwroot/routes/shared/display/multiselectlist.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/multiselectlist.html
rename to projects/WebMVC/wwwroot/routes/shared/display/multiselectlist.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/selectlist.html b/projects/WebMVC/wwwroot/routes/shared/display/selectlist.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/selectlist.html
rename to projects/WebMVC/wwwroot/routes/shared/display/selectlist.html
diff --git a/projects/WebMVC/wwwroot/router/shared/display/string.html b/projects/WebMVC/wwwroot/routes/shared/display/string.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/display/string.html
rename to projects/WebMVC/wwwroot/routes/shared/display/string.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit.html b/projects/WebMVC/wwwroot/routes/shared/edit.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit.html
rename to projects/WebMVC/wwwroot/routes/shared/edit.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/boolean.html b/projects/WebMVC/wwwroot/routes/shared/edit/boolean.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/boolean.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/boolean.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/cron.html b/projects/WebMVC/wwwroot/routes/shared/edit/cron.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/cron.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/cron.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/html.html b/projects/WebMVC/wwwroot/routes/shared/edit/html.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/html.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/html.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/imageurl.html b/projects/WebMVC/wwwroot/routes/shared/edit/imageurl.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/imageurl.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/imageurl.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/multilinetext.html b/projects/WebMVC/wwwroot/routes/shared/edit/multilinetext.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/multilinetext.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/multilinetext.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/multiselectlist.html b/projects/WebMVC/wwwroot/routes/shared/edit/multiselectlist.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/multiselectlist.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/multiselectlist.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/password.html b/projects/WebMVC/wwwroot/routes/shared/edit/password.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/password.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/password.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/selectlist.html b/projects/WebMVC/wwwroot/routes/shared/edit/selectlist.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/selectlist.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/selectlist.html
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/string.html b/projects/WebMVC/wwwroot/routes/shared/edit/string.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/edit/string.html
rename to projects/WebMVC/wwwroot/routes/shared/edit/string.html
diff --git a/projects/WebMVC/wwwroot/router/shared/index.html b/projects/WebMVC/wwwroot/routes/shared/index.html
similarity index 100%
rename from projects/WebMVC/wwwroot/router/shared/index.html
rename to projects/WebMVC/wwwroot/routes/shared/index.html
diff --git a/projects/WebMVC/wwwroot/router/shared/layout.html b/projects/WebMVC/wwwroot/routes/shared/layout.html
similarity index 91%
rename from projects/WebMVC/wwwroot/router/shared/layout.html
rename to projects/WebMVC/wwwroot/routes/shared/layout.html
index 8eac5daa..816120d1 100644
--- a/projects/WebMVC/wwwroot/router/shared/layout.html
+++ b/projects/WebMVC/wwwroot/routes/shared/layout.html
@@ -9,12 +9,12 @@
首页