From 6d0b4f5d1685cb251e4efe28a0fc1fc2be184c71 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 29 Dec 2020 17:29:22 +0800
Subject: [PATCH] 用户手机邮箱&菜单组件修改允许空字符串
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
index 3ee1773..8ef58ef 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
@@ -4,7 +4,6 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -15,13 +14,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.SecurityUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.annotation.PreAuthorize;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.system.service.ISysDictTypeService;
@@ -37,7 +37,7 @@
@Autowired
private ISysDictTypeService dictTypeService;
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @PreAuthorize(hasPermi = "system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
{
@@ -47,7 +47,7 @@
}
@Log(title = "字典类型", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
+ @PreAuthorize(hasPermi = "system:dict:export")
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictType dictType) throws IOException
{
@@ -59,7 +59,7 @@
/**
* 查询字典类型详细
*/
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @PreAuthorize(hasPermi = "system:dict:query")
@GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId)
{
@@ -69,7 +69,7 @@
/**
* 新增字典类型
*/
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @PreAuthorize(hasPermi = "system:dict:add")
@Log(title = "字典类型", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictType dict)
@@ -85,7 +85,7 @@
/**
* 修改字典类型
*/
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @PreAuthorize(hasPermi = "system:dict:edit")
@Log(title = "字典类型", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictType dict)
@@ -101,7 +101,7 @@
/**
* 删除字典类型
*/
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @PreAuthorize(hasPermi = "system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds)
@@ -110,6 +110,18 @@
}
/**
+ * 清空缓存
+ */
+ @PreAuthorize(hasPermi = "system:dict:remove")
+ @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/clearCache")
+ public AjaxResult clearCache()
+ {
+ dictTypeService.clearCache();
+ return AjaxResult.success();
+ }
+
+ /**
* 获取字典选择框列表
*/
@GetMapping("/optionselect")
--
Gitblit v1.9.3