lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-07-31 15:56:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复 sa-token-dialect-thymeleaf 模块代码警告

Browse Source
This commit is contained in:
click33 2023-05-16 16:08:36 +08:00
parent e00900f4ea
commit 4a14408e4e
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
View File

@ -51,12 +51,12 @@ public class SaTokenDialect extends AbstractProcessorDialect {
* 构造方言对象，使用自定义参数
*
* @param name 方言名称
* @param recedence 优先级
* @param precedence 优先级
* @param stpLogic 使用的 StpLogic 对象
*/
public SaTokenDialect(String name, int recedence, StpLogic stpLogic) {
public SaTokenDialect(String name, int precedence, StpLogic stpLogic) {
// 名称、前缀、优先级
super(name, name, recedence);
super(name, name, precedence);
this.stpLogic = stpLogic;
}
@ -65,24 +65,24 @@ public class SaTokenDialect extends AbstractProcessorDialect {
*/
@Override
public Set<IProcessor> getProcessors(String prefix) {
return new HashSet<IProcessor>(Arrays.asList(
// 登录判断
new SaTokenTagProcessor(prefix, "login", value -> stpLogic.isLogin()),
new SaTokenTagProcessor(prefix, "notLogin", value -> stpLogic.isLogin() == false),
// 角色判断
new SaTokenTagProcessor(prefix, "hasRole", value -> stpLogic.hasRole(value)),
new SaTokenTagProcessor(prefix, "hasRoleOr", value -> stpLogic.hasRoleOr(toArray(value))),
new SaTokenTagProcessor(prefix, "hasRoleAnd", value -> stpLogic.hasRoleAnd(toArray(value))),
new SaTokenTagProcessor(prefix, "lackRole", value -> stpLogic.hasRole(value) == false),
// 权限判断
new SaTokenTagProcessor(prefix, "hasPermission", value -> stpLogic.hasPermission(value)),
new SaTokenTagProcessor(prefix, "hasPermissionOr", value -> stpLogic.hasPermissionOr(toArray(value))),
new SaTokenTagProcessor(prefix, "hasPermissionAnd", value -> stpLogic.hasPermissionAnd(toArray(value))),
new SaTokenTagProcessor(prefix, "lackPermission", value -> stpLogic.hasPermission(value) == false)
));
return new HashSet<>(Arrays.asList(
// 登录判断
new SaTokenTagProcessor(prefix, "login", value -> stpLogic.isLogin()),
new SaTokenTagProcessor(prefix, "notLogin", value -> ! stpLogic.isLogin()),
// 角色判断
new SaTokenTagProcessor(prefix, "hasRole", value -> stpLogic.hasRole(value)),
new SaTokenTagProcessor(prefix, "hasRoleOr", value -> stpLogic.hasRoleOr(toArray(value))),
new SaTokenTagProcessor(prefix, "hasRoleAnd", value -> stpLogic.hasRoleAnd(toArray(value))),
new SaTokenTagProcessor(prefix, "lackRole", value -> ! stpLogic.hasRole(value)),
// 权限判断
new SaTokenTagProcessor(prefix, "hasPermission", value -> stpLogic.hasPermission(value)),
new SaTokenTagProcessor(prefix, "hasPermissionOr", value -> stpLogic.hasPermissionOr(toArray(value))),
new SaTokenTagProcessor(prefix, "hasPermissionAnd", value -> stpLogic.hasPermissionAnd(toArray(value))),
new SaTokenTagProcessor(prefix, "lackPermission", value -> ! stpLogic.hasPermission(value))
));
}
/**
@ -92,7 +92,7 @@ public class SaTokenDialect extends AbstractProcessorDialect {
*/
public String[] toArray(String str) {
List<String> list = SaFoxUtil.convertStringToList(str);
return list.toArray(new String[list.size()]);
return list.toArray(new String[0]);
}
}

8
sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
View File

@ -34,13 +34,13 @@ public class SaTokenTagProcessor extends AbstractAttributeTagProcessor {
Function <String, Boolean> fun;
public SaTokenTagProcessor(final String dialectPrefix, String arrtName, Function <String, Boolean> fun) {
public SaTokenTagProcessor(final String dialectPrefix, String attrName, Function <String, Boolean> fun) {
super(
TemplateMode.HTML, // This processor will apply only to HTML mode
dialectPrefix, // Prefix to be applied to name for matching
null, // No tag name: match any tag name
false, // No prefix to be applied to tag name
arrtName, // Name of the attribute that will be matched
attrName, // Name of the attribute that will be matched
true, // Apply dialect prefix to attribute name
10000, // Precedence (inside dialect's own precedence)
true); // Remove the matched attribute afterwards
@ -53,9 +53,9 @@ public class SaTokenTagProcessor extends AbstractAttributeTagProcessor {
final AttributeName attributeName, final String attributeValue,
final IElementTagStructureHandler structureHandler) {
// 执行表达式返回值为false，则删除这个标签
if(this.fun.apply(attributeValue) == false) {
if( ! this.fun.apply(attributeValue)) {
structureHandler.removeElement();
};
}
}
}