admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ruoyi-vue/master' into dev

Browse Source 
# Conflicts:
#	README.md
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
#	ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
#	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
#	ruoyi-ui/src/views/index.vue
This commit is contained in:
疯狂的狮子li 2022-09-13 14:57:56 +08:00
commit 8c9c52417e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
View File

@ -75,4 +75,11 @@ public class R<T> implements Serializable {
return r; return r;
} }
public Boolean isError() {
return !isSuccess();
}
public Boolean isSuccess() {
return R.SUCCESS == getCode();
}
} }

2
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@ -73,7 +73,7 @@ public class LogAspect {
// 请求的地址 // 请求的地址
String ip = ServletUtils.getClientIP(); String ip = ServletUtils.getClientIP();
operLog.setOperIp(ip); operLog.setOperIp(ip);
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
operLog.setOperName(LoginHelper.getUsername()); operLog.setOperName(LoginHelper.getUsername());
if (e != null) { if (e != null) {