重命名router目录为routes

Former-commit-id: 5e43716f2dbe86ff7ebf0ed15389da715ee19f51
Former-commit-id: eeb64770c8361a713ad549b46ecbb4c5ffb000b2

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

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

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

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

projects/WebMVC/wwwroot/routes/admin/index.html

@@ -9,7 +9,7 @@
                             <h3 class="card-title">{{item.name}}</h3>
                             <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.deviceCount}}</span></div>
                         </div>
-                        <router-link :to="'/router/shared/index.html?area=admin&entity=Device&query.productId='+item.id" class="card-body" style="display:block;text-align:center;">
+                        <router-link :to="'/routes/shared/index.html?area=admin&entity=Device&query.productId='+item.id" class="card-body" style="display:block;text-align:center;">
                             <img alt="@item.Name" :src="item.image" style="margin:0 auto;width:64px;" />
                         </router-link>
                     </div>
@@ -23,7 +23,7 @@
                             <h3 class="card-title">{{item.name}}</h3>
                             <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.deviceCount}}</span></div>
                         </div>
-                        <router-link :to="'/router/shared/index.html?area=admin&entity=Device&query.nodeId='+item.id" class="card-body" style="display:block;text-align:center;">
+                        <router-link :to="'/routes/shared/index.html?area=admin&entity=Device&query.nodeId='+item.id" class="card-body" style="display:block;text-align:center;">
                             <img alt="@item.Name" :src="item.image" style="margin:0 auto;width:64px;" />
                         </router-link>
                         <div class="card-footer text-center">

projects/WebMVC/wwwroot/routes/home.html

@@ -7,7 +7,7 @@
                         <h3 class="card-title">{{item.name}}</h3>
                         <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.count}}</span></div>
                     </div>
-                    <router-link :to="{path:'/router/product.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
+                    <router-link :to="{path:'/routes/product.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
                         <img :src="baseUrl+item.image" style="margin: 0px auto; width: 64px;">
                     </router-link>
                 </div>

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

projects/WebMVC/wwwroot/routes/nodes.html

@@ -26,7 +26,7 @@
                         </h3>
                         <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.count}}</span></div>
                     </div>
-                    <router-link :to="{path:'/router/node.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
+                    <router-link :to="{path:'/routes/node.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
                         <img :src="baseUrl+item.image" style="margin: 0px auto; width: 64px;">
                     </router-link>
                     <div class="card-footer text-center">

projects/WebMVC/wwwroot/routes/organs.html

@@ -6,7 +6,7 @@
                     <div class="card-header">
                         <h3 class="card-title">{{item.name}}</h3>
                     </div>
-                    <router-link :to="{path:'/router/organ.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
+                    <router-link :to="{path:'/routes/organ.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
                         <img :src="config.baseUrl+item.image" style="margin: 0px auto; width: 64px;">
                     </router-link>
                 </div>

projects/WebMVC/wwwroot/routes/product.html

@@ -40,7 +40,7 @@
                             </template>
                         </div>
                     </div>
-                    <router-link :to="{path:'/router/device.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
+                    <router-link :to="{path:'/routes/device.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
                         <img :src="baseUrl+product.image" style="margin: 0px auto; width: 64px;">
                         <div>
                             <template v-if="item.name==='光强检测器'">

projects/WebMVC/wwwroot/routes/shared/layout.html

@@ -9,12 +9,12 @@
                     <router-link to="/" :class="'nav-link'+(area==='default'?' active':'')">首页</router-link>
                 </li>
                 <li class="nav-item d-none d-sm-inline-block">
-                    <router-link to="/router/admin/index.html?area=admin" :class="'nav-link'+(area==='admin'?' active':'')">管理</router-link>
+                    <router-link to="/routes/admin/index.html?area=admin" :class="'nav-link'+(area==='admin'?' active':'')">管理</router-link>
                 </li>
             </ul>
             <ul class="navbar-nav ml-auto" v-if="data.username">
                 <li class="nav-item">
-                    <router-link class="nav-link" to="/router/user.html">{{data.username}}</router-link>
+                    <router-link class="nav-link" to="/routes/user.html">{{data.username}}</router-link>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" href="javascript:;" @click="logout">退出</a>
@@ -22,10 +22,10 @@
             </ul>
             <ul class="navbar-nav ml-auto" v-else>
                 <!--<li class="nav-item">
-                    <a class="nav-link" href="/router/register.html">注册</a>
+                    <a class="nav-link" href="/routes/register.html">注册</a>
                 </li>-->
                 <li class="nav-item">
-                    <router-link class="nav-link" to="/router/login.html">登录</router-link>
+                    <router-link class="nav-link" to="/routes/login.html">登录</router-link>
                 </li>
             </ul>
         </nav>
@@ -38,7 +38,7 @@
                 <nav class="mt-2">
                     <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" v-if="area==='default'">
                         <li class="nav-item">
-                            <router-link to="/" :class="getPageClass('/','/router/product.html','/router/device.html')">
+                            <router-link to="/" :class="getPageClass('/','/routes/product.html','/routes/device.html')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     首页
@@ -46,7 +46,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item">
-                            <router-link to="/router/nodes.html" :class="getPageClass('/router/nodes.html','/router/node.html')">
+                            <router-link to="/routes/nodes.html" :class="getPageClass('/routes/nodes.html','/routes/node.html')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     节点
@@ -56,7 +56,7 @@
                     </ul>
                     <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" v-if="area==='admin'">
                         <li class="nav-item">
