From 69829827fe4733e35b47a4172e01ec99b5d88daf Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 21 Sep 2020 14:10:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95&=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=96=B0=E5=A2=9E=EF=BC=88=E5=B1=95=E5=BC=80?= =?UTF-8?q?/=E6=8A=98=E5=8F=A0=20=E5=85=A8=E9=80=89/=E5=85=A8=E4=B8=8D?= =?UTF-8?q?=E9=80=89=20=E7=88=B6=E5=AD=90=E8=81=94=E5=8A=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysRoleMapper.xml | 4 ++-- ruoyi-ui/src/views/system/role/index.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 2cc23e8d7..818941fa1 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -97,8 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" role_key, role_sort, data_scope, - menu_check_strictly, - dept_check_strictly, + menu_check_strictly, + dept_check_strictly, status, remark, create_by, diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 9c760f6c7..f54a7e759 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -440,6 +440,7 @@ export default { menuIds: [], deptIds: [], menuCheckStrictly: true, + deptCheckStrictly: true, remark: undefined }; this.resetForm("form"); From 28bceda630948af4184bce48f68c0279695a56d9 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 22 Sep 2020 11:09:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=87=E5=AD=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/monitor/SysLogininforController.java | 8 ++++---- .../java/com/ruoyi/common/core/domain/entity/SysUser.java | 8 ++++---- .../com/ruoyi/common/core/domain/model/LoginUser.java | 2 +- .../com/ruoyi/framework/manager/factory/AsyncFactory.java | 2 +- sql/ry_20200920.sql | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 560c4b585..14f57fdaf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -38,18 +38,18 @@ public class SysLogininforController extends BaseController return getDataTable(list); } - @Log(title = "登陆日志", businessType = BusinessType.EXPORT) + @Log(title = "登录日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") @GetMapping("/export") public AjaxResult export(SysLogininfor logininfor) { List list = logininforService.selectLogininforList(logininfor); ExcelUtil util = new ExcelUtil(SysLogininfor.class); - return util.exportExcel(list, "登陆日志"); + return util.exportExcel(list, "登录日志"); } @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") - @Log(title = "登陆日志", businessType = BusinessType.DELETE) + @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") public AjaxResult remove(@PathVariable Long[] infoIds) { @@ -57,7 +57,7 @@ public class SysLogininforController extends BaseController } @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") - @Log(title = "登陆日志", businessType = BusinessType.CLEAN) + @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") public AjaxResult clean() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index f7e68e7b0..4c3592560 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -68,12 +68,12 @@ public class SysUser extends BaseEntity /** 删除标志(0代表存在 2代表删除) */ private String delFlag; - /** 最后登陆IP */ - @Excel(name = "最后登陆IP", type = Type.EXPORT) + /** 最后登录IP */ + @Excel(name = "最后登录IP", type = Type.EXPORT) private String loginIp; - /** 最后登陆时间 */ - @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) + /** 最后登录时间 */ + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; /** 部门对象 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index a8b112692..d389ff8e5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -22,7 +22,7 @@ public class LoginUser implements UserDetails private String token; /** - * 登陆时间 + * 登录时间 */ private Long loginTime; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java index 3d6cef9f0..57af9bb60 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java @@ -25,7 +25,7 @@ public class AsyncFactory private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user"); /** - * 记录登陆信息 + * 记录登录信息 * * @param username 用户名 * @param status 状态 diff --git a/sql/ry_20200920.sql b/sql/ry_20200920.sql index 4d8614fa8..ef8a19e7a 100644 --- a/sql/ry_20200920.sql +++ b/sql/ry_20200920.sql @@ -52,8 +52,8 @@ create table sys_user ( password varchar(100) default '' comment '密码', status char(1) default '0' comment '帐号状态(0正常 1停用)', del_flag char(1) default '0' comment '删除标志(0代表存在 2代表删除)', - login_ip varchar(50) default '' comment '最后登陆IP', - login_date datetime comment '最后登陆时间', + login_ip varchar(50) default '' comment '最后登录IP', + login_date datetime comment '最后登录时间', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者', From a82a3d94651646c52e10e2aad9651e3b7877f230 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 22 Sep 2020 18:25:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7oshi=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=ACv5.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 13 ++++++++++++- ruoyi-framework/pom.xml | 10 ---------- .../java/com/ruoyi/framework/web/domain/Server.java | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 03819415d..6eece91cc 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,8 @@ 2.3.2 1.2.5 1.2.73 - 3.9.1 + 5.2.5 + 5.5.0 2.5 1.3.3 3.17 @@ -73,6 +74,16 @@ oshi-core ${oshi.version} + + + net.java.dev.jna + jna + + + + net.java.dev.jna + jna-platform + diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index ebf488300..6cb3c707c 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -53,16 +53,6 @@ oshi-core - - net.java.dev.jna - jna - - - - net.java.dev.jna - jna-platform - - com.ruoyi diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java index 93e411bbd..30a1957eb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java @@ -189,7 +189,7 @@ public class Server private void setSysFiles(OperatingSystem os) { FileSystem fileSystem = os.getFileSystem(); - OSFileStore[] fsArray = fileSystem.getFileStores(); + List fsArray = fileSystem.getFileStores(); for (OSFileStore fs : fsArray) { long free = fs.getUsableSpace();