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

# 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

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

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

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

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