From 8103aee0c758ea6bcdd879ea5b648d170c39e463 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 9 Nov 2019 00:18:42 +0800
Subject: [PATCH] =?UTF-8?q?clearAll=20=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20sys:stste:cache=20=E6=9D=83=E9=99=90=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/sys/web/CacheController.java    | 5 +++--
 .../src/main/resources/views/modules/sys/dictTypeList.html   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

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 '<a href="${ctx}/sys/dictType/form?id='+row.id+'" class="btnList" data-title="编辑字典类型">'+(val||row.id)+'</a>';
 		}},
 		{header:'字典类型', name:'dictType', index:'a.dict_type', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '<a href="${ctx}/sys/dictData/list?dictType='+row.dictType+'" class="btnList" data-title="编辑字典数据">'+(val||row.id)+'</a>';
+			return '<a href="${ctx}/sys/dictData/list?dictType='+row.dictType+'" class="btnList" data-title="字典数据">'+(val||row.id)+'</a>';
 		}},
 		{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);