-                            <router-link :key="$route.fullPath" to="/router/admin/index.html?area=admin" :class="getPageClass('/router/admin/index.html')">
+                            <router-link :key="$route.fullPath" to="/routes/admin/index.html?area=admin" :class="getPageClass('/routes/admin/index.html')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     首页
@@ -64,7 +64,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-Setting')">
-                            <router-link :key="$route.fullPath" to="/router/admin/setting/index.html?area=admin&entity=Setting" :class="getLinkClass('Setting')">
+                            <router-link :key="$route.fullPath" to="/routes/admin/setting/index.html?area=admin&entity=Setting" :class="getLinkClass('Setting')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     配置管理
@@ -72,7 +72,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-User')">
-                            <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=User" :class="getLinkClass('User')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=User" :class="getLinkClass('User')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     用户管理
@@ -87,7 +87,7 @@
                             </a>
                             <ul class="nav nav-treeview">
                                 <li class="nav-item" v-if="hasPermission('Read-Role')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Role" :class="getLinkClass('Role')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Role" :class="getLinkClass('Role')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             角色管理
@@ -95,7 +95,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-Permission')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Permission" :class="getLinkClass('Permission')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Permission" :class="getLinkClass('Permission')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             权限管理
@@ -112,7 +112,7 @@
                             </a>
                             <ul class="nav nav-treeview">
                                 <li class="nav-item" v-if="hasPermission('Read-Product')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Product" :class="getLinkClass('Product')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Product" :class="getLinkClass('Product')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             产品管理
@@ -120,7 +120,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-Api')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Api" :class="getLinkClass('Api')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Api" :class="getLinkClass('Api')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             接口管理
@@ -128,7 +128,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-Parameter')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Parameter" :class="getLinkClass('Parameter')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Parameter" :class="getLinkClass('Parameter')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             参数管理
@@ -145,7 +145,7 @@
                             </a>
                             <ul class="nav nav-treeview">
                                 <li class="nav-item" v-if="hasPermission('Read-Node')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Node" :class="getLinkClass('Node')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Node" :class="getLinkClass('Node')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             节点管理
@@ -153,7 +153,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-Device')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Device" :class="getLinkClass('Device')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Device" :class="getLinkClass('Device')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             设备管理
@@ -161,7 +161,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-Data')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Data" :class="getLinkClass('Data')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Data" :class="getLinkClass('Data')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             数据管理
@@ -169,7 +169,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-Command')">
-                                    <router-link :key="$route.fullPath" to="/router/admin/command/index.html?area=admin&entity=Command" :class="getLinkClass('Command')">
+                                    <router-link :key="$route.fullPath" to="/routes/admin/command/index.html?area=admin&entity=Command" :class="getLinkClass('Command')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             命令管理
@@ -186,7 +186,7 @@
                             </a>
                             <ul class="nav nav-treeview">
                                 <li class="nav-item" v-if="hasPermission('Read-Scene')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Scene" :class="getLinkClass('Scene')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Scene" :class="getLinkClass('Scene')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景管理
@@ -194,7 +194,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneCommand')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=SceneCommand" :class="getLinkClass('SceneCommand')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneCommand" :class="getLinkClass('SceneCommand')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景命令管理
@@ -202,7 +202,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTimer')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=SceneTimer" :class="getLinkClass('SceneTimer')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneTimer" :class="getLinkClass('SceneTimer')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             定时器管理
@@ -210,7 +210,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTigger')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=SceneTigger" :class="getLinkClass('SceneTigger')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneTigger" :class="getLinkClass('SceneTigger')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             触发器管理
@@ -227,7 +227,7 @@
                             </a>
                             <ul class="nav nav-treeview">
                                 <li class="nav-item" v-if="hasPermission('Read-Scene')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Scene&model=GlobalScene" :class="getLinkClass('GlobalScene')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Scene&model=GlobalScene" :class="getLinkClass('GlobalScene')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景管理
@@ -235,7 +235,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneCommand')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=SceneCommand&model=GlobalSceneCommand" :class="getLinkClass('GlobalSceneCommand')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneCommand&model=GlobalSceneCommand" :class="getLinkClass('GlobalSceneCommand')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景命令管理
@@ -243,7 +243,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTimer')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=SceneTimer&model=GlobalSceneTimer" :class="getLinkClass('GlobalSceneTimer')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneTimer&model=GlobalSceneTimer" :class="getLinkClass('GlobalSceneTimer')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             定时器管理
@@ -251,7 +251,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTigger')">
-                                    <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=SceneTigger&model=GlobalSceneTigger" :class="getLinkClass('GlobalSceneTigger')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneTigger&model=GlobalSceneTigger" :class="getLinkClass('GlobalSceneTigger')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             触发器管理
@@ -261,7 +261,7 @@
                             </ul>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-NodeCategory')">
-                            <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=NodeCategory" :class="getLinkClass('NodeCategory')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=NodeCategory" :class="getLinkClass('NodeCategory')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     节点分类
@@ -269,7 +269,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-Organ')">
-                            <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=Organ" :class="getLinkClass('Organ')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Organ" :class="getLinkClass('Organ')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     机构管理
@@ -277,7 +277,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-LiveRecord')">
-                            <router-link :key="$route.fullPath" to="/router/shared/index.html?area=admin&entity=LiveRecord" :class="getLinkClass('LiveRecord')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=LiveRecord" :class="getLinkClass('LiveRecord')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     回放管理
@@ -368,7 +368,7 @@
             logout() {
                 store.commit('logout');
                 setTimeout(function () {
-                    router.push('/router/login.html');
+                    router.push('/routes/login.html');
                 }, 1000);
             },
             toggle: function (e) {