Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:

	ruoyi-ui/package.json

	ruoyi-ui/src/components/SvgIcon/index.vue

	ruoyi-ui/src/layout/components/TagsView/index.vue

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/store/modules/tagsView.js

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi/pom.xml

	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java

	ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

	ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java

	ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java

	ruoyi/src/main/resources/application.yml

ruoyi-ui/src/router/index.js

@@ -92,6 +92,19 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/job',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'log',
+        component: () => import('@/views/monitor/job/log'),
+        name: 'JobLog',
+        meta: { title: '调度日志' }
+      }
+    ]
+  },
   {
     path: '/gen',
     component: Layout,