From d50fa8ed2296ea401597e719b3e424aaee73318f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 20 Feb 2021 16:17:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=20swagger=20=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=202.=20=E5=A2=9E=E5=8A=A0=20spring=20boot=20admin=20?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- .../com/ruoyi/common/SwaggerController.java | 22 -- ruoyi-ui/README.md | 4 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/api/monitor/server.js | 9 - ruoyi-ui/src/components/RuoYi/Git/index.vue | 6 +- ruoyi-ui/src/views/index_old.vue | 2 +- ruoyi-ui/src/views/infra/server/index.vue | 218 ++---------------- ruoyi-ui/src/views/login.vue | 2 +- ruoyi-ui/src/views/tool/swagger/index.vue | 2 +- .../controller/redis/RedisController.java | 2 +- .../controller/auth/SysAuthController.java | 2 +- .../auth/SysUserSessionController.java | 2 +- .../common/SysCaptchaController.java | 2 +- .../controller/common/SysFileController.java | 2 +- .../controller/dept/SysDeptController.java | 2 +- .../controller/dept/SysPostController.java | 2 +- .../dict/SysDictDataController.java | 2 +- .../dict/SysDictTypeController.java | 2 +- .../logger/SysLoginLogController.java | 2 +- .../logger/SysOperateLogController.java | 2 +- .../notice/SysNoticeController.java | 2 +- .../permission/SysMenuController.java | 2 +- .../permission/SysPermissionController.java | 2 +- .../permission/SysRoleController.java | 2 +- .../controller/user/SysUserController.java | 2 +- .../codegen/ToolCodegenController.java | 38 +-- src/main/resources/application-dev.yaml | 2 +- src/main/resources/application-local.yaml | 2 +- 29 files changed, 60 insertions(+), 284 deletions(-) delete mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/SwaggerController.java delete mode 100644 ruoyi-ui/src/api/monitor/server.js diff --git a/README.md b/README.md index 2c028db66..6288574b5 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,7 @@ - admin/admin123 -演示地址：http://vue.ruoyi.vip -文档地址：http://doc.ruoyi.vip +演示地址： ## 演示图 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/SwaggerController.java b/ruoyi-common/src/main/java/com/ruoyi/common/SwaggerController.java deleted file mode 100644 index b79c15f4b..000000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/SwaggerController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ruoyi.web.controller.tool; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; - -/** - * swagger 接口 - * - * @author ruoyi - */ -@Controller -@RequestMapping("/tool/swagger") -public class SwaggerController extends BaseController { - @PreAuthorize("@ss.hasPermi('tool:swagger:view')") - @GetMapping() - public String index() { - return redirect("/swagger-ui.html"); - } -} diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md index 5b5b5bda7..e8e6b3407 100644 --- a/ruoyi-ui/README.md +++ b/ruoyi-ui/README.md @@ -2,7 +2,7 @@ ```bash # 克隆项目 -git clone https://gitee.com/y_project/RuoYi-Vue +git clone https://github.com/YunaiV/ruoyi-vue-pro # 进入项目目录 cd ruoyi-ui @@ -27,4 +27,4 @@ npm run build:stage # 构建生产环境 npm run build:prod -``` \ No newline at end of file +``` diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 853fff46e..1dd8a7cdd 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -33,7 +33,7 @@ ], "repository": { "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" + "url": "https://github.com/YunaiV/ruoyi-vue-pro" }, "dependencies": { "@riophae/vue-treeselect": "0.4.0", diff --git a/ruoyi-ui/src/api/monitor/server.js b/ruoyi-ui/src/api/monitor/server.js deleted file mode 100644 index 4991a4416..000000000 --- a/ruoyi-ui/src/api/monitor/server.js +++ /dev/null @@ -1,9 +0,0 @@ -import request from '@/utils/request' - -// 查询服务器详细 -export function getServer() { - return request({ - url: '/monitor/server', - method: 'get' - }) -} \ No newline at end of file diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/ruoyi-ui/src/components/RuoYi/Git/index.vue index 2aab63c15..350fd9291 100644 --- a/ruoyi-ui/src/components/RuoYi/Git/index.vue +++ b/ruoyi-ui/src/components/RuoYi/Git/index.vue @@ -6,10 +6,10 @@ \ No newline at end of file + diff --git a/ruoyi-ui/src/views/index_old.vue b/ruoyi-ui/src/views/index_old.vue index 71fb9803a..38c0a4e29 100644 --- a/ruoyi-ui/src/views/index_old.vue +++ b/ruoyi-ui/src/views/index_old.vue @@ -55,7 +55,7 @@ size="mini" icon="el-icon-cloudy" plain - @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')" + @click="goTarget('https://gitee.com/zhijiantianya/ruoyi-vue-pro')" >访问码云 -
- - - -
CPU
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
属性
值
核心数
{{ server.cpu.cpuNum }}
用户使用率
{{ server.cpu.used }}%
系统使用率
{{ server.cpu.sys }}%
当前空闲率
{{ server.cpu.free }}%
-
- - - - - -
内存
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
属性
内存
JVM
总内存
{{ server.mem.total }}G
{{ server.jvm.total }}M
已用内存
{{ server.mem.used}}G
{{ server.jvm.used}}M
剩余内存
{{ server.mem.free }}G
{{ server.jvm.free }}M
使用率
{{ server.mem.usage }}%
{{ server.jvm.usage }}%
-
- - - - - -
- 服务器信息 -
-
- - - - - - - - - - - - - - - -
服务器名称
{{ server.sys.computerName }}
操作系统
{{ server.sys.osName }}
服务器IP
{{ server.sys.computerIp }}
系统架构
{{ server.sys.osArch }}
-
- - - - - -
- Java虚拟机信息 -
-
- - - - - - - - - - - - - - - - - - - - - - - -
Java名称
{{ server.jvm.name }}
Java版本
{{ server.jvm.version }}
启动时间
{{ server.jvm.startTime }}
运行时长
{{ server.jvm.runTime }}
安装路径
{{ server.jvm.home }}
项目路径
{{ server.sys.userDir }}
-
- - - - - -
- 磁盘状态 -
-
- - - - - - - - - - - - - - - - - - - - - - - -
盘符路径
文件系统
盘符类型
总大小
可用大小
已用大小
已用百分比
{{ sysFile.dirName }}
{{ sysFile.sysTypeName }}
{{ sysFile.typeName }}
{{ sysFile.total }}
{{ sysFile.free }}
{{ sysFile.used }}
{{ sysFile.usage }}%
-
- - - +
+