From be778ba37037d7557c8dcb2355115e87414f85e2 Mon Sep 17 00:00:00 2001
From: Sxile <3440626@qq.com>
Date: 星期四, 23 七月 2020 14:54:11 +0800
Subject: [PATCH] 修复参数注释
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 30 +++++++-------
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java | 6 +-
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 32 ++++++++--------
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java | 6 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 6 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 18 ++++----
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 8 ++--
8 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
index 530dcd9..1f91350 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -13,7 +13,7 @@
/**
* spring redis 宸ュ叿绫�
- *
+ *
* @author ruoyi
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@@ -109,7 +109,7 @@
* 缂撳瓨List鏁版嵁
*
* @param key 缂撳瓨鐨勯敭鍊�
- * @param values 寰呯紦瀛樼殑List鏁版嵁
+ * @param dataList 寰呯紦瀛樼殑List鏁版嵁
* @return 缂撳瓨鐨勫璞�
*/
public <T> long setCacheList(final String key, final List<T> dataList)
@@ -216,7 +216,7 @@
/**
* 鑾峰緱缂撳瓨鐨勫熀鏈璞″垪琛�
- *
+ *
* @param pattern 瀛楃涓插墠缂�
* @return 瀵硅薄鍒楄〃
*/
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 183f918..cb2f023 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -15,7 +15,7 @@
/**
* 鏂囦欢涓婁紶宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class FileUploadUtils
@@ -89,7 +89,7 @@
*
* @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
* @param file 涓婁紶鐨勬枃浠�
- * @param extension 涓婁紶鏂囦欢绫诲瀷
+ * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷
* @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕
* @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏�
* @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀�
@@ -215,7 +215,7 @@
/**
* 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
- *
+ *
* @param file 琛ㄥ崟鏂囦欢
* @return 鍚庣紑鍚�
*/
@@ -228,4 +228,4 @@
}
return extension;
}
-}
\ No newline at end of file
+}
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 58040b6..4694947 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
@@ -20,7 +20,7 @@
/**
* 鏁版嵁杩囨护澶勭悊
- *
+ *
* @author ruoyi
*/
@Aspect
@@ -93,10 +93,10 @@
/**
* 鏁版嵁鑼冨洿杩囨护
- *
+ *
* @param joinPoint 鍒囩偣
* @param user 鐢ㄦ埛
- * @param alias 鍒悕
+ * @param userAlias 鍒悕
*/
public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
{
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
index bce2f3f..d310382 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -13,7 +13,7 @@
/**
* 闃叉閲嶅鎻愪氦鎷︽埅鍣�
- *
+ *
* @author ruoyi
*/
@Component
@@ -46,8 +46,8 @@
/**
* 楠岃瘉鏄惁閲嶅鎻愪氦鐢卞瓙绫诲疄鐜板叿浣撶殑闃查噸澶嶆彁浜ょ殑瑙勫垯
- *
- * @param httpServletRequest
+ *
+ * @param request
* @return
* @throws Exception
*/
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index 66885af..943eae2 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -22,7 +22,7 @@
/**
* token楠岃瘉澶勭悊
- *
+ *
* @author ruoyi
*/
@Component
@@ -51,7 +51,7 @@
/**
* 鑾峰彇鐢ㄦ埛韬唤淇℃伅
- *
+ *
* @return 鐢ㄦ埛淇℃伅
*/
public LoginUser getLoginUser(HttpServletRequest request)
@@ -95,7 +95,7 @@
/**
* 鍒涘缓浠ょ墝
- *
+ *
* @param loginUser 鐢ㄦ埛淇℃伅
* @return 浠ょ墝
*/
@@ -113,8 +113,8 @@
/**
* 楠岃瘉浠ょ墝鏈夋晥鏈燂紝鐩稿樊涓嶈冻20鍒嗛挓锛岃嚜鍔ㄥ埛鏂扮紦瀛�
- *
- * @param token 浠ょ墝
+ *
+ * @param loginUser
* @return 浠ょ墝
*/
public void verifyToken(LoginUser loginUser)
@@ -129,7 +129,7 @@
/**
* 鍒锋柊浠ょ墝鏈夋晥鏈�
- *
+ *
* @param loginUser 鐧诲綍淇℃伅
*/
public void refreshToken(LoginUser loginUser)
@@ -140,10 +140,10 @@
String userKey = getTokenKey(loginUser.getToken());
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
}
-
+
/**
* 璁剧疆鐢ㄦ埛浠ｇ悊淇℃伅
- *
+ *
* @param loginUser 鐧诲綍淇℃伅
*/
public void setUserAgent(LoginUser loginUser)
@@ -155,7 +155,7 @@
loginUser.setBrowser(userAgent.getBrowser().getName());
loginUser.setOs(userAgent.getOperatingSystem().getName());
}
-
+
/**
* 浠庢暟鎹０鏄庣敓鎴愪护鐗�
*
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index dc3bf45..b061ee8 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -24,7 +24,7 @@
/**
* 璁剧疆妯℃澘鍙橀噺淇℃伅
- *
+ *
* @return 妯℃澘鍒楄〃
*/
public static VelocityContext prepareContext(GenTable genTable)
@@ -93,7 +93,7 @@
/**
* 鑾峰彇妯℃澘淇℃伅
- *
+ *
* @return 妯℃澘鍒楄〃
*/
public static List<String> getTemplateList(String tplCategory)
@@ -183,7 +183,7 @@
/**
* 鑾峰彇鍖呭墠缂�
- *
+ *
* @param packageName 鍖呭悕绉�
* @return 鍖呭墠缂�鍚嶇О
*/
@@ -196,8 +196,8 @@
/**
* 鏍规嵁鍒楃被鍨嬭幏鍙栧鍏ュ寘
- *
- * @param column 鍒楅泦鍚�
+ *
+ * @param columns 鍒楅泦鍚�
* @return 杩斿洖闇�瑕佸鍏ョ殑鍖呭垪琛�
*/
public static HashSet<String> getImportList(List<GenTableColumn> columns)
@@ -220,7 +220,7 @@
/**
* 鑾峰彇鏉冮檺鍓嶇紑
- *
+ *
* @param moduleName 妯″潡鍚嶇О
* @param businessName 涓氬姟鍚嶇О
* @return 杩斿洖鏉冮檺鍓嶇紑
@@ -233,8 +233,8 @@
/**
* 鑾峰彇涓婄骇鑿滃崟ID瀛楁
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 涓婄骇鑿滃崟ID瀛楁
*/
public static String getParentMenuId(JSONObject paramsObj)
@@ -248,8 +248,8 @@
/**
* 鑾峰彇鏍戠紪鐮�
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠紪鐮�
*/
public static String getTreecode(JSONObject paramsObj)
@@ -263,8 +263,8 @@
/**
* 鑾峰彇鏍戠埗缂栫爜
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠埗缂栫爜
*/
public static String getTreeParentCode(JSONObject paramsObj)
@@ -278,8 +278,8 @@
/**
* 鑾峰彇鏍戝悕绉�
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戝悕绉�
*/
public static String getTreeName(JSONObject paramsObj)
@@ -293,7 +293,7 @@
/**
* 鑾峰彇闇�瑕佸湪鍝竴鍒椾笂闈㈡樉绀哄睍寮�鎸夐挳
- *
+ *
* @param genTable 涓氬姟琛ㄥ璞�
* @return 灞曞紑鎸夐挳鍒楀簭鍙�
*/
@@ -317,4 +317,4 @@
}
return num;
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
index a0aadb6..fd652d6 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
@@ -66,7 +66,7 @@
* 鎵ц鍚�
*
* @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞�
- * @param sysScheduleJob 绯荤粺璁″垝浠诲姟
+ * @param sysJob 绯荤粺璁″垝浠诲姟
*/
protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
{
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
index 907c613..ebb2546 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -6,14 +6,14 @@
/**
* 鑿滃崟琛� 鏁版嵁灞�
- *
+ *
* @author ruoyi
*/
public interface SysMenuMapper
{
/**
* 鏌ヨ绯荤粺鑿滃崟鍒楄〃
- *
+ *
* @param menu 鑿滃崟淇℃伅
* @return 鑿滃崟鍒楄〃
*/
@@ -21,14 +21,14 @@
/**
* 鏍规嵁鐢ㄦ埛鎵�鏈夋潈闄�
- *
+ *
* @return 鏉冮檺鍒楄〃
*/
public List<String> selectMenuPerms();
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
- *
+ *
* @param menu 鑿滃崟淇℃伅
* @return 鑿滃崟鍒楄〃
*/
@@ -36,7 +36,7 @@
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 鏉冮檺鍒楄〃
*/
@@ -44,22 +44,22 @@
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
- *
+ *
* @return 鑿滃崟鍒楄〃
*/
public List<SysMenu> selectMenuTreeAll();
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
- *
- * @param username 鐢ㄦ埛ID
+ *
+ * @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
public List<SysMenu> selectMenuTreeByUserId(Long userId);
/**
* 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭�
- *
+ *
* @param roleId 瑙掕壊ID
* @return 閫変腑鑿滃崟鍒楄〃
*/
@@ -67,7 +67,7 @@
/**
* 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅
- *
+ *
* @param menuId 鑿滃崟ID
* @return 鑿滃崟淇℃伅
*/
@@ -75,7 +75,7 @@
/**
* 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐�
- *
+ *
* @param menuId 鑿滃崟ID
* @return 缁撴灉
*/
@@ -83,7 +83,7 @@
/**
* 鏂板鑿滃崟淇℃伅
- *
+ *
* @param menu 鑿滃崟淇℃伅
* @return 缁撴灉
*/
@@ -91,7 +91,7 @@
/**
* 淇敼鑿滃崟淇℃伅
- *
+ *
* @param menu 鑿滃崟淇℃伅
* @return 缁撴灉
*/
@@ -99,7 +99,7 @@
/**
* 鍒犻櫎鑿滃崟绠＄悊淇℃伅
- *
+ *
* @param menuId 鑿滃崟ID
* @return 缁撴灉
*/
@@ -107,7 +107,7 @@
/**
* 鏍￠獙鑿滃崟鍚嶇О鏄惁鍞竴
- *
+ *
* @param menuName 鑿滃崟鍚嶇О
* @param parentId 鐖惰彍鍗旾D
* @return 缁撴灉
--
Gitblit v1.9.3