+
+ -[](https://gitee.com/dromara/RuoYi-Vue-Plus) +[](https://gitee.com/dromara/RuoYi-Vue-Plus) []() []() []() @@ -53,7 +53,7 @@ | 分布式任务调度 | 采用 Xxl-Job 天生支持分布式 统一的管理中心 | 采用 Quartz 基于数据库锁性能差 集群需要做很多配置与改造 | | 文件存储 | 采用 Minio 分布式文件存储 天生支持多机、多硬盘、多分片、多副本存储
支持权限管理 安全可靠 文件可加密存储 | 采用 本机文件存储 文件裸漏 易丢失泄漏 不支持集群有单点效应 | | 云存储 | 采用 AWS S3 协议客户端 支持 七牛、阿里、腾讯 等一切支持S3协议的厂家 | 不支持 | -| 短信 | 支持 阿里、腾讯 只需在yml配置好厂家密钥即可使用 接口化支持扩展其他厂家 | 不支持 | +| 短信 | 采用 sms4j 短信融合包 支持数十种短信厂家 只需在yml配置好厂家密钥即可使用 可多厂家共用 | 不支持 | | 邮件 | 采用 mail-api 通用协议支持大部分邮件厂商 | 不支持 | | 接口文档 | 采用 SpringDoc、javadoc 无注解零入侵基于java注释
只需把注释写好 无需再写一大堆的文档注解了 | 采用 Springfox 已停止维护 需要编写大量的注解来支持文档生成 | | 校验框架 | 采用 Validation 支持注解与工具类校验 注解支持国际化 | 仅支持注解 且注解不支持国际化 | @@ -125,7 +125,6 @@ * GitHub 地址 [RuoYi-Vue-Plus-github](https://github.com/dromara/RuoYi-Vue-Plus) * 单模块 分支 [RuoYi-Vue-Plus-fast](https://gitee.com/dromara/RuoYi-Vue-Plus/tree/fast/) * 微服务 分支 [RuoYi-Cloud-Plus](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus) -* Vue3 分支 [RuoYi-Vue-Plus-UI](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus-UI) * 用户扩展项目 [扩展项目列表](https://gitee.com/dromara/RuoYi-Vue-Plus/wikis/pages?sort_id=4478302&doc_id=1469725) ## 加群与捐献 diff --git a/pom.xml b/pom.xml index 13d4bd05f..cff442a16 100644 --- a/pom.xml +++ b/pom.xml @@ -6,15 +6,15 @@
 |
+  |
+
 |
+  |
+
 |
+  |
+
 |
+  |
+
 |
+  |
+
 |
+  |
+
 |
+  |
+
 |
+  |
+
请升级您的浏览器，以便我们更好的为您提供服务！
+您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。
++
请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束
+自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明 。
++
您可以选择更先进的浏览器
+推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。
+ ++ + \ No newline at end of file diff --git a/ruoyi-ui-vue3/index.html b/ruoyi-ui-vue3/index.html new file mode 100644 index 000000000..3f0dcb5a7 --- /dev/null +++ b/ruoyi-ui-vue3/index.html @@ -0,0 +1,215 @@ + + + + + + + + + +
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/package.json b/ruoyi-ui-vue3/package.json
new file mode 100644
index 000000000..b570f1c64
--- /dev/null
+++ b/ruoyi-ui-vue3/package.json
@@ -0,0 +1,43 @@
+{
+ "name": "ruoyi-vue-plus",
+ "version": "4.8.0",
+ "description": "RuoYi-Vue-Plus后台管理系统",
+ "author": "LionLi",
+ "license": "MIT",
+ "scripts": {
+ "dev": "vite",
+ "build:prod": "vite build",
+ "preview": "vite preview"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://gitee.com/JavaLionLi/RuoYi-Vue-Plus-UI.git"
+ },
+ "dependencies": {
+ "@element-plus/icons-vue": "2.0.10",
+ "@vueup/vue-quill": "1.1.0",
+ "@vueuse/core": "9.5.0",
+ "axios": "0.27.2",
+ "echarts": "5.4.0",
+ "element-plus": "2.2.27",
+ "file-saver": "2.0.5",
+ "fuse.js": "6.6.2",
+ "js-cookie": "3.0.1",
+ "jsencrypt": "3.3.1",
+ "nprogress": "0.2.0",
+ "pinia": "2.0.22",
+ "vue": "3.2.45",
+ "vue-cropper": "1.0.3",
+ "vue-router": "4.1.4"
+ },
+ "devDependencies": {
+ "@vitejs/plugin-vue": "3.1.0",
+ "@vue/compiler-sfc": "3.2.45",
+ "sass": "1.56.1",
+ "unplugin-auto-import": "0.11.4",
+ "vite": "3.2.3",
+ "vite-plugin-compression": "0.5.1",
+ "vite-plugin-svg-icons": "2.0.1",
+ "vite-plugin-vue-setup-extend": "0.4.0"
+ }
+}
diff --git a/ruoyi-ui-vue3/public/favicon.ico b/ruoyi-ui-vue3/public/favicon.ico
new file mode 100644
index 000000000..3f919d85a
Binary files /dev/null and b/ruoyi-ui-vue3/public/favicon.ico differ
diff --git a/ruoyi-ui-vue3/src/App.vue b/ruoyi-ui-vue3/src/App.vue
new file mode 100644
index 000000000..31839f20f
--- /dev/null
+++ b/ruoyi-ui-vue3/src/App.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ 正在加载系统资源，请耐心等待
+
+
+
+ {{ item.label + " " }}
+ {{ item.label + " " }}
+
+
+
+ {{ unmatchArray | handleArray }}
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/components/Editor/index.vue b/ruoyi-ui-vue3/src/components/Editor/index.vue
new file mode 100644
index 000000000..c27635c3e
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/Editor/index.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/components/FileUpload/index.vue b/ruoyi-ui-vue3/src/components/FileUpload/index.vue
new file mode 100644
index 000000000..a5c273415
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/FileUpload/index.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+ 选取文件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/components/Hamburger/index.vue b/ruoyi-ui-vue3/src/components/Hamburger/index.vue
new file mode 100644
index 000000000..18c201e69
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/Hamburger/index.vue
@@ -0,0 +1,41 @@
+
+
+ 请上传
+ 大小不超过 {{ fileSize }}MB
+ 格式为 {{ fileType.join("/") }}
+ 的文件
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/components/HeaderSearch/index.vue b/ruoyi-ui-vue3/src/components/HeaderSearch/index.vue
new file mode 100644
index 000000000..543559be8
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/HeaderSearch/index.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/IconSelect/index.vue b/ruoyi-ui-vue3/src/components/IconSelect/index.vue
new file mode 100644
index 000000000..059e88992
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/IconSelect/index.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/components/IconSelect/requireIcons.js b/ruoyi-ui-vue3/src/components/IconSelect/requireIcons.js
new file mode 100644
index 000000000..ac22fd78e
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/IconSelect/requireIcons.js
@@ -0,0 +1,8 @@
+let icons = []
+const modules = import.meta.glob('./../../assets/icons/svg/*.svg');
+for (const path in modules) {
+ const p = path.split('assets/icons/svg/')[1].split('.svg')[0];
+ icons.push(p);
+}
+
+export default icons
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/ImagePreview/index.vue b/ruoyi-ui-vue3/src/components/ImagePreview/index.vue
new file mode 100644
index 000000000..1dfe12372
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/ImagePreview/index.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/Pagination/index.vue b/ruoyi-ui-vue3/src/components/Pagination/index.vue
new file mode 100644
index 000000000..38de953f0
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/Pagination/index.vue
@@ -0,0 +1,105 @@
+
+
+ 请上传
+
+ 大小不超过 {{ fileSize }}MB
+
+
+ 格式为 {{ fileType.join("/") }}
+
+ 的文件
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/ParentView/index.vue b/ruoyi-ui-vue3/src/components/ParentView/index.vue
new file mode 100644
index 000000000..7bf614897
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/ParentView/index.vue
@@ -0,0 +1,3 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/RuoYi/Doc/index.vue b/ruoyi-ui-vue3/src/components/RuoYi/Doc/index.vue
new file mode 100644
index 000000000..3e69482e1
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/RuoYi/Doc/index.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/RuoYi/Git/index.vue b/ruoyi-ui-vue3/src/components/RuoYi/Git/index.vue
new file mode 100644
index 000000000..c8d6fd5dd
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/RuoYi/Git/index.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/components/Screenfull/index.vue b/ruoyi-ui-vue3/src/components/Screenfull/index.vue
new file mode 100644
index 000000000..7ad28eadc
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/Screenfull/index.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/SizeSelect/index.vue b/ruoyi-ui-vue3/src/components/SizeSelect/index.vue
new file mode 100644
index 000000000..4c2e7e952
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/SizeSelect/index.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/SvgIcon/index.vue b/ruoyi-ui-vue3/src/components/SvgIcon/index.vue
new file mode 100644
index 000000000..8c101f649
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/SvgIcon/index.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/components/SvgIcon/svgicon.js b/ruoyi-ui-vue3/src/components/SvgIcon/svgicon.js
new file mode 100644
index 000000000..4431719a5
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/SvgIcon/svgicon.js
@@ -0,0 +1,10 @@
+import * as components from '@element-plus/icons-vue'
+
+export default {
+ install: (app) => {
+ for (const key in components) {
+ const componentConfig = components[key];
+ app.component(componentConfig.name, componentConfig);
+ }
+ },
+};
diff --git a/ruoyi-ui-vue3/src/components/TopNav/index.vue b/ruoyi-ui-vue3/src/components/TopNav/index.vue
new file mode 100644
index 000000000..811cd9f1e
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/TopNav/index.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/components/iFrame/index.vue b/ruoyi-ui-vue3/src/components/iFrame/index.vue
new file mode 100644
index 000000000..091b1a240
--- /dev/null
+++ b/ruoyi-ui-vue3/src/components/iFrame/index.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/directive/common/copyText.js b/ruoyi-ui-vue3/src/directive/common/copyText.js
new file mode 100644
index 000000000..7063df8ed
--- /dev/null
+++ b/ruoyi-ui-vue3/src/directive/common/copyText.js
@@ -0,0 +1,66 @@
+/**
+* v-copyText 复制文本内容
+* Copyright (c) 2022 ruoyi
+*/
+
+export default {
+ beforeMount(el, { value, arg }) {
+ if (arg === "callback") {
+ el.$copyCallback = value;
+ } else {
+ el.$copyValue = value;
+ const handler = () => {
+ copyTextToClipboard(el.$copyValue);
+ if (el.$copyCallback) {
+ el.$copyCallback(el.$copyValue);
+ }
+ };
+ el.addEventListener("click", handler);
+ el.$destroyCopy = () => el.removeEventListener("click", handler);
+ }
+ }
+}
+
+function copyTextToClipboard(input, { target = document.body } = {}) {
+ const element = document.createElement('textarea');
+ const previouslyFocusedElement = document.activeElement;
+
+ element.value = input;
+
+ // Prevent keyboard from showing on mobile
+ element.setAttribute('readonly', '');
+
+ element.style.contain = 'strict';
+ element.style.position = 'absolute';
+ element.style.left = '-9999px';
+ element.style.fontSize = '12pt'; // Prevent zooming on iOS
+
+ const selection = document.getSelection();
+ const originalRange = selection.rangeCount > 0 && selection.getRangeAt(0);
+
+ target.append(element);
+ element.select();
+
+ // Explicit selection workaround for iOS
+ element.selectionStart = 0;
+ element.selectionEnd = input.length;
+
+ let isSuccess = false;
+ try {
+ isSuccess = document.execCommand('copy');
+ } catch { }
+
+ element.remove();
+
+ if (originalRange) {
+ selection.removeAllRanges();
+ selection.addRange(originalRange);
+ }
+
+ // Get the focus back on the previously focused element, if any
+ if (previouslyFocusedElement) {
+ previouslyFocusedElement.focus();
+ }
+
+ return isSuccess;
+}
diff --git a/ruoyi-ui-vue3/src/directive/index.js b/ruoyi-ui-vue3/src/directive/index.js
new file mode 100644
index 000000000..86b8f88a8
--- /dev/null
+++ b/ruoyi-ui-vue3/src/directive/index.js
@@ -0,0 +1,9 @@
+import hasRole from './permission/hasRole'
+import hasPermi from './permission/hasPermi'
+import copyText from './common/copyText'
+
+export default function directive(app){
+ app.directive('hasRole', hasRole)
+ app.directive('hasPermi', hasPermi)
+ app.directive('copyText', copyText)
+}
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/directive/permission/hasPermi.js b/ruoyi-ui-vue3/src/directive/permission/hasPermi.js
new file mode 100644
index 000000000..44ef3f821
--- /dev/null
+++ b/ruoyi-ui-vue3/src/directive/permission/hasPermi.js
@@ -0,0 +1,28 @@
+ /**
+ * v-hasPermi 操作权限处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+import useUserStore from '@/store/modules/user'
+
+export default {
+ mounted(el, binding, vnode) {
+ const { value } = binding
+ const all_permission = "*:*:*";
+ const permissions = useUserStore().permissions
+
+ if (value && value instanceof Array && value.length > 0) {
+ const permissionFlag = value
+
+ const hasPermissions = permissions.some(permission => {
+ return all_permission === permission || permissionFlag.includes(permission)
+ })
+
+ if (!hasPermissions) {
+ el.parentNode && el.parentNode.removeChild(el)
+ }
+ } else {
+ throw new Error(`请设置操作权限标签值`)
+ }
+ }
+}
diff --git a/ruoyi-ui-vue3/src/directive/permission/hasRole.js b/ruoyi-ui-vue3/src/directive/permission/hasRole.js
new file mode 100644
index 000000000..8774bddd6
--- /dev/null
+++ b/ruoyi-ui-vue3/src/directive/permission/hasRole.js
@@ -0,0 +1,28 @@
+ /**
+ * v-hasRole 角色权限处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+import useUserStore from '@/store/modules/user'
+
+export default {
+ mounted(el, binding, vnode) {
+ const { value } = binding
+ const super_admin = "admin";
+ const roles = useUserStore().roles
+
+ if (value && value instanceof Array && value.length > 0) {
+ const roleFlag = value
+
+ const hasRole = roles.some(role => {
+ return super_admin === role || roleFlag.includes(role)
+ })
+
+ if (!hasRole) {
+ el.parentNode && el.parentNode.removeChild(el)
+ }
+ } else {
+ throw new Error(`请设置角色权限标签值`)
+ }
+ }
+}
diff --git a/ruoyi-ui-vue3/src/layout/components/AppMain.vue b/ruoyi-ui-vue3/src/layout/components/AppMain.vue
new file mode 100644
index 000000000..016612c78
--- /dev/null
+++ b/ruoyi-ui-vue3/src/layout/components/AppMain.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/layout/components/Navbar.vue b/ruoyi-ui-vue3/src/layout/components/Navbar.vue
new file mode 100644
index 000000000..c46ebe24c
--- /dev/null
+++ b/ruoyi-ui-vue3/src/layout/components/Navbar.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/layout/components/Settings/index.vue b/ruoyi-ui-vue3/src/layout/components/Settings/index.vue
new file mode 100644
index 000000000..0d551ba9d
--- /dev/null
+++ b/ruoyi-ui-vue3/src/layout/components/Settings/index.vue
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 个人中心
+
+
+ 布局设置
+
+
+ 退出登录
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ 主题风格设置
+
+
+
+ 
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ 主题颜色
+
+
+ 系统布局配置
+ +
+ 开启 TopNav
+
+
+
+
+ 开启 Tags-Views
+
+
+
+
+ 固定 Header
+
+
+
+
+ 显示 Logo
+
+
+
+
+ 动态标题
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue b/ruoyi-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
new file mode 100644
index 000000000..c423fb18e
--- /dev/null
+++ b/ruoyi-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
@@ -0,0 +1,102 @@
+
+ {{ title }}
+{{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/layout/components/Sidebar/index.vue b/ruoyi-ui-vue3/src/layout/components/Sidebar/index.vue
new file mode 100644
index 000000000..9b14dfc0e
--- /dev/null
+++ b/ruoyi-ui-vue3/src/layout/components/Sidebar/index.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui-vue3/src/layout/components/TagsView/ScrollPane.vue
new file mode 100644
index 000000000..f6fbfbde8
--- /dev/null
+++ b/ruoyi-ui-vue3/src/layout/components/TagsView/ScrollPane.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/main.js b/ruoyi-ui-vue3/src/main.js
new file mode 100644
index 000000000..fcdb585b9
--- /dev/null
+++ b/ruoyi-ui-vue3/src/main.js
@@ -0,0 +1,88 @@
+import { createApp } from 'vue'
+
+import Cookies from 'js-cookie'
+
+import ElementPlus from 'element-plus'
+import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
+
+import '@/assets/styles/index.scss' // global css
+import App from './App'
+import store from './store'
+import router from './router'
+import directive from './directive' // directive
+
+// 注册指令
+import plugins from './plugins' // plugins
+import { download } from '@/utils/request'
+
+// svg图标
+import 'virtual:svg-icons-register'
+import SvgIcon from '@/components/SvgIcon'
+import elementIcons from '@/components/SvgIcon/svgicon'
+
+import './permission' // permission control
+
+import { useDict } from '@/utils/dict'
+import { getConfigKey, updateConfigByKey } from "@/api/system/config";
+import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi'
+
+// 分页组件
+import Pagination from '@/components/Pagination'
+// 自定义表格工具组件
+import RightToolbar from '@/components/RightToolbar'
+// 富文本组件
+import Editor from "@/components/Editor"
+// 文件上传组件
+import FileUpload from "@/components/FileUpload"
+// 图片上传组件
+import ImageUpload from "@/components/ImageUpload"
+// 图片预览组件
+import ImagePreview from "@/components/ImagePreview"
+// 自定义树选择组件
+import TreeSelect from '@/components/TreeSelect'
+// 字典标签组件
+import DictTag from '@/components/DictTag'
+
+const app = createApp(App)
+
+// 全局方法挂载
+app.config.globalProperties.useDict = useDict
+app.config.globalProperties.getConfigKey = getConfigKey
+app.config.globalProperties.updateConfigByKey = updateConfigByKey
+app.config.globalProperties.download = download
+app.config.globalProperties.parseTime = parseTime
+app.config.globalProperties.resetForm = resetForm
+app.config.globalProperties.handleTree = handleTree
+app.config.globalProperties.addDateRange = addDateRange
+app.config.globalProperties.selectDictLabel = selectDictLabel
+app.config.globalProperties.selectDictLabels = selectDictLabels
+
+// 全局组件挂载
+app.component('DictTag', DictTag)
+app.component('Pagination', Pagination)
+app.component('TreeSelect', TreeSelect)
+app.component('FileUpload', FileUpload)
+app.component('ImageUpload', ImageUpload)
+app.component('ImagePreview', ImagePreview)
+app.component('RightToolbar', RightToolbar)
+app.component('Editor', Editor)
+
+app.use(router)
+app.use(store)
+app.use(plugins)
+app.use(elementIcons)
+app.component('svg-icon', SvgIcon)
+
+directive(app)
+
+// 使用element-plus 并且设置全局的大小
+app.use(ElementPlus, {
+ locale: locale,
+ // 支持 large、default、small
+ size: Cookies.get('size') || 'default'
+})
+
+// 修改 el-dialog 默认点击遮照为不关闭
+app._context.components.ElDialog.props.closeOnClickModal.default = false
+
+app.mount('#app')
diff --git a/ruoyi-ui-vue3/src/permission.js b/ruoyi-ui-vue3/src/permission.js
new file mode 100644
index 000000000..a474e0e68
--- /dev/null
+++ b/ruoyi-ui-vue3/src/permission.js
@@ -0,0 +1,63 @@
+import router from './router'
+import { ElMessage } from 'element-plus'
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import { getToken } from '@/utils/auth'
+import { isHttp } from '@/utils/validate'
+import { isRelogin } from '@/utils/request'
+import useUserStore from '@/store/modules/user'
+import useSettingsStore from '@/store/modules/settings'
+import usePermissionStore from '@/store/modules/permission'
+
+NProgress.configure({ showSpinner: false });
+
+const whiteList = ['/login', '/register'];
+
+router.beforeEach((to, from, next) => {
+ NProgress.start()
+ if (getToken()) {
+ to.meta.title && useSettingsStore().setTitle(to.meta.title)
+ /* has token*/
+ if (to.path === '/login') {
+ next({ path: '/' })
+ NProgress.done()
+ } else {
+ if (useUserStore().roles.length === 0) {
+ isRelogin.show = true
+ // 判断当前用户是否已拉取完user_info信息
+ useUserStore().getInfo().then(() => {
+ isRelogin.show = false
+ usePermissionStore().generateRoutes().then(accessRoutes => {
+ // 根据roles权限生成可访问的路由表
+ accessRoutes.forEach(route => {
+ if (!isHttp(route.path)) {
+ router.addRoute(route) // 动态添加可访问路由表
+ }
+ })
+ next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+ })
+ }).catch(err => {
+ useUserStore().logOut().then(() => {
+ ElMessage.error(err)
+ next({ path: '/' })
+ })
+ })
+ } else {
+ next()
+ }
+ }
+ } else {
+ // 没有token
+ if (whiteList.indexOf(to.path) !== -1) {
+ // 在免登录白名单，直接进入
+ next()
+ } else {
+ next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+ NProgress.done()
+ }
+ }
+})
+
+router.afterEach(() => {
+ NProgress.done()
+})
diff --git a/ruoyi-ui-vue3/src/plugins/auth.js b/ruoyi-ui-vue3/src/plugins/auth.js
new file mode 100644
index 000000000..5e8c28deb
--- /dev/null
+++ b/ruoyi-ui-vue3/src/plugins/auth.js
@@ -0,0 +1,60 @@
+import useUserStore from '@/store/modules/user'
+
+function authPermission(permission) {
+ const all_permission = "*:*:*";
+ const permissions = useUserStore().permissions
+ if (permission && permission.length > 0) {
+ return permissions.some(v => {
+ return all_permission === v || v === permission
+ })
+ } else {
+ return false
+ }
+}
+
+function authRole(role) {
+ const super_admin = "admin";
+ const roles = useUserStore().roles
+ if (role && role.length > 0) {
+ return roles.some(v => {
+ return super_admin === v || v === role
+ })
+ } else {
+ return false
+ }
+}
+
+export default {
+ // 验证用户是否具备某权限
+ hasPermi(permission) {
+ return authPermission(permission);
+ },
+ // 验证用户是否含有指定权限，只需包含其中一个
+ hasPermiOr(permissions) {
+ return permissions.some(item => {
+ return authPermission(item)
+ })
+ },
+ // 验证用户是否含有指定权限，必须全部拥有
+ hasPermiAnd(permissions) {
+ return permissions.every(item => {
+ return authPermission(item)
+ })
+ },
+ // 验证用户是否具备某角色
+ hasRole(role) {
+ return authRole(role);
+ },
+ // 验证用户是否含有指定角色，只需包含其中一个
+ hasRoleOr(roles) {
+ return roles.some(item => {
+ return authRole(item)
+ })
+ },
+ // 验证用户是否含有指定角色，必须全部拥有
+ hasRoleAnd(roles) {
+ return roles.every(item => {
+ return authRole(item)
+ })
+ }
+}
diff --git a/ruoyi-ui-vue3/src/plugins/cache.js b/ruoyi-ui-vue3/src/plugins/cache.js
new file mode 100644
index 000000000..6b5c00b9e
--- /dev/null
+++ b/ruoyi-ui-vue3/src/plugins/cache.js
@@ -0,0 +1,77 @@
+const sessionCache = {
+ set (key, value) {
+ if (!sessionStorage) {
+ return
+ }
+ if (key != null && value != null) {
+ sessionStorage.setItem(key, value)
+ }
+ },
+ get (key) {
+ if (!sessionStorage) {
+ return null
+ }
+ if (key == null) {
+ return null
+ }
+ return sessionStorage.getItem(key)
+ },
+ setJSON (key, jsonValue) {
+ if (jsonValue != null) {
+ this.set(key, JSON.stringify(jsonValue))
+ }
+ },
+ getJSON (key) {
+ const value = this.get(key)
+ if (value != null) {
+ return JSON.parse(value)
+ }
+ },
+ remove (key) {
+ sessionStorage.removeItem(key);
+ }
+}
+const localCache = {
+ set (key, value) {
+ if (!localStorage) {
+ return
+ }
+ if (key != null && value != null) {
+ localStorage.setItem(key, value)
+ }
+ },
+ get (key) {
+ if (!localStorage) {
+ return null
+ }
+ if (key == null) {
+ return null
+ }
+ return localStorage.getItem(key)
+ },
+ setJSON (key, jsonValue) {
+ if (jsonValue != null) {
+ this.set(key, JSON.stringify(jsonValue))
+ }
+ },
+ getJSON (key) {
+ const value = this.get(key)
+ if (value != null) {
+ return JSON.parse(value)
+ }
+ },
+ remove (key) {
+ localStorage.removeItem(key);
+ }
+}
+
+export default {
+ /**
+ * 会话级缓存
+ */
+ session: sessionCache,
+ /**
+ * 本地缓存
+ */
+ local: localCache
+}
diff --git a/ruoyi-ui-vue3/src/plugins/download.js b/ruoyi-ui-vue3/src/plugins/download.js
new file mode 100644
index 000000000..29dd469c3
--- /dev/null
+++ b/ruoyi-ui-vue3/src/plugins/download.js
@@ -0,0 +1,71 @@
+import axios from 'axios'
+import { ElLoading, ElMessage } from 'element-plus'
+import { saveAs } from 'file-saver'
+import { getToken } from '@/utils/auth'
+import errorCode from '@/utils/errorCode'
+import { blobValidate } from '@/utils/ruoyi'
+
+const baseURL = import.meta.env.VITE_APP_BASE_API
+let downloadLoadingInstance;
+
+export default {
+ oss(ossId) {
+ var url = baseURL + '/system/oss/download/' + ossId
+ downloadLoadingInstance = ElLoading.service({ text: "正在下载数据，请稍候", background: "rgba(0, 0, 0, 0.7)", })
+ axios({
+ method: 'get',
+ url: url,
+ responseType: 'blob',
+ headers: { 'Authorization': 'Bearer ' + getToken() }
+ }).then((res) => {
+ const isBlob = blobValidate(res.data);
+ if (isBlob) {
+ const blob = new Blob([res.data], { type: 'application/octet-stream' })
+ this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
+ } else {
+ this.printErrMsg(res.data);
+ }
+ downloadLoadingInstance.close();
+ }).catch((r) => {
+ console.error(r)
+ Message.error('下载文件出现错误，请联系管理员！')
+ downloadLoadingInstance.close();
+ })
+ },
+ zip(url, name) {
+ var url = baseURL + url
+ downloadLoadingInstance = ElLoading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+ axios({
+ method: 'get',
+ url: url,
+ responseType: 'blob',
+ headers: {
+ 'Authorization': 'Bearer ' + getToken(),
+ 'datasource': localStorage.getItem("dataName")
+ }
+ }).then((res) => {
+ const isBlob = blobValidate(res.data);
+ if (isBlob) {
+ const blob = new Blob([res.data], { type: 'application/zip' })
+ this.saveAs(blob, name)
+ } else {
+ this.printErrMsg(res.data);
+ }
+ downloadLoadingInstance.close();
+ }).catch((r) => {
+ console.error(r)
+ ElMessage.error('下载文件出现错误，请联系管理员！')
+ downloadLoadingInstance.close();
+ })
+ },
+ saveAs(text, name, opts) {
+ saveAs(text, name, opts);
+ },
+ async printErrMsg(data) {
+ const resText = await data.text();
+ const rspObj = JSON.parse(resText);
+ const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+ ElMessage.error(errMsg);
+ }
+}
+
diff --git a/ruoyi-ui-vue3/src/plugins/index.js b/ruoyi-ui-vue3/src/plugins/index.js
new file mode 100644
index 000000000..47d1b41f0
--- /dev/null
+++ b/ruoyi-ui-vue3/src/plugins/index.js
@@ -0,0 +1,18 @@
+import tab from './tab'
+import auth from './auth'
+import cache from './cache'
+import modal from './modal'
+import download from './download'
+
+export default function installPlugins(app){
+ // 页签操作
+ app.config.globalProperties.$tab = tab
+ // 认证对象
+ app.config.globalProperties.$auth = auth
+ // 缓存对象
+ app.config.globalProperties.$cache = cache
+ // 模态框对象
+ app.config.globalProperties.$modal = modal
+ // 下载文件
+ app.config.globalProperties.$download = download
+}
diff --git a/ruoyi-ui-vue3/src/plugins/modal.js b/ruoyi-ui-vue3/src/plugins/modal.js
new file mode 100644
index 000000000..b59e14d69
--- /dev/null
+++ b/ruoyi-ui-vue3/src/plugins/modal.js
@@ -0,0 +1,82 @@
+import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'
+
+let loadingInstance;
+
+export default {
+ // 消息提示
+ msg(content) {
+ ElMessage.info(content)
+ },
+ // 错误消息
+ msgError(content) {
+ ElMessage.error(content)
+ },
+ // 成功消息
+ msgSuccess(content) {
+ ElMessage.success(content)
+ },
+ // 警告消息
+ msgWarning(content) {
+ ElMessage.warning(content)
+ },
+ // 弹出提示
+ alert(content) {
+ ElMessageBox.alert(content, "系统提示")
+ },
+ // 错误提示
+ alertError(content) {
+ ElMessageBox.alert(content, "系统提示", { type: 'error' })
+ },
+ // 成功提示
+ alertSuccess(content) {
+ ElMessageBox.alert(content, "系统提示", { type: 'success' })
+ },
+ // 警告提示
+ alertWarning(content) {
+ ElMessageBox.alert(content, "系统提示", { type: 'warning' })
+ },
+ // 通知提示
+ notify(content) {
+ ElNotification.info(content)
+ },
+ // 错误通知
+ notifyError(content) {
+ ElNotification.error(content);
+ },
+ // 成功通知
+ notifySuccess(content) {
+ ElNotification.success(content)
+ },
+ // 警告通知
+ notifyWarning(content) {
+ ElNotification.warning(content)
+ },
+ // 确认窗体
+ confirm(content) {
+ return ElMessageBox.confirm(content, "系统提示", {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: "warning",
+ })
+ },
+ // 提交内容
+ prompt(content) {
+ return ElMessageBox.prompt(content, "系统提示", {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: "warning",
+ })
+ },
+ // 打开遮罩层
+ loading(content) {
+ loadingInstance = ElLoading.service({
+ lock: true,
+ text: content,
+ background: "rgba(0, 0, 0, 0.7)",
+ })
+ },
+ // 关闭遮罩层
+ closeLoading() {
+ loadingInstance.close();
+ }
+}
diff --git a/ruoyi-ui-vue3/src/plugins/tab.js b/ruoyi-ui-vue3/src/plugins/tab.js
new file mode 100644
index 000000000..7b51cf59f
--- /dev/null
+++ b/ruoyi-ui-vue3/src/plugins/tab.js
@@ -0,0 +1,69 @@
+import useTagsViewStore from '@/store/modules/tagsView'
+import router from '@/router'
+
+export default {
+ // 刷新当前tab页签
+ refreshPage(obj) {
+ const { path, query, matched } = router.currentRoute.value;
+ if (obj === undefined) {
+ matched.forEach((m) => {
+ if (m.components && m.components.default && m.components.default.name) {
+ if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
+ obj = { name: m.components.default.name, path: path, query: query };
+ }
+ }
+ });
+ }
+ return useTagsViewStore().delCachedView(obj).then(() => {
+ const { path, query } = obj
+ router.replace({
+ path: '/redirect' + path,
+ query: query
+ })
+ })
+ },
+ // 关闭当前tab页签，打开新页签
+ closeOpenPage(obj) {
+ useTagsViewStore().delView(router.currentRoute.value);
+ if (obj !== undefined) {
+ return router.push(obj);
+ }
+ },
+ // 关闭指定tab页签
+ closePage(obj) {
+ if (obj === undefined) {
+ return useTagsViewStore().delView(router.currentRoute.value).then(({ visitedViews }) => {
+ const latestView = visitedViews.slice(-1)[0]
+ if (latestView) {
+ return router.push(latestView.fullPath)
+ }
+ return router.push('/');
+ });
+ }
+ return useTagsViewStore().delView(obj);
+ },
+ // 关闭所有tab页签
+ closeAllPage() {
+ return useTagsViewStore().delAllViews();
+ },
+ // 关闭左侧tab页签
+ closeLeftPage(obj) {
+ return useTagsViewStore().delLeftTags(obj || router.currentRoute.value);
+ },
+ // 关闭右侧tab页签
+ closeRightPage(obj) {
+ return useTagsViewStore().delRightTags(obj || router.currentRoute.value);
+ },
+ // 关闭其他tab页签
+ closeOtherPage(obj) {
+ return useTagsViewStore().delOthersViews(obj || router.currentRoute.value);
+ },
+ // 打开tab页签
+ openPage(url) {
+ return router.push(url);
+ },
+ // 修改tab页签
+ updatePage(obj) {
+ return useTagsViewStore().updateVisitedView(obj);
+ }
+}
diff --git a/ruoyi-ui-vue3/src/router/index.js b/ruoyi-ui-vue3/src/router/index.js
new file mode 100644
index 000000000..2559686ab
--- /dev/null
+++ b/ruoyi-ui-vue3/src/router/index.js
@@ -0,0 +1,175 @@
+import { createWebHistory, createRouter } from 'vue-router'
+/* Layout */
+import Layout from '@/layout'
+
+/**
+ * Note: 路由配置项
+ *
+ * hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
+ * alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
+ * // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
+ * // 若你想不管路由下面的 children 声明的个数都显示你的根路由
+ * // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
+ * redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+ * name:'router-name' // 设定路由的名字，一定要填写不然使用
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 搜索(自定义分页接口)
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导入(校验)
+
+
+ 导出
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+
+
+
+
+ {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/demo/tree/index.vue b/ruoyi-ui-vue3/src/views/demo/tree/index.vue
new file mode 100644
index 000000000..4fa8ffd75
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/demo/tree/index.vue
@@ -0,0 +1,281 @@
+
+ 将文件拖到此处，或点击上传
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 展开/折叠
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+ 新增
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/error/401.vue b/ruoyi-ui-vue3/src/views/error/401.vue
new file mode 100644
index 000000000..1ba379221
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/error/401.vue
@@ -0,0 +1,82 @@
+
+
+
+ 返回
+
+
+
+
+
+ ![Girl has dropped her ice cream.]()
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/error/404.vue b/ruoyi-ui-vue3/src/views/error/404.vue
new file mode 100644
index 000000000..f20530322
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/error/404.vue
@@ -0,0 +1,227 @@
+
+ + 401错误! +
+您没有访问权限！
+对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面
+-
+
-
+
+ 回首页 + +
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/index.vue b/ruoyi-ui-vue3/src/views/index.vue
new file mode 100644
index 000000000..148d17a47
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/index.vue
@@ -0,0 +1,176 @@
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+ 返回首页
+
+
+
+ 404错误!
+
+
+ {{ message }}
+
+
+ 对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/login.vue b/ruoyi-ui-vue3/src/views/login.vue
new file mode 100644
index 000000000..4dd95d3cb
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/login.vue
@@ -0,0 +1,215 @@
+
+ RuoYi-Vue-Plus后台管理系统
+
+ RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架)
+
+ * 前端开发框架 Vue、Element UI
+ * 后端开发框架 Spring Boot
+ * 容器框架 Undertow 基于 Netty 的高性能容器
+ * 权限认证框架 Sa-Token 支持多终端认证系统
+ * 关系数据库 MySQL 适配 8.X 最低 5.7
+ * 缓存数据库 Redis 适配 6.X 最低 4.X
+ * 数据库框架 Mybatis-Plus 快速 CRUD 增加开发效率
+ * 数据库框架 p6spy 更强劲的 SQL 分析
+ * 多数据源框架 dynamic-datasource 支持主从与多种类数据库异构
+ * 序列化框架 Jackson 统一使用 jackson 高效可靠
+ * Redis客户端 Redisson 性能强劲、API丰富
+ * 分布式限流 Redisson 全局、请求IP、集群ID 多种限流
+ * 分布式锁 Lock4j 注解锁、工具锁 多种多样
+ * 分布式幂等 Lock4j 基于分布式锁实现
+ * 分布式链路追踪 SkyWalking 支持链路追踪、网格分析、度量聚合、可视化
+ * 分布式任务调度 Xxl-Job 高性能 高可靠 易扩展
+ * 文件存储 Minio 本地存储
+ * 文件存储 七牛、阿里、腾讯 云存储
+ * 监控框架 SpringBoot-Admin 全方位服务监控
+ * 校验框架 Validation 增强接口安全性 严谨性
+ * Excel框架 Alibaba EasyExcel 性能优异 扩展性强
+ * 文档框架 SpringDoc、javadoc 无注解零入侵基于java注释
+ * 工具类框架 Hutool、Lombok 减少代码冗余 增加安全性
+ * 代码生成器 适配MP、SpringDoc规范化代码 一键生成前后端代码
+ * 部署方式 Docker 容器编排 一键部署业务集群
+ * 国际化 SpringMessage Spring标准国际化方案
+
+ 当前版本: v{{ version }} +
+
+
+
技术选型
+后端技术
+-
+
- SpringBoot +
- Sa-Token +
- JWT +
- MyBatis +
- Druid +
- Jackson +
- ... +
前端技术
+-
+
- Vue +
- Vuex +
- Element-ui +
- Axios +
- Sass +
- Quill +
- ... +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 记住密码
+
+
+ 登 录
+ 登 录 中...
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/monitor/admin/index.vue b/ruoyi-ui-vue3/src/views/monitor/admin/index.vue
new file mode 100644
index 000000000..1b13d64d7
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/monitor/admin/index.vue
@@ -0,0 +1,13 @@
+
+ RuoYi-Vue-Plus后台管理系统
+
+ ![]()
+
+
+ 立即注册
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/monitor/cache/index.vue b/ruoyi-ui-vue3/src/views/monitor/cache/index.vue
new file mode 100644
index 000000000..ccca20d6d
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/monitor/cache/index.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/monitor/cache/list.vue b/ruoyi-ui-vue3/src/views/monitor/cache/list.vue
new file mode 100644
index 000000000..072879944
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/monitor/cache/list.vue
@@ -0,0 +1,246 @@
+
+
+
+
+
+
+ Redis版本 |
+ {{ cache.info.redis_version }} |
+ 运行模式 |
+ {{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }} |
+ 端口 |
+ {{ cache.info.tcp_port }} |
+ 客户端数 |
+ {{ cache.info.connected_clients }} |
+
运行时间(天) |
+ {{ cache.info.uptime_in_days }} |
+ 使用内存 |
+ {{ cache.info.used_memory_human }} |
+ 使用CPU |
+ {{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }} |
+ 内存配置 |
+ {{ cache.info.maxmemory_human }} |
+
AOF是否开启 |
+ {{ cache.info.aof_enabled == "0" ? "否" : "是" }} |
+ RDB是否成功 |
+ {{ cache.info.rdb_last_bgsave_status }} |
+ Key数量 |
+ {{ cache.dbSize }} |
+ 网络入口/出口 |
+ {{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 清理全部
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/monitor/logininfor/index.vue b/ruoyi-ui-vue3/src/views/monitor/logininfor/index.vue
new file mode 100644
index 000000000..bd58a5db6
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/monitor/logininfor/index.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 删除
+
+
+ 清空
+
+
+ 解锁
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.loginTime) }}
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/monitor/online/index.vue b/ruoyi-ui-vue3/src/views/monitor/online/index.vue
new file mode 100644
index 000000000..eb17ebc3d
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/monitor/online/index.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ {{ (pageNum - 1) * pageSize + scope.$index + 1 }}
+
+
+
+
+ {{ parseTime(scope.row.loginTime) }}
+
+
+
+
+ 强退
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/monitor/operlog/index.vue b/ruoyi-ui-vue3/src/views/monitor/operlog/index.vue
new file mode 100644
index 000000000..d1760f8dc
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/monitor/operlog/index.vue
@@ -0,0 +1,291 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 删除
+
+
+ 清空
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.operTime) }}
+
+
+
+
+ {{ scope.row.costTime }}毫秒
+
+
+
+
+ 详细
+
+
+
+
+
+
+
+
+ {{ form.title }} / {{ typeFormat(form) }}
+ {{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}
+
+
+ {{ form.operUrl }}
+ {{ form.requestMethod }}
+
+
+ {{ form.method }}
+
+
+ {{ form.operParam }}
+
+
+ {{ form.jsonResult }}
+
+
+
+
+
+
+ {{ form.costTime }}毫秒
+
+
+ {{ parseTime(form.operTime) }}
+
+
+ {{ form.errorMsg }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/monitor/xxljob/index.vue b/ruoyi-ui-vue3/src/views/monitor/xxljob/index.vue
new file mode 100644
index 000000000..9a73f52a2
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/monitor/xxljob/index.vue
@@ -0,0 +1,13 @@
+
+ 正常
+ 失败
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/redirect/index.vue b/ruoyi-ui-vue3/src/views/redirect/index.vue
new file mode 100644
index 000000000..a469960dd
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/redirect/index.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/views/register.vue b/ruoyi-ui-vue3/src/views/register.vue
new file mode 100644
index 000000000..89bb530ec
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/register.vue
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 注 册
+ 注 册 中...
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/config/index.vue b/ruoyi-ui-vue3/src/views/system/config/index.vue
new file mode 100644
index 000000000..5452f1d9d
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/config/index.vue
@@ -0,0 +1,306 @@
+
+ RuoYi-Vue-Plus后台管理系统
+
+ ![]()
+
+
+ 使用已有账户登录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+ 刷新缓存
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/dept/index.vue b/ruoyi-ui-vue3/src/views/system/dept/index.vue
new file mode 100644
index 000000000..8f1c7bebd
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/dept/index.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 展开/折叠
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 新增
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/dict/data.vue b/ruoyi-ui-vue3/src/views/system/dict/data.vue
new file mode 100644
index 000000000..b900666d1
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/dict/data.vue
@@ -0,0 +1,350 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+ 关闭
+
+
+
+
+
+
+ {{ scope.row.dictLabel }}
+ {{ scope.row.dictLabel }}
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/dict/index.vue b/ruoyi-ui-vue3/src/views/system/dict/index.vue
new file mode 100644
index 000000000..23d2a10bd
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/dict/index.vue
@@ -0,0 +1,313 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+ 刷新缓存
+
+
+
+
+
+
+
+ {{ scope.row.dictType }}
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/menu/index.vue b/ruoyi-ui-vue3/src/views/system/menu/index.vue
new file mode 100644
index 000000000..77ce65b9e
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/menu/index.vue
@@ -0,0 +1,441 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 展开/折叠
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 新增
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 目录
+ 菜单
+ 按钮
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是否外链
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+ 路由地址
+
+
+
+
+
+
+
+
+
+
+ 组件路径
+
+
+
+
+
+
+
+
+ 权限字符
+
+
+
+
+
+
+
+
+ 路由参数
+
+
+
+
+
+
+
+
+
+
+ 是否缓存
+
+
+
+ 缓存
+ 不缓存
+
+
+
+
+
+
+
+
+
+ 显示状态
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+ 菜单状态
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/notice/index.vue b/ruoyi-ui-vue3/src/views/system/notice/index.vue
new file mode 100644
index 000000000..c26b8c406
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/notice/index.vue
@@ -0,0 +1,283 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/oss/config.vue b/ruoyi-ui-vue3/src/views/system/oss/config.vue
new file mode 100644
index 000000000..facea7ae7
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/oss/config.vue
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+ private
+ public
+ custom
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+ private
+ public
+ custom
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/oss/index.vue b/ruoyi-ui-vue3/src/views/system/oss/index.vue
new file mode 100644
index 000000000..ecc045cc4
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/oss/index.vue
@@ -0,0 +1,372 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 上传文件
+
+
+ 上传图片
+
+
+ 删除
+
+
+ 预览开关 : {{previewListResource ? "禁用" : "启用"}}
+
+
+ 配置管理
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 下载
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/post/index.vue b/ruoyi-ui-vue3/src/views/system/post/index.vue
new file mode 100644
index 000000000..6fd1b641a
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/post/index.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/role/authUser.vue b/ruoyi-ui-vue3/src/views/system/role/authUser.vue
new file mode 100644
index 000000000..66b5f5e6c
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/role/authUser.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 添加用户
+
+
+ 批量取消授权
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 取消授权
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/role/index.vue b/ruoyi-ui-vue3/src/views/system/role/index.vue
new file mode 100644
index 000000000..f84d99652
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/role/index.vue
@@ -0,0 +1,560 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 权限字符
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+ 展开/折叠
+ 全选/全不选
+ 父子联动
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开/折叠
+ 全选/全不选
+ 父子联动
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/role/selectUser.vue b/ruoyi-ui-vue3/src/views/system/role/selectUser.vue
new file mode 100644
index 000000000..9be1ec96a
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/role/selectUser.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (pageNum - 1) * pageSize + scope.$index + 1 }}
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/user/index.vue b/ruoyi-ui-vue3/src/views/system/user/index.vue
new file mode 100644
index 000000000..883394075
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/user/index.vue
@@ -0,0 +1,608 @@
+
+ 基本信息
+角色信息
+
+ 提交
+ 返回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导入
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/user/profile/index.vue b/ruoyi-ui-vue3/src/views/system/user/profile/index.vue
new file mode 100644
index 000000000..09e4c326a
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/user/profile/index.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+ 下载模板
+
+
+
+
+ 仅允许导入xls、xlsx格式文件。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui-vue3/src/views/system/user/profile/resetPwd.vue
new file mode 100644
index 000000000..dec2d79c9
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/user/profile/resetPwd.vue
@@ -0,0 +1,57 @@
+
+
+ 个人信息
+
+
+
+
+
+
+ -
+
-
+
用户名称 + {{ state.user.userName }}+
+ -
+
手机号码 + {{ state.user.phonenumber }}+
+ -
+
用户邮箱 + {{ state.user.email }}+
+ -
+
所属部门 + {{ state.user.dept.deptName }} / {{ state.postGroup }}+
+ -
+
所属角色 + {{ state.roleGroup }}+
+ -
+
创建日期 + {{ state.user.createTime }}+
+
+ 基本资料
+
+
+
+ ![]( "点击上传头像")
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+ 提 交
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/views/system/user/profile/userInfo.vue b/ruoyi-ui-vue3/src/views/system/user/profile/userInfo.vue
new file mode 100644
index 000000000..2d62c842b
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/system/user/profile/userInfo.vue
@@ -0,0 +1,56 @@
+
+
+ ![]()
+
+ +
表单构建
+
\ No newline at end of file
diff --git a/ruoyi-ui-vue3/src/views/tool/gen/basicInfoForm.vue b/ruoyi-ui-vue3/src/views/tool/gen/basicInfoForm.vue
new file mode 100644
index 000000000..39c851507
--- /dev/null
+++ b/ruoyi-ui-vue3/src/views/tool/gen/basicInfoForm.vue
@@ -0,0 +1,48 @@
+
+
+ 提交
+ 返回
+
+ 其他信息
+关联信息
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 生成
+
+
+ 导入
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 复制
+
+
+
+
+
+
+
diff --git a/ruoyi-ui-vue3/vite.config.js b/ruoyi-ui-vue3/vite.config.js
new file mode 100644
index 000000000..d260bbc33
--- /dev/null
+++ b/ruoyi-ui-vue3/vite.config.js
@@ -0,0 +1,57 @@
+import { defineConfig, loadEnv } from 'vite'
+import path from 'path'
+import createVitePlugins from './vite/plugins'
+
+// https://vitejs.dev/config/
+export default defineConfig(({ mode, command }) => {
+ const env = loadEnv(mode, process.cwd())
+ return {
+ // 部署生产环境和开发环境下的URL。
+ // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+ // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+ base: env.VITE_APP_CONTEXT_PATH,
+ plugins: createVitePlugins(env, command === 'build'),
+ resolve: {
+ // https://cn.vitejs.dev/config/#resolve-alias
+ alias: {
+ // 设置路径
+ '~': path.resolve(__dirname, './'),
+ // 设置别名
+ '@': path.resolve(__dirname, './src')
+ },
+ // https://cn.vitejs.dev/config/#resolve-extensions
+ extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
+ },
+ // vite 相关配置
+ server: {
+ port: 80,
+ host: true,
+ open: true,
+ proxy: {
+ // https://cn.vitejs.dev/config/#server-proxy
+ '/dev-api': {
+ target: 'http://localhost:8080',
+ changeOrigin: true,
+ rewrite: (p) => p.replace(/^\/dev-api/, '')
+ }
+ }
+ },
+ //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+ css: {
+ postcss: {
+ plugins: [
+ {
+ postcssPlugin: 'internal:charset-removal',
+ AtRule: {
+ charset: (atRule) => {
+ if (atRule.name === 'charset') {
+ atRule.remove();
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+})
diff --git a/ruoyi-ui-vue3/vite/plugins/auto-import.js b/ruoyi-ui-vue3/vite/plugins/auto-import.js
new file mode 100644
index 000000000..a5d357638
--- /dev/null
+++ b/ruoyi-ui-vue3/vite/plugins/auto-import.js
@@ -0,0 +1,12 @@
+import autoImport from 'unplugin-auto-import/vite'
+
+export default function createAutoImport() {
+ return autoImport({
+ imports: [
+ 'vue',
+ 'vue-router',
+ 'pinia'
+ ],
+ dts: false
+ })
+}
diff --git a/ruoyi-ui-vue3/vite/plugins/compression.js b/ruoyi-ui-vue3/vite/plugins/compression.js
new file mode 100644
index 000000000..e90aaecce
--- /dev/null
+++ b/ruoyi-ui-vue3/vite/plugins/compression.js
@@ -0,0 +1,28 @@
+import compression from 'vite-plugin-compression'
+
+export default function createCompression(env) {
+ const { VITE_BUILD_COMPRESS } = env
+ const plugin = []
+ if (VITE_BUILD_COMPRESS) {
+ const compressList = VITE_BUILD_COMPRESS.split(',')
+ if (compressList.includes('gzip')) {
+ // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+ plugin.push(
+ compression({
+ ext: '.gz',
+ deleteOriginFile: false
+ })
+ )
+ }
+ if (compressList.includes('brotli')) {
+ plugin.push(
+ compression({
+ ext: '.br',
+ algorithm: 'brotliCompress',
+ deleteOriginFile: false
+ })
+ )
+ }
+ }
+ return plugin
+}
diff --git a/ruoyi-ui-vue3/vite/plugins/index.js b/ruoyi-ui-vue3/vite/plugins/index.js
new file mode 100644
index 000000000..10e17c3df
--- /dev/null
+++ b/ruoyi-ui-vue3/vite/plugins/index.js
@@ -0,0 +1,15 @@
+import vue from '@vitejs/plugin-vue'
+
+import createAutoImport from './auto-import'
+import createSvgIcon from './svg-icon'
+import createCompression from './compression'
+import createSetupExtend from './setup-extend'
+
+export default function createVitePlugins(viteEnv, isBuild = false) {
+ const vitePlugins = [vue()]
+ vitePlugins.push(createAutoImport())
+ vitePlugins.push(createSetupExtend())
+ vitePlugins.push(createSvgIcon(isBuild))
+ isBuild && vitePlugins.push(...createCompression(viteEnv))
+ return vitePlugins
+}
diff --git a/ruoyi-ui-vue3/vite/plugins/setup-extend.js b/ruoyi-ui-vue3/vite/plugins/setup-extend.js
new file mode 100644
index 000000000..a4980f300
--- /dev/null
+++ b/ruoyi-ui-vue3/vite/plugins/setup-extend.js
@@ -0,0 +1,5 @@
+import setupExtend from 'vite-plugin-vue-setup-extend'
+
+export default function createSetupExtend() {
+ return setupExtend()
+}
diff --git a/ruoyi-ui-vue3/vite/plugins/svg-icon.js b/ruoyi-ui-vue3/vite/plugins/svg-icon.js
new file mode 100644
index 000000000..30a4140f4
--- /dev/null
+++ b/ruoyi-ui-vue3/vite/plugins/svg-icon.js
@@ -0,0 +1,10 @@
+import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
+import path from 'path'
+
+export default function createSvgIcon(isBuild) {
+ return createSvgIconsPlugin({
+ iconDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')],
+ symbolId: 'icon-[dir]-[name]',
+ svgoOptions: isBuild
+ })
+}
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 232d9077b..c5457c9a6 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_CONTEXT_PATH = '/'
# 监控地址
-VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
+VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/applications'
# xxl-job 控制台地址
VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index f92c1af3d..1d2cbae6a 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/prod-api'
VUE_APP_CONTEXT_PATH = '/'
# 监控地址
-VUE_APP_MONITRO_ADMIN = '/admin/login'
+VUE_APP_MONITRO_ADMIN = '/admin/applications'
# xxl-job 控制台地址
VUE_APP_XXL_JOB_ADMIN = '/xxl-job-admin'
diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md
index 00c0ab84f..9394319ec 100644
--- a/ruoyi-ui/README.md
+++ b/ruoyi-ui/README.md
@@ -1,9 +1,6 @@
## 开发
```bash
-# 克隆项目
-git clone https://gitee.com/y_project/RuoYi-Vue
-
# 进入项目目录
cd ruoyi-ui
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 651eab334..56eebc75b 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "4.7.0",
+ "version": "4.8.0",
"description": "RuoYi-Vue-Plus后台管理系统",
"author": "LionLi",
"license": "MIT",
@@ -40,7 +40,7 @@
"clipboard": "2.0.8",
"core-js": "3.25.3",
"echarts": "5.4.0",
- "element-ui": "2.15.12",
+ "element-ui": "2.15.13",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
index f92d99b7a..bb753a124 100644
--- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@@ -87,7 +87,7 @@ export default {
bottom: 0px;
}
.el-scrollbar__wrap {
- height: 39px;
+ height: 49px;
}
}
}
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index b27702f18..dae2ba9cf 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -34,6 +34,7 @@ export default {
},
zip(url, name) {
var url = baseURL + url
+ downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
axios({
method: 'get',
url: url,
@@ -50,6 +51,11 @@ export default {
} else {
this.printErrMsg(res.data);
}
+ downloadLoadingInstance.close();
+ }).catch((r) => {
+ console.error(r)
+ Message.error('下载文件出现错误，请联系管理员！')
+ downloadLoadingInstance.close();
})
},
saveAs(text, name, opts) {
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index b62ca5866..9a7d747ab 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -114,7 +114,7 @@ export default {
data() {
return {
// 版本号
- version: "4.7.0",
+ version: "4.8.0",
};
},
methods: {
diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue
index aacc7da4e..1c8b11b06 100644
--- a/ruoyi-ui/src/views/monitor/cache/index.vue
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@@ -133,6 +133,10 @@ export default {
}
]
});
+ window.addEventListener("resize",()=>{
+ this.commandstats.resize()
+ this.usedmemory.resize()
+ });
});
},
// 打开加载层
diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml
index b529a89fe..daf2e5d63 100644
--- a/ruoyi/pom.xml
+++ b/ruoyi/pom.xml
@@ -5,7 +5,7 @@
{{ value }}
+