From 6704db81085a526c783b5ce0c28c03429aaa88a7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 01 Sep 2020 13:31:00 +0800
Subject: [PATCH] 移除 OAuth2 改为 Redis
---
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
index da2fbbb..b23ff55 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
@@ -7,7 +7,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
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;
@@ -23,6 +22,7 @@
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.annotation.PreAuthorize;
import com.ruoyi.gen.domain.GenTable;
import com.ruoyi.gen.domain.GenTableColumn;
import com.ruoyi.gen.service.IGenTableColumnService;
@@ -46,7 +46,7 @@
/**
* 查询代码生成列表
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @PreAuthorize(hasPermi = "tool:gen:list")
@GetMapping("/list")
public TableDataInfo genList(GenTable genTable)
{
@@ -58,7 +58,7 @@
/**
* 修改代码生成业务
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+ @PreAuthorize(hasPermi = "tool:gen:query")
@GetMapping(value = "/{talbleId}")
public AjaxResult getInfo(@PathVariable Long talbleId)
{
@@ -73,7 +73,7 @@
/**
* 查询数据库列表
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @PreAuthorize(hasPermi = "tool:gen:list")
@GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable)
{
@@ -85,7 +85,6 @@
/**
* 查询数据表字段列表
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping(value = "/column/{talbleId}")
public TableDataInfo columnList(Long tableId)
{
@@ -99,7 +98,7 @@
/**
* 导入表结构（保存）
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @PreAuthorize(hasPermi = "tool:gen:list")
@Log(title = "代码生成", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
public AjaxResult importTableSave(String tables)
@@ -114,7 +113,7 @@
/**
* 修改保存代码生成业务
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @PreAuthorize(hasPermi = "tool:gen:edit")
@Log(title = "代码生成", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
@@ -127,7 +126,7 @@
/**
* 删除代码生成
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
+ @PreAuthorize(hasPermi = "tool:gen:remove")
@Log(title = "代码生成", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
public AjaxResult remove(@PathVariable Long[] tableIds)
@@ -139,7 +138,7 @@
/**
* 预览代码
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
+ @PreAuthorize(hasPermi = "tool:gen:preview")
@GetMapping("/preview/{tableId}")
public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
{
@@ -150,7 +149,7 @@
/**
* 生成代码（下载方式）
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @PreAuthorize(hasPermi = "tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}")
public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
@@ -162,7 +161,7 @@
/**
* 生成代码（自定义路径）
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @PreAuthorize(hasPermi = "tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
public AjaxResult genCode(HttpServletResponse response, @PathVariable("tableName") String tableName)
@@ -174,7 +173,7 @@
/**
* 批量生成代码
*/
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @PreAuthorize(hasPermi = "tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode")
public void batchGenCode(HttpServletResponse response, String tables) throws IOException
--
Gitblit v1.9.3