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

 Conflicts:

	bin/clean.bat

	bin/run.bat

	ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

	ruoyi-ui/bin/run-web.bat

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

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/views/index.vue

ruoyi-ui/src/router/index.js

@@ -66,8 +66,8 @@ export const constantRoutes = [
       {
         path: 'index',
         component: (resolve) => require(['@/views/index'], resolve),
-        name: '首页',
-        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+        name: 'Index',
+        meta: { title: '首页', icon: 'dashboard', affix: true }
       }
     ]
   },

ruoyi-ui/src/utils/request.js

@@ -64,7 +64,7 @@ service.interceptors.response.use(res => {
           location.href = '/index';
         })
       }).catch(() => {});
-      return Promise.reject()
+      return Promise.reject('令牌验证失败')
     } else if (code === 500) {
       Message({
         message: msg,

ruoyi-ui/src/views/index.vue

@@ -336,7 +336,7 @@
 import config from '../../package.json'
 
 export default {
-  name: "index",
+  name: "Index",
   data() {
     return {
       // 版本号

ruoyi-ui/src/views/system/role/selectUser.vue

@@ -64,7 +64,7 @@ export default {
   props: {
     // 角色编号
     roleId: {
-      type: Number
+      type: [Number, String]
     }
   },
   data() {