From 71678947b7cd569a6a5f8a4b77514096e7e9b682 Mon Sep 17 00:00:00 2001
From: ziry <lee@ziry.me>
Date: Sat, 29 Dec 2018 16:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=E4=B8=8E?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/common/support/Convert.java    | 10 +++++-----
 .../src/main/java/com/ruoyi/common/utils/Arith.java    |  4 ++--
 .../src/main/java/com/ruoyi/common/utils/IpUtils.java  |  2 +-
 .../java/com/ruoyi/common/utils/file/FileUtils.java    |  3 ++-
 .../com/ruoyi/framework/aspectj/DataScopeAspect.java   |  6 +++---
 .../java/com/ruoyi/framework/aspectj/LogAspect.java    |  4 ++--
 .../java/com/ruoyi/framework/manager/AsyncManager.java |  2 +-
 .../java/com/ruoyi/framework/util/FileUploadUtils.java |  1 -
 .../java/com/ruoyi/framework/util/PermissionUtils.java |  2 +-
 .../java/com/ruoyi/quartz/mapper/SysJobMapper.java     |  2 +-
 .../java/com/ruoyi/system/mapper/SysUserMapper.java    |  2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/support/Convert.java b/ruoyi-common/src/main/java/com/ruoyi/common/support/Convert.java
index df998c6e..eed8cd3a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/support/Convert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/support/Convert.java
@@ -290,7 +290,7 @@ public class Convert
     /**
      * 转换为Integer数组<br>
      * 
-     * @param split 被转换的值
+     * @param str 被转换的值
      * @return 结果
      */
     public static Integer[] toIntArray(String str)
@@ -301,7 +301,7 @@ public class Convert
     /**
      * 转换为Long数组<br>
      * 
-     * @param split 被转换的值
+     * @param str 被转换的值
      * @return 结果
      */
     public static Long[] toLongArray(String str)
@@ -335,8 +335,8 @@ public class Convert
     /**
      * 转换为Long数组<br>
      * 
-     * @param isIgnoreConvertError 是否忽略转换错误，忽略则给值null
-     * @param values 被转换的值
+     * @param split 分隔符
+     * @param str 被转换的值
      * @return 结果
      */
     public static Long[] toLongArray(String split, String str)
@@ -358,7 +358,7 @@ public class Convert
     /**
      * 转换为String数组<br>
      * 
-     * @param split 被转换的值
+     * @param str 被转换的值
      * @return 结果
      */
     public static String[] toStrArray(String str)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
index 2d7673e7..5d108eb4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
@@ -10,10 +10,10 @@ import java.math.BigDecimal;
 public class Arith
 {
 
-    // 默认除法运算精度
+    /** 默认除法运算精度 */
     private static final int DEF_DIV_SCALE = 10;
 
-    // 这个类不能实例化
+    /** 这个类不能实例化 */
     private Arith()
     {
     }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java
index bbbb4a4e..b9cfa028 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java
@@ -85,7 +85,7 @@ public class IpUtils
     /**
      * 将IPv4地址转换成字节
      * 
-     * @param IPv4地址
+     * @param text IPv4地址
      * @return byte 字节
      */
     public static byte[] textToNumericFormatV4(String text)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
index 00116782..36532cae 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@@ -16,7 +16,8 @@ public class FileUtils
     /**
      * 输出指定文件的byte数组
      * 
-     * @param filename 文件
+     * @param filePath 文件路径
+     * @param os 输出流
      * @return
      */
     public static void writeBytes(String filePath, OutputStream os) throws IOException
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 4e20738f..6260ca29 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -73,9 +73,9 @@ public class DataScopeAspect
 
     /**
      * 数据范围过滤
-     * 
-     * @param da 部门表别名
-     * @return 标准连接条件对象
+     * @param joinPoint 切点
+     * @param user 用户
+     * @param alias 别名
      */
     public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String alias)
     {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 557c68de..e8d297c3 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -121,8 +121,8 @@ public class LogAspect
     /**
      * 获取注解中对方法的描述信息 用于Controller层注解
      * 
-     * @param joinPoint 切点
-     * @return 方法描述
+     * @param log 日志
+     * @param operLog 操作日志
      * @throws Exception
      */
     public void getControllerMethodDescription(Log log, SysOperLog operLog) throws Exception
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
index b748e175..cb7188a7 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
@@ -35,7 +35,7 @@ public class AsyncManager
     /**
      * 执行任务
      * 
-     * @param 任务task
+     * @param task 任务
      */
     public void execute(TimerTask task)
     {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/FileUploadUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/FileUploadUtils.java
index 6c1927f0..b8e9ccf2 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/FileUploadUtils.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/FileUploadUtils.java
@@ -91,7 +91,6 @@ public class FileUploadUtils
      *
      * @param baseDir 相对应用的基目录
      * @param file 上传的文件
-     * @param needDatePathAndRandomName 是否需要日期目录和随机文件名前缀
      * @param extension 上传文件类型
      * @return 返回上传成功的文件名
      * @throws FileSizeLimitExceededException 如果超出最大大小
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/PermissionUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/PermissionUtils.java
index ddf222b2..f0e64263 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/PermissionUtils.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/PermissionUtils.java
@@ -13,7 +13,7 @@ public class PermissionUtils
     /**
      * 权限错误消息提醒
      * 
-     * @param errorMsg 错误信息
+     * @param permissionsStr 错误信息
      * @return
      */
     public static String getMsg(String permissionsStr)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
index aed5c24f..34fd6184 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
@@ -39,7 +39,7 @@ public interface SysJobMapper
      * @param jobId 调度ID
      * @return 结果
      */
-    public int deleteJobById(SysJob job);
+    public int deleteJobById(Long jobId);
 
     /**
      * 批量删除调度任务信息
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 397ccd12..f67edaf7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -13,7 +13,7 @@ public interface SysUserMapper
     /**
      * 根据条件分页查询用户对象
      * 
-     * @param user 用户信息
+     * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
     public List<SysUser> selectUserList(SysUser sysUser);