ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改部分问题

This commit is contained in:
BaoLiuJiFenA 2019-01-11 10:51:41 +08:00
parent d2055e3872
commit fc4c38adaa
3 changed files with 104 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View File

@ -103,6 +103,10 @@ public class SysUserOnlineController extends BaseController {
if (online == null) { if (online == null) {
return error("用户已下线"); return error("用户已下线");
} }
/**
* 首先尝试使用会话ID作为缓存键从缓存获取会话。如果没有会话
* 找到后，调用{@code super.readSession(sessionId)}执行实际检索。
*/
OnlineSession onlineSession = (OnlineSession) onlineSessionDAO.readSession(online.getSessionId()); OnlineSession onlineSession = (OnlineSession) onlineSessionDAO.readSession(online.getSessionId());
if (onlineSession == null) { if (onlineSession == null) {
return error("用户已下线"); return error("用户已下线");

30
ruoyi-admin/src/main/resources/banner.txt
View File

@ -1,24 +1,10 @@
Application Version: ${ruoyi.version} Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version} Spring Boot Version: ${spring-boot.version}
//////////////////////////////////////////////////////////////////// ///////////////////////////////
// _ooOoo_ // // //
// o8888888o // // //
// 88" . "88 // // masteryi //
// (| ^_^ |) // // //
// O\ = /O // // //
// ____/`---'\____ // // //
// .' \\| |// `. // ///////////////////////////////
// / \\||| : |||// \ //
// / _||||| -:- |||||- \ //
// | | \\\ - /// | | //
// | \_| ''\---/'' | | //
// \ .-\__ `-` ___/-. / //
// ___`. .' /--.--\ `. . ___ //
// ."" '< `.___\_<|>_/___.' >'"". //
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
// \ \ `-. \_ __\ /__ _/ .-` / / //
// ========`-.____`-.___\_____/___.-`____.-'======== //
// `=---=' //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// 永不宕机 永无BUG //
////////////////////////////////////////////////////////////////////

182
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
View File

@ -1,233 +1,233 @@
package com.ruoyi.system.domain; package com.ruoyi.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.base.BaseEntity; import com.ruoyi.common.base.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/** /**
* 操作日志记录表 oper_log * 操作日志记录表 oper_log
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysOperLog extends BaseEntity public class SysOperLog extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 日志主键 */ /**
* 日志主键
*/
@Excel(name = "操作序号") @Excel(name = "操作序号")
private Long operId; private Long operId;
/** 操作模块 */ /**
* 操作模块
*/
@Excel(name = "操作模块") @Excel(name = "操作模块")
private String title; private String title;
/** 业务类型（0其它 1新增 2修改 3删除） */ /**
* 业务类型（0其它 1新增 2修改 3删除）
*/
@Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
private Integer businessType; private Integer businessType;
/** 请求方法 */ /**
* 请求方法
*/
@Excel(name = "请求方法") @Excel(name = "请求方法")
private String method; private String method;
/** 操作类别（0其它 1后台用户 2手机端用户） */ /**
* 操作类别（0其它 1后台用户 2手机端用户）
*/
@Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
private Integer operatorType; private Integer operatorType;
/** 操作人员 */ /**
* 操作人员
*/
@Excel(name = "操作人员") @Excel(name = "操作人员")
private String operName; private String operName;
/** 部门名称 */ /**
* 部门名称
*/
@Excel(name = "部门名称") @Excel(name = "部门名称")
private String deptName; private String deptName;
/** 请求url */ /**
* 请求url
*/
@Excel(name = "请求地址") @Excel(name = "请求地址")
private String operUrl; private String operUrl;
/** 操作地址 */ /**
* 操作地址
*/
@Excel(name = "操作地址") @Excel(name = "操作地址")
private String operIp; private String operIp;
/** 操作地点 */ /**
* 操作地点
*/
@Excel(name = "操作地点") @Excel(name = "操作地点")
private String operLocation; private String operLocation;
/** 请求参数 */ /**
* 请求参数
*/
@Excel(name = "请求参数") @Excel(name = "请求参数")
private String operParam; private String operParam;
/** 操作状态（0正常 1异常） */ /**
* 操作状态（0正常 1异常）
*/
@Excel(name = "状态", readConverterExp = "0=正常,1=异常") @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
private Integer status; private Integer status;
/** 错误消息 */ /**
* 错误消息
*/
@Excel(name = "错误消息") @Excel(name = "错误消息")
private String errorMsg; private String errorMsg;
/** 操作时间 */ /**
* 操作时间
*/
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operTime; private Date operTime;
public Long getOperId() public Long getOperId() {
{
return operId; return operId;
} }
public void setOperId(Long operId) public void setOperId(Long operId) {
{
this.operId = operId; this.operId = operId;
} }
public String getTitle() public String getTitle() {
{
return title; return title;
} }
public void setTitle(String title) public void setTitle(String title) {
{
this.title = title; this.title = title;
} }
public Integer getBusinessType() public Integer getBusinessType() {
{
return businessType; return businessType;
} }
public void setBusinessType(Integer businessType) public void setBusinessType(Integer businessType) {
{
this.businessType = businessType; this.businessType = businessType;
} }
public String getMethod() public String getMethod() {
{
return method; return method;
} }
public void setMethod(String method) public void setMethod(String method) {
{
this.method = method; this.method = method;
} }
public Integer getOperatorType() public Integer getOperatorType() {
{
return operatorType; return operatorType;
} }
public void setOperatorType(Integer operatorType) public void setOperatorType(Integer operatorType) {
{
this.operatorType = operatorType; this.operatorType = operatorType;
} }
public String getOperName() public String getOperName() {
{
return operName; return operName;
} }
public void setOperName(String operName) public void setOperName(String operName) {
{
this.operName = operName; this.operName = operName;
} }
public String getDeptName() public String getDeptName() {
{
return deptName; return deptName;
} }
public void setDeptName(String deptName) public void setDeptName(String deptName) {
{
this.deptName = deptName; this.deptName = deptName;
} }
public String getOperUrl() public String getOperUrl() {
{
return operUrl; return operUrl;
} }
public void setOperUrl(String operUrl) public void setOperUrl(String operUrl) {
{
this.operUrl = operUrl; this.operUrl = operUrl;
} }
public String getOperIp() public String getOperIp() {
{
return operIp; return operIp;
} }
public void setOperIp(String operIp) public void setOperIp(String operIp) {
{
this.operIp = operIp; this.operIp = operIp;
} }
public String getOperLocation() public String getOperLocation() {
{
return operLocation; return operLocation;
} }
public void setOperLocation(String operLocation) public void setOperLocation(String operLocation) {
{
this.operLocation = operLocation; this.operLocation = operLocation;
} }
public String getOperParam() public String getOperParam() {
{
return operParam; return operParam;
} }
public void setOperParam(String operParam) public void setOperParam(String operParam) {
{
this.operParam = operParam; this.operParam = operParam;
} }
public Integer getStatus() public Integer getStatus() {
{
return status; return status;
} }
public void setStatus(Integer status) public void setStatus(Integer status) {
{
this.status = status; this.status = status;
} }
public String getErrorMsg() public String getErrorMsg() {
{
return errorMsg; return errorMsg;
} }
public void setErrorMsg(String errorMsg) public void setErrorMsg(String errorMsg) {
{
this.errorMsg = errorMsg; this.errorMsg = errorMsg;
} }
public Date getOperTime() public Date getOperTime() {
{
return operTime; return operTime;
} }
public void setOperTime(Date operTime) public void setOperTime(Date operTime) {
{
this.operTime = operTime; this.operTime = operTime;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("operId", getOperId()) .append("operId", getOperId())
.append("title", getTitle()) .append("title", getTitle())
.append("businessType", getBusinessType()) .append("businessType", getBusinessType())
.append("method", getMethod()) .append("method", getMethod())
.append("operatorType", getOperatorType()) .append("operatorType", getOperatorType())
.append("operName", getOperName()) .append("operName", getOperName())
.append("deptName", getDeptName()) .append("deptName", getDeptName())
.append("operUrl", getOperUrl()) .append("operUrl", getOperUrl())
.append("operIp", getOperIp()) .append("operIp", getOperIp())
.append("operLocation", getOperLocation()) .append("operLocation", getOperLocation())
.append("operParam", getOperParam()) .append("operParam", getOperParam())
.append("status", getStatus()) .append("status", getStatus())
.append("errorMsg", getErrorMsg()) .append("errorMsg", getErrorMsg())
.append("operTime", getOperTime()) .append("operTime", getOperTime())
.toString(); .toString();
} }
} }