diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CacheController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CacheController.java index 0228f4a8..9bdd08da 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CacheController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CacheController.java @@ -2,6 +2,7 @@ package com.jeesite.modules.sys.web; import javax.annotation.PostConstruct; +import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,10 +25,10 @@ import com.jeesite.modules.sys.utils.UserUtils; public class CacheController extends BaseController { /** - * 清理全部缓存,可清理属性文件里的缓存 + * 清理全部缓存,可清理属性文件里的缓存(stste 单词写错了,将错就错) * @return */ - @RequiresPermissions("sys:config:edit") + @RequiresPermissions(value={"sys:config:edit", "sys:stste:cache"}, logical=Logical.OR) @RequestMapping(value = "clearAll") @ResponseBody public String clearAll() { diff --git a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html index fa5974e0..13e629dd 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html +++ b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html @@ -59,7 +59,7 @@ $('#dataGrid').dataGrid({ return ''+(val||row.id)+''; }}, {header:'字典类型', name:'dictType', index:'a.dict_type', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.id)+''; + return ''+(val||row.id)+''; }}, {header:'系统字典', name:'isSys', index:'a.is_sys', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_yes_no')}, val, '未知', true);