diff --git a/doc/new_intall_20180301.sql b/doc/new_intall_20180302.sql similarity index 86% rename from doc/new_intall_20180301.sql rename to doc/new_intall_20180302.sql index b5214fa69..05f00f4b6 100644 --- a/doc/new_intall_20180301.sql +++ b/doc/new_intall_20180302.sql @@ -106,14 +106,14 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', '#', 'M', '0', '#', 'fa fa-gear', '2018-01-01', '', 'admin', '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', '#', 'M', '0', '#', 'fa fa-video-camera', '2018-01-01', '', 'admin', '系统监控目录'); -- 二级菜单 -insert into sys_menu values('3', '用户管理', '1', '1', '/system/user/userList', 'C', '0', 'system:user:list', '#', '2018-01-01', '', 'admin', '用户管理菜单'); -insert into sys_menu values('4', '角色管理', '1', '2', '/system/role/roleList', 'C', '0', 'system:role:list', '#', '2018-01-01', '', 'admin', '角色管理菜单'); -insert into sys_menu values('5', '菜单管理', '1', '3', '/system/menu/menuList', 'C', '0', 'system:menu:list', '#', '2018-01-01', '', 'admin', '菜单管理菜单'); -insert into sys_menu values('6', '部门管理', '1', '3', '/system/dept/deptList', 'C', '0', 'system:dept:list', '#', '2018-01-01', '', 'admin', '部门管理菜单'); -insert into sys_menu values('7', '操作日志', '2', '1', '/system/operlog/operlogList', 'C', '0', 'system:operlog:list', '#', '2018-01-01', '', 'admin', '操作日志菜单'); -insert into sys_menu values('8', '登录日志', '2', '2', '/system/userlog/userlogList', 'C', '0', 'system:userlog:list', '#', '2018-01-01', '', 'admin', '登录日志菜单'); -insert into sys_menu values('9', '在线用户', '2', '3', '/monitor/online', 'C', '0', 'monitor:online', '#', '2018-01-01', '', 'admin', '在线用户菜单'); -insert into sys_menu values('10', '数据监控', '2', '4', '/monitor/druid/index.html', 'C', '0', 'monitor:druid:list', '#', '2018-01-01', '', 'admin', '数据监控菜单'); +insert into sys_menu values('3', '用户管理', '1', '1', '/system/user/userList', 'C', '0', 'system:user:list', '#', '2018-01-01', '', 'admin', '用户管理菜单'); +insert into sys_menu values('4', '角色管理', '1', '2', '/system/role/roleList', 'C', '0', 'system:role:list', '#', '2018-01-01', '', 'admin', '角色管理菜单'); +insert into sys_menu values('5', '菜单管理', '1', '3', '/system/menu/menuList', 'C', '0', 'system:menu:list', '#', '2018-01-01', '', 'admin', '菜单管理菜单'); +insert into sys_menu values('6', '部门管理', '1', '3', '/system/dept/deptList', 'C', '0', 'system:dept:list', '#', '2018-01-01', '', 'admin', '部门管理菜单'); +insert into sys_menu values('7', '操作日志', '2', '1', '/monitor/operlog', 'C', '0', 'monitor:operlog', '#', '2018-01-01', '', 'admin', '操作日志菜单'); +insert into sys_menu values('8', '登录日志', '2', '2', '/monitor/logininfor', 'C', '0', 'monitor:logininfor', '#', '2018-01-01', '', 'admin', '登录日志菜单'); +insert into sys_menu values('9', '在线用户', '2', '3', '/monitor/online', 'C', '0', 'monitor:online', '#', '2018-01-01', '', 'admin', '在线用户菜单'); +insert into sys_menu values('10', '数据监控', '2', '4', '/monitor/druid/index.html', 'C', '0', 'monitor:druid', '#', '2018-01-01', '', 'admin', '数据监控菜单'); --- 三级用户按钮 insert into sys_menu values('11', '用户新增', '3', '1', '/system/user/add', 'F', '0', 'sys:user:add', '#', '2018-01-01', '', 'admin', '用户管理新增按钮'); insert into sys_menu values('12', '用户修改', '3', '2', '/system/user/update', 'F', '0', 'sys:user:update', '#', '2018-01-01', '', 'admin', '用户管理修改按钮'); @@ -131,10 +131,6 @@ insert into sys_menu values('21', '菜单新增', '5', '1', '/system/menu/add', insert into sys_menu values('22', '菜单修改', '5', '2', '/system/menu/update', 'F', '0', 'sys:menu:update', '#', '2018-01-01', '', 'admin', '菜单管理修改按钮'); insert into sys_menu values('23', '菜单删除', '5', '3', '/system/menu/delete', 'F', '0', 'sys:menu:delete', '#', '2018-01-01', '', 'admin', '菜单管理删除按钮'); insert into sys_menu values('24', '菜单查询', '5', '4', '/system/menu/select', 'F', '0', 'sys:menu:select', '#', '2018-01-01', '', 'system', '菜单管理查询按钮'); ---- 三级日志按钮 -insert into sys_menu values('25', '操作日志查询', '4', '5', '/system/operlog/auth', 'F', '0', 'sys:operlog:select', '#', '2018-01-01', '', 'admin', '操作日志查询按钮'); -insert into sys_menu values('26', '登录日志查询', '4', '5', '/system/userlog/auth', 'F', '0', 'sys:userlog:select', '#', '2018-01-01', '', 'admin', '登录日志查询按钮'); - -- ---------------------------- -- 5、用户和角色关联表 用户N-1角色 @@ -244,16 +240,16 @@ drop table if exists sys_logininfor; create table sys_logininfor ( info_id int(11) not null auto_increment comment '访问ID', login_name varchar(50) default '' comment '登录名', - status int(1) default 0 comment '登录状态 0成功 1失败', ipaddr varchar(50) default '' comment '登录IP地址', browser varchar(50) default '' comment '浏览器类型', os varchar(50) default '' comment '操作系统', + status int(1) default 0 comment '登录状态 0成功 1失败', msg varchar(255) default '' comment '提示消息', - logondate timestamp default current_timestamp comment '访问时间', + login_time timestamp default current_timestamp comment '访问时间', primary key (info_id) ) engine=innodb auto_increment=100 default charset=utf8; -insert into sys_logininfor values(1, 'admin', 0 , '127.0.0.1', 'Chrome 45', 'Windows 7', '登录成功' ,'2018-01-01'); +insert into sys_logininfor values(1, 'admin', '127.0.0.1', 'Chrome 45', 'Windows 7', 0, '登录成功' ,'2018-01-01'); -- ---------------------------- -- 10、在线用户记录 @@ -269,7 +265,7 @@ create table sys_user_online ( status varchar(10) default '' comment '在线状态on_line在线off_line离线', start_timestsamp timestamp default current_timestamp comment 'session创建时间', last_access_time timestamp default current_timestamp comment 'session最后访问时间', - expireTime int(5) default 0 comment '超时时间，单位为分钟', + expire_time int(5) default 0 comment '超时时间，单位为分钟', primary key (sessionId) ) engine=innodb default charset=utf8; diff --git a/src/main/java/com/ruoyi/RuoYiApplication.java b/src/main/java/com/ruoyi/RuoYiApplication.java index 8f3e92ffe..cb0bcb343 100644 --- a/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/src/main/java/com/ruoyi/RuoYiApplication.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 启动程序 * - * @author yangzz + * @author ruoyi */ @SpringBootApplication @EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class }) diff --git a/src/main/java/com/ruoyi/common/constant/CommonConstant.java b/src/main/java/com/ruoyi/common/constant/CommonConstant.java index 84e95d92e..8ba75be59 100644 --- a/src/main/java/com/ruoyi/common/constant/CommonConstant.java +++ b/src/main/java/com/ruoyi/common/constant/CommonConstant.java @@ -3,7 +3,7 @@ package com.ruoyi.common.constant; /** * 通用常量信息 * - * @author yangzz + * @author ruoyi */ public class CommonConstant { diff --git a/src/main/java/com/ruoyi/common/constant/ShiroConstants.java b/src/main/java/com/ruoyi/common/constant/ShiroConstants.java index 421cb5a35..fe6c85b19 100644 --- a/src/main/java/com/ruoyi/common/constant/ShiroConstants.java +++ b/src/main/java/com/ruoyi/common/constant/ShiroConstants.java @@ -3,7 +3,7 @@ package com.ruoyi.common.constant; /** * Shiro通用常量 * - * @author yangzz + * @author ruoyi */ public interface ShiroConstants { @@ -17,11 +17,6 @@ public interface ShiroConstants */ public static final String CURRENT_USERNAME = "username"; - /** - * 验证码 - */ - public static final String CURRENT_JCAPTCHA = "jcaptcha"; - /** * 消息key */ @@ -32,11 +27,6 @@ public interface ShiroConstants */ public static String ERROR = "errorMsg"; - /** - * 验证码错误 - */ - public static final String JCAPTCHA_ERROR = "jcaptchaError"; - /** * 编码格式 */ diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/ruoyi/common/constant/UserConstants.java index c8f58cd7f..a6d661549 100644 --- a/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -3,7 +3,7 @@ package com.ruoyi.common.constant; /** * 用户常量信息 * - * @author yangzz + * @author ruoyi */ public class UserConstants { @@ -23,8 +23,6 @@ public class UserConstants /** 名称是否唯一的返回结果码 */ public final static String NAME_UNIQUE = "0"; - public final static String NAME_NOT_UNIQUE = "1"; - /** * 用户名长度限制 */ diff --git a/src/main/java/com/ruoyi/common/exception/CaptchaException.java b/src/main/java/com/ruoyi/common/exception/CaptchaException.java deleted file mode 100644 index aaaf52542..000000000 --- a/src/main/java/com/ruoyi/common/exception/CaptchaException.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.common.exception; - -import com.ruoyi.common.exception.user.UserException; - -/** - * 验证码错误异常类 - * - * @author yangzz - */ -public class CaptchaException extends UserException -{ - private static final long serialVersionUID = 1L; - - public CaptchaException() - { - super("user.jcaptcha.error", null); - } -} diff --git a/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/src/main/java/com/ruoyi/common/exception/base/BaseException.java index a5312aefa..f63e21ab4 100644 --- a/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/src/main/java/com/ruoyi/common/exception/base/BaseException.java @@ -7,7 +7,7 @@ import com.ruoyi.common.utils.MessageUtils; /** * 基础异常 * - * @author yangzz + * @author ruoyi */ public class BaseException extends RuntimeException { diff --git a/src/main/java/com/ruoyi/common/exception/base/DaoException.java b/src/main/java/com/ruoyi/common/exception/base/DaoException.java index 1a0f60fc5..42c97f507 100644 --- a/src/main/java/com/ruoyi/common/exception/base/DaoException.java +++ b/src/main/java/com/ruoyi/common/exception/base/DaoException.java @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.base; /** * Dao异常 * - * @author yangzz + * @author ruoyi */ public class DaoException extends RuntimeException { diff --git a/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java b/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java index 49855623a..887a14dfe 100644 --- a/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java +++ b/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.user; /** * 角色锁定异常类 * - * @author yangzz + * @author ruoyi */ public class RoleBlockedException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java b/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java index bea31b187..20a4c267b 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.user; /** * 用户锁定异常类 * - * @author yangzz + * @author ruoyi */ public class UserBlockedException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserException.java b/src/main/java/com/ruoyi/common/exception/user/UserException.java index 78f07c03d..d3303da98 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserException.java @@ -5,7 +5,7 @@ import com.ruoyi.common.exception.base.BaseException; /** * 用户信息异常类 * - * @author yangzz + * @author ruoyi */ public class UserException extends BaseException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java index 33cad57a2..2c2357414 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.user; /** * 用户不存在异常类 * - * @author yangzz + * @author ruoyi */ public class UserNotExistsException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java index f53221d4d..3b7271f6a 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author yangzz + * @author ruoyi */ public class UserPasswordNotMatchException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java index 362e9e818..c3a2451e6 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.user; /** * 用户错误记数异常类 * - * @author yangzz + * @author ruoyi */ public class UserPasswordRetryLimitCountException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java index d1f18021a..b48c40657 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -3,7 +3,7 @@ package com.ruoyi.common.exception.user; /** * 用户错误最大次数异常类 * - * @author yangzz + * @author ruoyi */ public class UserPasswordRetryLimitExceedException extends UserException { diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/ruoyi/common/utils/DateUtils.java index 1fa2ba04c..56196bf4c 100644 --- a/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -7,7 +7,7 @@ import java.util.Date; /** * 时间工具类 * - * @author yangzz + * @author ruoyi */ public class DateUtils { diff --git a/src/main/java/com/ruoyi/common/utils/HttpContextUtils.java b/src/main/java/com/ruoyi/common/utils/HttpContextUtils.java index 36884056e..648f65ee4 100644 --- a/src/main/java/com/ruoyi/common/utils/HttpContextUtils.java +++ b/src/main/java/com/ruoyi/common/utils/HttpContextUtils.java @@ -7,7 +7,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; /** * 客户端工具类 * - * @author yangzz + * @author ruoyi */ public class HttpContextUtils { diff --git a/src/main/java/com/ruoyi/common/utils/IpUtils.java b/src/main/java/com/ruoyi/common/utils/IpUtils.java index 3a7c35be3..e28b6f63f 100644 --- a/src/main/java/com/ruoyi/common/utils/IpUtils.java +++ b/src/main/java/com/ruoyi/common/utils/IpUtils.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest; /** * 获取IP方法 * - * @author yangzz + * @author ruoyi */ public class IpUtils { diff --git a/src/main/java/com/ruoyi/common/utils/LogUtils.java b/src/main/java/com/ruoyi/common/utils/LogUtils.java index 1ab36ba4e..ecde4cf56 100644 --- a/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/src/main/java/com/ruoyi/common/utils/LogUtils.java @@ -12,7 +12,7 @@ import java.util.Map; /** * 处理并记录日志文件 * - * @author yangzz + * @author ruoyi */ public class LogUtils { diff --git a/src/main/java/com/ruoyi/common/utils/Md5Utils.java b/src/main/java/com/ruoyi/common/utils/Md5Utils.java index 96d5873ff..0cca350ee 100644 --- a/src/main/java/com/ruoyi/common/utils/Md5Utils.java +++ b/src/main/java/com/ruoyi/common/utils/Md5Utils.java @@ -6,7 +6,7 @@ import java.security.MessageDigest; /** * Md5加密方法 * - * @author yangzz + * @author ruoyi */ @Slf4j public class Md5Utils diff --git a/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/src/main/java/com/ruoyi/common/utils/MessageUtils.java index 0d50e23c0..72ff990e9 100644 --- a/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/src/main/java/com/ruoyi/common/utils/MessageUtils.java @@ -6,7 +6,7 @@ import com.ruoyi.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 * - * @author yangzz + * @author ruoyi */ public class MessageUtils { diff --git a/src/main/java/com/ruoyi/common/utils/StringUtils.java b/src/main/java/com/ruoyi/common/utils/StringUtils.java index 53335dab9..3ce78aa28 100644 --- a/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -6,7 +6,7 @@ import java.util.Map; /** * 字符串工具类 * - * @author yangzz + * @author ruoyi */ public class StringUtils { diff --git a/src/main/java/com/ruoyi/common/utils/SystemLogUtils.java b/src/main/java/com/ruoyi/common/utils/SystemLogUtils.java index 0241eaa90..9887eab51 100644 --- a/src/main/java/com/ruoyi/common/utils/SystemLogUtils.java +++ b/src/main/java/com/ruoyi/common/utils/SystemLogUtils.java @@ -6,14 +6,15 @@ import org.slf4j.LoggerFactory; import com.ruoyi.common.constant.CommonConstant; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.project.system.logininfor.domain.Logininfor; -import com.ruoyi.project.system.logininfor.service.LogininforServiceImpl; +import com.ruoyi.project.monitor.logininfor.domain.Logininfor; +import com.ruoyi.project.monitor.logininfor.service.LogininforServiceImpl; + import eu.bitwalker.useragentutils.UserAgent; /** * 记录用户日志信息 * - * @author yangzz + * @author ruoyi */ public class SystemLogUtils { diff --git a/src/main/java/com/ruoyi/common/utils/TreeUtils.java b/src/main/java/com/ruoyi/common/utils/TreeUtils.java index daa7980e3..58c240152 100644 --- a/src/main/java/com/ruoyi/common/utils/TreeUtils.java +++ b/src/main/java/com/ruoyi/common/utils/TreeUtils.java @@ -9,7 +9,7 @@ import com.ruoyi.project.system.menu.domain.Menu; /** * 权限数据处理 * - * @author y + * @author ruoyi */ public class TreeUtils { diff --git a/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java b/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java index b1c5b7c34..32c900742 100644 --- a/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java +++ b/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java @@ -8,7 +8,7 @@ import com.ruoyi.project.system.user.domain.User; /** * shiro 工具类 * - * @author yangzz + * @author ruoyi */ public class ShiroUtils { diff --git a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java index 34edd7443..e943443af 100644 --- a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; /** * spring工具类 方便在非spring管理环境中获取bean * - * @author yangzz + * @author ruoyi */ @Component public final class SpringUtils implements BeanFactoryPostProcessor diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 517d3ed63..5f51cf026 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; /** * 操作日志记录处理 * - * @author yangzz + * @author ruoyi */ @Aspect diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java index 2f5fa7b0c..4f40fa29f 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java +++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 自定义操作日志记录注解 * - * @author yangzz + * @author ruoyi * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/src/main/java/com/ruoyi/framework/config/BaseConfig.java b/src/main/java/com/ruoyi/framework/config/BaseConfig.java index 448983be2..dc9ad816f 100644 --- a/src/main/java/com/ruoyi/framework/config/BaseConfig.java +++ b/src/main/java/com/ruoyi/framework/config/BaseConfig.java @@ -9,7 +9,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter /** * 通用配置 * - * @author yangzz + * @author ruoyi */ @Configuration public class BaseConfig extends WebMvcConfigurerAdapter diff --git a/src/main/java/com/ruoyi/framework/config/Configuration.java b/src/main/java/com/ruoyi/framework/config/Configuration.java index c8d786c03..5fc003349 100644 --- a/src/main/java/com/ruoyi/framework/config/Configuration.java +++ b/src/main/java/com/ruoyi/framework/config/Configuration.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * 配置信息 * - * @author yangzz + * @author ruoyi */ @Component @ConfigurationProperties(prefix = "ruoyi") diff --git a/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/src/main/java/com/ruoyi/framework/config/DruidConfig.java index 5655aebd0..bae3a71ed 100644 --- a/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/src/main/java/com/ruoyi/framework/config/DruidConfig.java @@ -16,7 +16,7 @@ import lombok.extern.slf4j.Slf4j; /** * Druid数据库信息配置加载 * - * @author yangzz + * @author ruoyi */ @Configuration @Slf4j diff --git a/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/src/main/java/com/ruoyi/framework/config/I18nConfig.java index 94ce52f8b..fd06b2ff2 100644 --- a/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/src/main/java/com/ruoyi/framework/config/I18nConfig.java @@ -14,7 +14,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver; /** * 资源文件配置加载 * - * @author yangzz + * @author ruoyi */ @Configuration @Component diff --git a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index c0b6356ff..f3d81b33c 100644 --- a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -29,7 +29,7 @@ import at.pollux.thymeleaf.shiro.dialect.ShiroDialect; /** * 权限配置加载 * - * @author yangzz + * @author ruoyi */ @Configuration public class ShiroConfig diff --git a/src/main/java/com/ruoyi/framework/mybatis/ExecutorPageMethodInterceptor.java b/src/main/java/com/ruoyi/framework/mybatis/ExecutorPageMethodInterceptor.java index ff1ae73b7..6b4f2ab5e 100644 --- a/src/main/java/com/ruoyi/framework/mybatis/ExecutorPageMethodInterceptor.java +++ b/src/main/java/com/ruoyi/framework/mybatis/ExecutorPageMethodInterceptor.java @@ -34,7 +34,7 @@ import com.ruoyi.framework.web.page.PageUtilEntity; /**三 * 拦截需要分页SQL * - * @author yangzz + * @author ruoyi */ @Intercepts({ @Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class }) }) public class ExecutorPageMethodInterceptor implements Interceptor diff --git a/src/main/java/com/ruoyi/framework/mybatis/ReflectHelper.java b/src/main/java/com/ruoyi/framework/mybatis/ReflectHelper.java index b4c813a2f..f374f265a 100644 --- a/src/main/java/com/ruoyi/framework/mybatis/ReflectHelper.java +++ b/src/main/java/com/ruoyi/framework/mybatis/ReflectHelper.java @@ -5,7 +5,7 @@ import java.lang.reflect.Field; /** * 拦截需要分页SQL 反射工具 * - * @author yangzz + * @author ruoyi */ public class ReflectHelper { diff --git a/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java b/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java index dd049cd64..007681ccf 100644 --- a/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java +++ b/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java @@ -14,8 +14,6 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; import org.springframework.beans.factory.annotation.Autowired; - -import com.ruoyi.common.exception.CaptchaException; import com.ruoyi.common.exception.user.RoleBlockedException; import com.ruoyi.common.exception.user.UserBlockedException; import com.ruoyi.common.exception.user.UserNotExistsException; @@ -26,13 +24,12 @@ import com.ruoyi.framework.shiro.service.LoginService; import com.ruoyi.project.system.menu.service.IMenuService; import com.ruoyi.project.system.role.service.IRoleService; import com.ruoyi.project.system.user.domain.User; - import lombok.extern.slf4j.Slf4j; /** * 自定义Realm 处理登录 权限 * - * @author yangzz + * @author ruoyi */ @Slf4j public class UserRealm extends AuthorizingRealm @@ -81,11 +78,6 @@ public class UserRealm extends AuthorizingRealm { user = loginService.login(username, password); } - - catch (CaptchaException e) - { - throw new AuthenticationException(e.getMessage(), e); - } catch (UserNotExistsException e) { throw new UnknownAccountException(e.getMessage(), e); diff --git a/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java b/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java index 416f58b9e..be3f13d28 100644 --- a/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java +++ b/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java @@ -16,7 +16,7 @@ import com.ruoyi.project.system.user.service.IUserService; /** * 登录校验方法 * - * @author yangzz + * @author ruoyi */ @Component public class LoginService diff --git a/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java b/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java index 7fa3b912d..93d3e4c9e 100644 --- a/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java +++ b/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java @@ -19,7 +19,7 @@ import com.ruoyi.project.system.user.domain.User; /** * 登录密码方法 * - * @author yangzz + * @author ruoyi */ @Component public class PasswordService diff --git a/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java index e2e26eafc..79e84b80f 100644 --- a/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java +++ b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java @@ -13,7 +13,7 @@ import com.ruoyi.project.monitor.online.service.IUserOnlineService; /** * 针对自定义的ShiroSession的db操作 * - * @author yangzz + * @author ruoyi */ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO { diff --git a/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java index 65119dd55..f9391b84f 100644 --- a/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java +++ b/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java @@ -17,7 +17,7 @@ import eu.bitwalker.useragentutils.UserAgent; /** * 自定义sessionFactory会话 * - * @author yangzz + * @author ruoyi */ @Component public class OnlineSessionFactory implements SessionFactory diff --git a/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java index 6baf559e1..f4ea6b89c 100644 --- a/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java @@ -18,8 +18,8 @@ import com.ruoyi.project.system.user.domain.User; /** * 自定义访问控制 - * @author yangzz - * + * + * @author ruoyi */ public class OnlineSessionFilter extends AccessControlFilter { diff --git a/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java index 85501df3d..f0e75dcae 100644 --- a/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java @@ -12,7 +12,7 @@ import com.ruoyi.project.monitor.online.domain.OnlineSession; /** * 同步Session数据到Db * - * @author yangzz + * @author ruoyi */ public class SyncOnlineSessionFilter extends PathMatchingFilter { diff --git a/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java b/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java index 37727ac25..95144548d 100644 --- a/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java @@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; /** * 主要是在此如果会话的属性修改了 就标识下其修改了 然后方便 OnlineSessionDao同步 * - * @author yangzz + * @author ruoyi */ @Slf4j public class OnlineWebSessionManager extends DefaultWebSessionManager diff --git a/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java b/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java index 485cd8cf3..4b3ec20bf 100644 --- a/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; /** * 自定义任务调度器完成 * - * @author yangzz + * @author ruoyi */ @Slf4j public class SpringSessionValidationScheduler implements SessionValidationScheduler diff --git a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java index d2a37c4f2..7a8584ed7 100644 --- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java +++ b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java @@ -8,7 +8,7 @@ import com.ruoyi.project.system.user.domain.User; /** * web层通用数据处理 * - * @author yangzz + * @author ruoyi */ public class BaseController { diff --git a/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java b/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java index 0e99ae3e9..cf5dde305 100644 --- a/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java +++ b/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java @@ -6,15 +6,13 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionTemplate; - import com.ruoyi.common.exception.base.DaoException; - import lombok.extern.slf4j.Slf4j; /** * 数据DAO层通用数据处理 * - * @author yangzz + * @author ruoyi */ @Slf4j public class DynamicObjectBaseDao diff --git a/src/main/java/com/ruoyi/framework/web/domain/JSON.java b/src/main/java/com/ruoyi/framework/web/domain/JSON.java index d0d48c742..0677e05cf 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/JSON.java +++ b/src/main/java/com/ruoyi/framework/web/domain/JSON.java @@ -6,7 +6,7 @@ import java.util.Map; /** * 返回数据通用处理 * - * @author yangzz + * @author ruoyi */ public class JSON extends HashMap { diff --git a/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java b/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java index 4037d8957..59c4f1c14 100644 --- a/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java +++ b/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java @@ -10,8 +10,7 @@ import lombok.extern.slf4j.Slf4j; /** * 自定义异常处理器 * - * @author yangzz - * + * @author ruoyi */ @Slf4j @RestControllerAdvice diff --git a/src/main/java/com/ruoyi/framework/web/page/PageUtilEntity.java b/src/main/java/com/ruoyi/framework/web/page/PageUtilEntity.java index 6fb9efb88..2e88b592b 100644 --- a/src/main/java/com/ruoyi/framework/web/page/PageUtilEntity.java +++ b/src/main/java/com/ruoyi/framework/web/page/PageUtilEntity.java @@ -5,7 +5,7 @@ import lombok.Data; /** * 表格请求参数封装 * - * @author yangzz + * @author ruoyi */ @Data public class PageUtilEntity diff --git a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java b/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java index e9d50ebff..1e8b08fa9 100644 --- a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java +++ b/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java @@ -6,7 +6,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author yangzz + * @author ruoyi */ public class TableDataInfo implements Serializable { diff --git a/src/main/java/com/ruoyi/framework/web/support/TableSupport.java b/src/main/java/com/ruoyi/framework/web/support/TableSupport.java index 568057c5a..f4cc65daf 100644 --- a/src/main/java/com/ruoyi/framework/web/support/TableSupport.java +++ b/src/main/java/com/ruoyi/framework/web/support/TableSupport.java @@ -7,7 +7,7 @@ import com.ruoyi.framework.web.page.PageUtilEntity; /** * 表格数据处理 * - * @author yangzz + * @author ruoyi */ public class TableSupport { diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java b/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java new file mode 100644 index 000000000..fe406010c --- /dev/null +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java @@ -0,0 +1,44 @@ +package com.ruoyi.project.monitor.logininfor.controller; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.page.PageUtilEntity; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.project.monitor.logininfor.domain.Logininfor; +import com.ruoyi.project.monitor.logininfor.service.ILogininforService; + +/** + * 系统访问记录 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/monitor/logininfor") +public class LogininforController extends BaseController +{ + private String prefix = "monitor/logininfor"; + + @Autowired + private ILogininforService logininforService; + + @GetMapping() + public String logininfor() + { + return prefix + "/logininfor"; + } + + @GetMapping("/list") + @ResponseBody + public TableDataInfo list() + { + PageUtilEntity pageUtilEntity = this.getPageUtilEntity(); + List list = logininforService.pageInfoQueryLogininfor(pageUtilEntity); + TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult()); + return tableDataInfo; + } +} diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java new file mode 100644 index 000000000..d4a4ee43b --- /dev/null +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java @@ -0,0 +1,28 @@ +package com.ruoyi.project.monitor.logininfor.dao; + +import java.util.List; +import com.ruoyi.framework.web.page.PageUtilEntity; +import com.ruoyi.project.monitor.logininfor.domain.Logininfor; + +/** + * 系统访问日志情况信息 数据层 + * + * @author ruoyi + */ +public interface ILogininforDao +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void insertLogininfor(Logininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 登录记录集合 + */ + public List pageInfoQuery(PageUtilEntity pageUtilEntity); +} diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java new file mode 100644 index 000000000..ea1237e37 --- /dev/null +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java @@ -0,0 +1,49 @@ +package com.ruoyi.project.monitor.logininfor.dao; + +import java.util.List; +import org.springframework.stereotype.Repository; +import com.ruoyi.framework.web.dao.DynamicObjectBaseDao; +import com.ruoyi.framework.web.page.PageUtilEntity; +import com.ruoyi.project.monitor.logininfor.domain.Logininfor; + +/** + * 登录日志记录 数据层 + * + * @author ruoyi + */ +@Repository("logininforDao") +public class LogininforDaoImpl extends DynamicObjectBaseDao implements ILogininforDao +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + @Override + public void insertLogininfor(Logininfor logininfor) + { + this.save("SystemLogininforMapper.insertLogininfor", logininfor); + } + + /** + * 查询系统登录日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 登录记录集合 + */ + @Override + public List pageInfoQuery(PageUtilEntity pageUtilEntity) + { + List logininforList = null; + try + { + logininforList = this.findForList("SystemLogininforMapper.pageInfoQueryLogininfor", pageUtilEntity); + } + catch (Exception e) + { + e.printStackTrace(); + } + return logininforList; + } + +} diff --git a/src/main/java/com/ruoyi/project/system/logininfor/domain/Logininfor.java b/src/main/java/com/ruoyi/project/monitor/logininfor/domain/Logininfor.java similarity index 76% rename from src/main/java/com/ruoyi/project/system/logininfor/domain/Logininfor.java rename to src/main/java/com/ruoyi/project/monitor/logininfor/domain/Logininfor.java index d3afa128c..799f136e5 100644 --- a/src/main/java/com/ruoyi/project/system/logininfor/domain/Logininfor.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/domain/Logininfor.java @@ -1,11 +1,13 @@ -package com.ruoyi.project.system.logininfor.domain; +package com.ruoyi.project.monitor.logininfor.domain; + +import java.util.Date; import lombok.Data; /** * 系统访问日志情况信息 sys_logininfor * - * @author yangzz + * @author ruoyi */ @Data public class Logininfor @@ -25,6 +27,6 @@ public class Logininfor /** 提示消息 */ private String msg; /** 访问时间 */ - private String loginTime; + private Date loginTime; } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java new file mode 100644 index 000000000..42c38a27f --- /dev/null +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java @@ -0,0 +1,29 @@ +package com.ruoyi.project.monitor.logininfor.service; + +import java.util.List; +import com.ruoyi.framework.web.page.PageUtilEntity; +import com.ruoyi.project.monitor.logininfor.domain.Logininfor; + +/** + * 系统访问日志情况信息 服务层 + * + * @author ruoyi + */ +public interface ILogininforService +{ + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void insertLogininfor(Logininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 登录记录集合 + */ + public List pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity); +} diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java new file mode 100644 index 000000000..257e2ed1d --- /dev/null +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java @@ -0,0 +1,43 @@ +package com.ruoyi.project.monitor.logininfor.service; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.framework.web.page.PageUtilEntity; +import com.ruoyi.project.monitor.logininfor.dao.ILogininforDao; +import com.ruoyi.project.monitor.logininfor.domain.Logininfor; + +/** + * 系统访问日志情况信息 服务层处理 + * + * @author ruoyi + */ +@Service("logininforService") +public class LogininforServiceImpl implements ILogininforService +{ + + @Autowired + private ILogininforDao logininforDao; + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + @Override + public void insertLogininfor(Logininfor logininfor) + { + logininforDao.insertLogininfor(logininfor); + } + + /** + * 查询系统登录日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 登录记录集合 + */ + public List pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity) + { + return logininforDao.pageInfoQuery(pageUtilEntity); + } +} diff --git a/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java index a7f70a405..793b5d46f 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java +++ b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java @@ -24,7 +24,7 @@ import com.ruoyi.project.monitor.online.service.IUserOnlineService; /** * 在线用户监控 * - * @author yangzz + * @author ruoyi */ @Controller @RequestMapping("/monitor/online") diff --git a/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java b/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java index 58e729362..7a248e51c 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java +++ b/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java @@ -6,9 +6,9 @@ import com.ruoyi.framework.web.page.PageUtilEntity; import com.ruoyi.project.monitor.online.domain.UserOnline; /** - * 在线用户 服务层 + * 在线用户 数据层 * - * @author yangzz + * @author ruoyi */ public interface IUserOnlineDao { diff --git a/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java b/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java index 624c06cf1..bee540975 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java @@ -9,7 +9,7 @@ import com.ruoyi.project.monitor.online.domain.UserOnline; /** * 在线用户数据层 * - * @author yangzz + * @author ruoyi */ @Repository("userOnlineDao") public class UserOnlineDaoImpl extends DynamicObjectBaseDao implements IUserOnlineDao diff --git a/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java b/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java index b5ff685b6..02a144eff 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java +++ b/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java @@ -5,7 +5,7 @@ import org.apache.shiro.session.mgt.SimpleSession; /** * 在线用户会话属性 * - * @author yangzz + * @author ruoyi */ public class OnlineSession extends SimpleSession { diff --git a/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java b/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java index 27cb3190d..2054ebddd 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java +++ b/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java @@ -9,7 +9,7 @@ import lombok.Data; /** * 当前在线会话 sys_user_online * - * @author yangzz + * @author ruoyi */ @Data public class UserOnline diff --git a/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java b/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java index 328ccddce..c6c8a84d2 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java +++ b/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java @@ -9,7 +9,7 @@ import com.ruoyi.project.monitor.online.domain.UserOnline; /** * 在线用户 服务层 * - * @author yangzz + * @author ruoyi */ public interface IUserOnlineService { diff --git a/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java index 9118dc94f..baf1f114e 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java @@ -14,9 +14,9 @@ import com.ruoyi.project.monitor.online.dao.IUserOnlineDao; import com.ruoyi.project.monitor.online.domain.UserOnline; /** - * 在线用户 服务层 + * 在线用户 服务层处理 * - * @author yangzz + * @author ruoyi */ @Service("userOnlineService") public class UserOnlineServiceImpl implements IUserOnlineService diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java b/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java index 17301e5fb..2c15cd569 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java @@ -5,7 +5,7 @@ import com.ruoyi.project.monitor.operlog.domain.OperLog; /** * 操作日志 数据层 * - * @author yangzz + * @author ruoyi */ public interface IOperLogDao { diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java b/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java index 5e058fc11..bc97e9953 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java @@ -8,7 +8,7 @@ import com.ruoyi.project.monitor.operlog.domain.OperLog; /** * 操作日志记录 数据层 * - * @author yangzz + * @author ruoyi */ @Repository("operLogDao") public class OperLogDaoImpl extends DynamicObjectBaseDao implements IOperLogDao diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java b/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java index e833e60cd..1e86ea0bd 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java @@ -6,7 +6,7 @@ import lombok.Data; /** * 操作日志记录 oper_log * - * @author yangzz + * @author ruoyi */ @Data public class OperLog diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java b/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java index f4e7d9d3a..0bc54b4a6 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java @@ -5,7 +5,7 @@ import com.ruoyi.project.monitor.operlog.domain.OperLog; /** * 操作日志 服务层 * - * @author yangzz + * @author ruoyi */ public interface IOperLogService { diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java index 997e5db49..972941d2a 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java @@ -8,7 +8,7 @@ import com.ruoyi.project.monitor.operlog.domain.OperLog; /** * 操作日志 服务层处理 * - * @author yangzz + * @author ruoyi */ @Service("operLogService") public class OperLogServiceImpl implements IOperLogService diff --git a/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java b/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java index fcd6d8bc5..f1e889f50 100644 --- a/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java +++ b/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java @@ -5,7 +5,7 @@ import lombok.Data; /** * 部门对象 sys_dept * - * @author yangzz + * @author ruoyi */ @Data public class Dept diff --git a/src/main/java/com/ruoyi/project/system/logininfor/dao/ILogininforDao.java b/src/main/java/com/ruoyi/project/system/logininfor/dao/ILogininforDao.java deleted file mode 100644 index 026c760ae..000000000 --- a/src/main/java/com/ruoyi/project/system/logininfor/dao/ILogininforDao.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.project.system.logininfor.dao; - -import com.ruoyi.project.system.logininfor.domain.Logininfor; - -/** - * 系统访问日志情况信息 数据层 - * - * @author y - */ -public interface ILogininforDao -{ - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - public void insertLogininfor(Logininfor logininfor); -} diff --git a/src/main/java/com/ruoyi/project/system/logininfor/dao/LogininforDaoImpl.java b/src/main/java/com/ruoyi/project/system/logininfor/dao/LogininforDaoImpl.java deleted file mode 100644 index 223a70e14..000000000 --- a/src/main/java/com/ruoyi/project/system/logininfor/dao/LogininforDaoImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ruoyi.project.system.logininfor.dao; - -import org.springframework.stereotype.Repository; - -import com.ruoyi.framework.web.dao.DynamicObjectBaseDao; -import com.ruoyi.project.system.logininfor.domain.Logininfor; - -/** - * 登录日志记录 数据层 - * - * @author yangzz - */ -@Repository("logininforDao") -public class LogininforDaoImpl extends DynamicObjectBaseDao implements ILogininforDao -{ - - @Override - public void insertLogininfor(Logininfor logininfor) - { - this.save("SystemLogininforMapper.insertLogininfor", logininfor); - } - -} diff --git a/src/main/java/com/ruoyi/project/system/logininfor/service/ILogininforService.java b/src/main/java/com/ruoyi/project/system/logininfor/service/ILogininforService.java deleted file mode 100644 index d0e5d3564..000000000 --- a/src/main/java/com/ruoyi/project/system/logininfor/service/ILogininforService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ruoyi.project.system.logininfor.service; - -import com.ruoyi.project.system.logininfor.domain.Logininfor; - -/** - * 系统访问日志情况信息 服务层 - * - * @author yangzz - */ -public interface ILogininforService -{ - - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - public void insertLogininfor(Logininfor logininfor); -} diff --git a/src/main/java/com/ruoyi/project/system/logininfor/service/LogininforServiceImpl.java b/src/main/java/com/ruoyi/project/system/logininfor/service/LogininforServiceImpl.java deleted file mode 100644 index 5389047e4..000000000 --- a/src/main/java/com/ruoyi/project/system/logininfor/service/LogininforServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ruoyi.project.system.logininfor.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.project.system.logininfor.dao.ILogininforDao; -import com.ruoyi.project.system.logininfor.domain.Logininfor; - -/** - * 系统访问日志情况信息 服务层处理 - * - * @author yangzz - */ -@Service("logininforService") -public class LogininforServiceImpl implements ILogininforService -{ - - @Autowired - private ILogininforDao logininforDao; - - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - @Override - public void insertLogininfor(Logininfor logininfor) - { - logininforDao.insertLogininfor(logininfor); - } -} diff --git a/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java b/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java index 880f2c2d1..221023525 100644 --- a/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java +++ b/src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java @@ -6,7 +6,7 @@ import com.ruoyi.project.system.menu.domain.Menu; /** * 菜单表 数据层 * - * @author yangzz + * @author ruoyi */ public interface IMenuDao { diff --git a/src/main/java/com/ruoyi/project/system/menu/dao/MenuDaoImpl.java b/src/main/java/com/ruoyi/project/system/menu/dao/MenuDaoImpl.java index b41b4a23c..8e67f81e2 100644 --- a/src/main/java/com/ruoyi/project/system/menu/dao/MenuDaoImpl.java +++ b/src/main/java/com/ruoyi/project/system/menu/dao/MenuDaoImpl.java @@ -9,7 +9,7 @@ import com.ruoyi.project.system.menu.domain.Menu; /** * 菜单 数据层处理 * - * @author yangzz + * @author ruoyi */ @Repository("menuDao") public class MenuDaoImpl extends DynamicObjectBaseDao implements IMenuDao diff --git a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java index 517105776..ebf56d10d 100644 --- a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java +++ b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java @@ -7,7 +7,7 @@ import lombok.Data; /** * 角色对象 sys_menu * - * @author yangzz + * @author ruoyi */ @Data public class Menu diff --git a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java index ed09d310d..2950a04cf 100644 --- a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java +++ b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java @@ -8,7 +8,7 @@ import com.ruoyi.project.system.menu.domain.Menu; /** * 菜单 业务层 * - * @author yangzz + * @author ruoyi */ public interface IMenuService { diff --git a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java index 877a06847..a557bfdb5 100644 --- a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java @@ -16,7 +16,7 @@ import com.ruoyi.project.system.menu.domain.Menu; /** * 菜单 业务层处理 * - * @author yangzz + * @author ruoyi */ @Service("menuService") public class MenuServiceImpl implements IMenuService diff --git a/src/main/java/com/ruoyi/project/system/role/dao/IRoleDao.java b/src/main/java/com/ruoyi/project/system/role/dao/IRoleDao.java index 220343aea..5c5411b95 100644 --- a/src/main/java/com/ruoyi/project/system/role/dao/IRoleDao.java +++ b/src/main/java/com/ruoyi/project/system/role/dao/IRoleDao.java @@ -5,7 +5,7 @@ import java.util.List; /** * 角色表 数据层 * - * @author yangzz + * @author ruoyi */ public interface IRoleDao { diff --git a/src/main/java/com/ruoyi/project/system/role/dao/RoleDaoImpl.java b/src/main/java/com/ruoyi/project/system/role/dao/RoleDaoImpl.java index 4103c3b4a..43cd4cb4a 100644 --- a/src/main/java/com/ruoyi/project/system/role/dao/RoleDaoImpl.java +++ b/src/main/java/com/ruoyi/project/system/role/dao/RoleDaoImpl.java @@ -9,7 +9,7 @@ import com.ruoyi.framework.web.dao.DynamicObjectBaseDao; /** * 角色 数据层处理 * - * @author yangzz + * @author ruoyi */ @Repository("roleDao") public class RoleDaoImpl extends DynamicObjectBaseDao implements IRoleDao diff --git a/src/main/java/com/ruoyi/project/system/role/domain/Role.java b/src/main/java/com/ruoyi/project/system/role/domain/Role.java index a1cb978be..19a11fb44 100644 --- a/src/main/java/com/ruoyi/project/system/role/domain/Role.java +++ b/src/main/java/com/ruoyi/project/system/role/domain/Role.java @@ -5,7 +5,7 @@ import lombok.Data; /** * 角色对象 sys_role * - * @author yangzz + * @author ruoyi */ @Data public class Role diff --git a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java index f1059903b..f7cdb5deb 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java +++ b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java @@ -5,7 +5,7 @@ import java.util.Set; /** * 角色业务层 * - * @author yangzz + * @author ruoyi */ public interface IRoleService { diff --git a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java index 92af8bd47..fa4b7abb4 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java @@ -12,7 +12,7 @@ import com.ruoyi.project.system.role.dao.IRoleDao; /** * 角色 业务层处理 * - * @author yangzz + * @author ruoyi */ @Service("roleService") public class RoleServiceImpl implements IRoleService diff --git a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java index 3f405a2a8..e51120722 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java @@ -14,7 +14,7 @@ import com.ruoyi.project.system.user.domain.User; /** * 首页 业务处理 * - * @author yangzz + * @author ruoyi */ @Controller public class IndexController extends BaseController diff --git a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java index 9c0415051..d41006764 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java @@ -15,7 +15,7 @@ import com.ruoyi.framework.web.domain.JSON; /** * 登录验证 * - * @author yangzz + * @author ruoyi */ // @RestController @Controller diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java index 08e840e7a..998ab1dc7 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java @@ -18,7 +18,7 @@ import com.ruoyi.project.system.user.service.IUserService; /** * 用户信息 * - * @author yangzz + * @author ruoyi */ @Controller @RequestMapping("/system/user") diff --git a/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java b/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java index 38415673d..cd41fa134 100644 --- a/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java +++ b/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java @@ -8,7 +8,7 @@ import com.ruoyi.project.system.user.domain.User; /** * 用户表 数据层 * - * @author yangzz + * @author ruoyi */ public interface IUserDao { diff --git a/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java b/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java index 2340caa30..bdbdb867c 100644 --- a/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java @@ -11,7 +11,7 @@ import com.ruoyi.project.system.user.domain.User; /** * 用户 数据层处理 * - * @author yangzz + * @author ruoyi */ @Repository("userDao") public class UserDaoImpl extends DynamicObjectBaseDao implements IUserDao diff --git a/src/main/java/com/ruoyi/project/system/user/domain/User.java b/src/main/java/com/ruoyi/project/system/user/domain/User.java index 23985ff2b..0828015d4 100644 --- a/src/main/java/com/ruoyi/project/system/user/domain/User.java +++ b/src/main/java/com/ruoyi/project/system/user/domain/User.java @@ -6,7 +6,7 @@ import lombok.Data; /** * 用户对象 sys_user * - * @author yangzz + * @author ruoyi */ @Data public class User diff --git a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java index fc03099f7..990ef7789 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java +++ b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java @@ -8,7 +8,7 @@ import com.ruoyi.project.system.user.domain.User; /** * 用户 业务层 * - * @author yangzz + * @author ruoyi */ public interface IUserService { diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java index ba5c350ff..858e90793 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java @@ -11,7 +11,7 @@ import com.ruoyi.project.system.user.domain.User; /** * 用户 业务层处理 * - * @author yangzz + * @author ruoyi */ @Service("userService") public class UserServiceImpl implements IUserService diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml index de649b95a..7fe61c6e4 100644 --- a/src/main/resources/application-druid.yml +++ b/src/main/resources/application-druid.yml @@ -7,8 +7,8 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver - #url: jdbc:mysql://10.213.24.45:3306/ry?useUnicode=true&characterEncoding=utf8 - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8 + url: jdbc:mysql://10.213.24.45:3306/ry?useUnicode=true&characterEncoding=utf8 + #url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8 username: root password: password # 初始化大小，最小，最大 diff --git a/src/main/resources/mybatis/system/SystemLogininforMapper.xml b/src/main/resources/mybatis/system/SystemLogininforMapper.xml index 5c78e6a1e..4af95e5a6 100644 --- a/src/main/resources/mybatis/system/SystemLogininforMapper.xml +++ b/src/main/resources/mybatis/system/SystemLogininforMapper.xml @@ -12,12 +12,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_logininfor (login_name, status, ipaddr, browser, os, msg) values (#{loginName}, #{status}, #{ipaddr}, #{browser}, #{os}, #{msg}) + + \ No newline at end of file diff --git a/src/main/resources/mybatis/system/SystemOnlineMapper.xml b/src/main/resources/mybatis/system/SystemOnlineMapper.xml index 3456dd93c..164638e01 100644 --- a/src/main/resources/mybatis/system/SystemOnlineMapper.xml +++ b/src/main/resources/mybatis/system/SystemOnlineMapper.xml @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - replace into sys_user_online(sessionId, login_name, dept_name, ipaddr, browser, os, status, start_timestsamp, last_access_time, expireTime) + replace into sys_user_online(sessionId, login_name, dept_name, ipaddr, browser, os, status, start_timestsamp, last_access_time, expire_time) values (#{sessionId}, #{loginName}, #{deptName}, #{ipaddr}, #{browser}, #{os}, #{status}, #{startTimestamp}, #{lastAccessTime}, #{expireTime}) diff --git a/src/main/resources/static/ajax/libs/bootstrap-table/page/bootstrap-page.js b/src/main/resources/static/ajax/libs/bootstrap-table/page/bootstrap-page.js index ad1030b77..7c2e1fb6d 100644 --- a/src/main/resources/static/ajax/libs/bootstrap-table/page/bootstrap-page.js +++ b/src/main/resources/static/ajax/libs/bootstrap-table/page/bootstrap-page.js @@ -1,4 +1,8 @@ -// 自定义分页处理 ruoyi +/** + * 自定义分页处理 + * + * @author ruoyi + */ // 初始化表格 function initTable(_columns, _url) { diff --git a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js new file mode 100644 index 000000000..45d63f16a --- /dev/null +++ b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js @@ -0,0 +1,43 @@ +var prefix = "/monitor/logininfor" + +$(function() { + var columns = [{ + field: 'infoId', + // 列字段名 + title: '访问编号' // 列标题 + }, + { + field: 'loginName', + title: '登录名称' + }, + { + field: 'ipaddr', + title: '主机' + }, + { + field: 'browser', + title: '浏览器' + }, + { + field: 'os', + title: '操作系统' + }, + { + field: 'status', + title: '状态', + align: 'center', + formatter: function(value, row, index) { + if (value == 0) { + return '成功'; + } else if (value == 1) { + return '失败'; + } + } + }, + { + field: 'loginTime', + title: '登录时间' + }]; + var url = prefix + "/list"; + initTable(columns, url); +}); diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html index 4380359f2..e262bd30a 100644 --- a/src/main/resources/templates/main.html +++ b/src/main/resources/templates/main.html @@ -104,6 +104,7 @@
  1. 支持在线用户管理
    2. +
  2. 支持系统访问记录
diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html new file mode 100644 index 000000000..a49602a41 --- /dev/null +++ b/src/main/resources/templates/monitor/logininfor/logininfor.html @@ -0,0 +1,15 @@ + + + + + +
+ +
+
+
+ + + \ No newline at end of file