Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
be778ba3
Commit
be778ba3
authored
Jul 23, 2020
by
Sxile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复参数注释
parent
52d48fa6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
54 additions
and
54 deletions
+54
-54
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
...src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+3
-3
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
...ain/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+4
-4
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
...ain/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+3
-3
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
.../ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+3
-3
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
...in/java/com/ruoyi/framework/web/service/TokenService.java
+9
-9
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
...src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+16
-16
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
...rc/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+15
-15
No files found.
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
View file @
be778ba3
...
...
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
/**
* spring redis 工具类
*
*
* @author ruoyi
**/
@SuppressWarnings
(
value
=
{
"unchecked"
,
"rawtypes"
})
...
...
@@ -109,7 +109,7 @@ public class RedisCache
* 缓存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 @@ public class RedisCache
/**
* 获得缓存的基本对象列表
*
*
* @param pattern 字符串前缀
* @return 对象列表
*/
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
View file @
be778ba3
...
...
@@ -15,7 +15,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
/**
* 文件上传工具类
*
*
* @author ruoyi
*/
public
class
FileUploadUtils
...
...
@@ -89,7 +89,7 @@ public class FileUploadUtils
*
* @param baseDir 相对应用的基目录
* @param file 上传的文件
* @param
e
xtension 上传文件类型
* @param
allowedE
xtension 上传文件类型
* @return 返回上传成功的文件名
* @throws FileSizeLimitExceededException 如果超出最大大小
* @throws FileNameLengthLimitExceededException 文件名太长
...
...
@@ -215,7 +215,7 @@ public class FileUploadUtils
/**
* 获取文件名的后缀
*
*
* @param file 表单文件
* @return 后缀名
*/
...
...
@@ -228,4 +228,4 @@ public class FileUploadUtils
}
return
extension
;
}
}
\ No newline at end of file
}
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
View file @
be778ba3
...
...
@@ -20,7 +20,7 @@ import com.ruoyi.framework.web.service.TokenService;
/**
* 数据过滤处理
*
*
* @author ruoyi
*/
@Aspect
...
...
@@ -93,10 +93,10 @@ public class DataScopeAspect
/**
* 数据范围过滤
*
*
* @param joinPoint 切点
* @param user 用户
* @param
a
lias 别名
* @param
userA
lias 别名
*/
public
static
void
dataScopeFilter
(
JoinPoint
joinPoint
,
SysUser
user
,
String
deptAlias
,
String
userAlias
)
{
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
View file @
be778ba3
...
...
@@ -13,7 +13,7 @@ import com.ruoyi.common.utils.ServletUtils;
/**
* 防止重复提交拦截器
*
*
* @author ruoyi
*/
@Component
...
...
@@ -46,8 +46,8 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
/**
* 验证是否重复提交由子类实现具体的防重复提交的规则
*
* @param
httpServletR
equest
*
* @param
r
equest
* @return
* @throws Exception
*/
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
View file @
be778ba3
...
...
@@ -22,7 +22,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
/**
* token验证处理
*
*
* @author ruoyi
*/
@Component
...
...
@@ -51,7 +51,7 @@ public class TokenService
/**
* 获取用户身份信息
*
*
* @return 用户信息
*/
public
LoginUser
getLoginUser
(
HttpServletRequest
request
)
...
...
@@ -95,7 +95,7 @@ public class TokenService
/**
* 创建令牌
*
*
* @param loginUser 用户信息
* @return 令牌
*/
...
...
@@ -113,8 +113,8 @@ public class TokenService
/**
* 验证令牌有效期,相差不足20分钟,自动刷新缓存
*
* @param
token 令牌
*
* @param
loginUser
* @return 令牌
*/
public
void
verifyToken
(
LoginUser
loginUser
)
...
...
@@ -129,7 +129,7 @@ public class TokenService
/**
* 刷新令牌有效期
*
*
* @param loginUser 登录信息
*/
public
void
refreshToken
(
LoginUser
loginUser
)
...
...
@@ -140,10 +140,10 @@ public class TokenService
String
userKey
=
getTokenKey
(
loginUser
.
getToken
());
redisCache
.
setCacheObject
(
userKey
,
loginUser
,
expireTime
,
TimeUnit
.
MINUTES
);
}
/**
* 设置用户代理信息
*
*
* @param loginUser 登录信息
*/
public
void
setUserAgent
(
LoginUser
loginUser
)
...
...
@@ -155,7 +155,7 @@ public class TokenService
loginUser
.
setBrowser
(
userAgent
.
getBrowser
().
getName
());
loginUser
.
setOs
(
userAgent
.
getOperatingSystem
().
getName
());
}
/**
* 从数据声明生成令牌
*
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View file @
be778ba3
...
...
@@ -24,7 +24,7 @@ public class VelocityUtils
/**
* 设置模板变量信息
*
*
* @return 模板列表
*/
public
static
VelocityContext
prepareContext
(
GenTable
genTable
)
...
...
@@ -93,7 +93,7 @@ public class VelocityUtils
/**
* 获取模板信息
*
*
* @return 模板列表
*/
public
static
List
<
String
>
getTemplateList
(
String
tplCategory
)
...
...
@@ -183,7 +183,7 @@ public class VelocityUtils
/**
* 获取包前缀
*
*
* @param packageName 包名称
* @return 包前缀名称
*/
...
...
@@ -196,8 +196,8 @@ public class VelocityUtils
/**
* 根据列类型获取导入包
*
* @param column 列集合
*
* @param column
s
列集合
* @return 返回需要导入的包列表
*/
public
static
HashSet
<
String
>
getImportList
(
List
<
GenTableColumn
>
columns
)
...
...
@@ -220,7 +220,7 @@ public class VelocityUtils
/**
* 获取权限前缀
*
*
* @param moduleName 模块名称
* @param businessName 业务名称
* @return 返回权限前缀
...
...
@@ -233,8 +233,8 @@ public class VelocityUtils
/**
* 获取上级菜单ID字段
*
* @param
options
生成其他选项
*
* @param
paramsObj
生成其他选项
* @return 上级菜单ID字段
*/
public
static
String
getParentMenuId
(
JSONObject
paramsObj
)
...
...
@@ -248,8 +248,8 @@ public class VelocityUtils
/**
* 获取树编码
*
* @param
options
生成其他选项
*
* @param
paramsObj
生成其他选项
* @return 树编码
*/
public
static
String
getTreecode
(
JSONObject
paramsObj
)
...
...
@@ -263,8 +263,8 @@ public class VelocityUtils
/**
* 获取树父编码
*
* @param
options
生成其他选项
*
* @param
paramsObj
生成其他选项
* @return 树父编码
*/
public
static
String
getTreeParentCode
(
JSONObject
paramsObj
)
...
...
@@ -278,8 +278,8 @@ public class VelocityUtils
/**
* 获取树名称
*
* @param
options
生成其他选项
*
* @param
paramsObj
生成其他选项
* @return 树名称
*/
public
static
String
getTreeName
(
JSONObject
paramsObj
)
...
...
@@ -293,7 +293,7 @@ public class VelocityUtils
/**
* 获取需要在哪一列上面显示展开按钮
*
*
* @param genTable 业务表对象
* @return 展开按钮列序号
*/
...
...
@@ -317,4 +317,4 @@ public class VelocityUtils
}
return
num
;
}
}
\ No newline at end of file
}
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
View file @
be778ba3
...
...
@@ -66,7 +66,7 @@ public abstract class AbstractQuartzJob implements Job
* 执行后
*
* @param context 工作执行上下文对象
* @param sys
Schedule
Job 系统计划任务
* @param sysJob 系统计划任务
*/
protected
void
after
(
JobExecutionContext
context
,
SysJob
sysJob
,
Exception
e
)
{
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View file @
be778ba3
...
...
@@ -6,14 +6,14 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
/**
* 菜单表 数据层
*
*
* @author ruoyi
*/
public
interface
SysMenuMapper
{
/**
* 查询系统菜单列表
*
*
* @param menu 菜单信息
* @return 菜单列表
*/
...
...
@@ -21,14 +21,14 @@ public interface SysMenuMapper
/**
* 根据用户所有权限
*
*
* @return 权限列表
*/
public
List
<
String
>
selectMenuPerms
();
/**
* 根据用户查询系统菜单列表
*
*
* @param menu 菜单信息
* @return 菜单列表
*/
...
...
@@ -36,7 +36,7 @@ public interface SysMenuMapper
/**
* 根据用户ID查询权限
*
*
* @param userId 用户ID
* @return 权限列表
*/
...
...
@@ -44,22 +44,22 @@ public interface SysMenuMapper
/**
* 根据用户ID查询菜单
*
*
* @return 菜单列表
*/
public
List
<
SysMenu
>
selectMenuTreeAll
();
/**
* 根据用户ID查询菜单
*
* @param user
name
用户ID
*
* @param user
Id
用户ID
* @return 菜单列表
*/
public
List
<
SysMenu
>
selectMenuTreeByUserId
(
Long
userId
);
/**
* 根据角色ID查询菜单树信息
*
*
* @param roleId 角色ID
* @return 选中菜单列表
*/
...
...
@@ -67,7 +67,7 @@ public interface SysMenuMapper
/**
* 根据菜单ID查询信息
*
*
* @param menuId 菜单ID
* @return 菜单信息
*/
...
...
@@ -75,7 +75,7 @@ public interface SysMenuMapper
/**
* 是否存在菜单子节点
*
*
* @param menuId 菜单ID
* @return 结果
*/
...
...
@@ -83,7 +83,7 @@ public interface SysMenuMapper
/**
* 新增菜单信息
*
*
* @param menu 菜单信息
* @return 结果
*/
...
...
@@ -91,7 +91,7 @@ public interface SysMenuMapper
/**
* 修改菜单信息
*
*
* @param menu 菜单信息
* @return 结果
*/
...
...
@@ -99,7 +99,7 @@ public interface SysMenuMapper
/**
* 删除菜单管理信息
*
*
* @param menuId 菜单ID
* @return 结果
*/
...
...
@@ -107,7 +107,7 @@ public interface SysMenuMapper
/**
* 校验菜单名称是否唯一
*
*
* @param menuName 菜单名称
* @param parentId 父菜单ID
* @return 结果
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment