From 0d2c93396601f62a1eb736efe72c0799676962ef Mon Sep 17 00:00:00 2001
From: yaoxin <1752800946@qq.com>
Date: Sun, 25 Feb 2024 21:07:02 +0800
Subject: [PATCH] =?UTF-8?q?DAY=5F01=E4=BD=9C=E4=B8=9A=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
muyu-gateway/pom.xml | 5 +++++
muyu-gateway/src/main/resources/bootstrap.yml | 3 ++-
muyu-modules/muyu-system/pom.xml | 12 +++++++++++
.../system/controller/BookInfoController.java | 20 +++++++++++++------
.../src/main/resources/bootstrap.yml | 8 ++++++++
.../mapper/system/BookInfoMapper.xml | 1 +
muyu-modules/pom.xml | 1 +
7 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/muyu-gateway/pom.xml b/muyu-gateway/pom.xml
index 2d3ed58..81b792f 100644
--- a/muyu-gateway/pom.xml
+++ b/muyu-gateway/pom.xml
@@ -46,6 +46,11 @@
spring-cloud-alibaba-sentinel-gateway
+
+ com.alibaba.csp
+ sentinel-transport-simple-http
+
+
com.alibaba.csp
diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml
index 2b89b27..1524a00 100644
--- a/muyu-gateway/src/main/resources/bootstrap.yml
+++ b/muyu-gateway/src/main/resources/bootstrap.yml
@@ -28,7 +28,8 @@ spring:
eager: true
transport:
# 控制台地址
- dashboard: 43.142.44.217:8718
+ dashboard: 43.142.44.217:8858
+ client-ip: 127.0.0.1
# nacos配置持久化
datasource:
ds1:
diff --git a/muyu-modules/muyu-system/pom.xml b/muyu-modules/muyu-system/pom.xml
index be58498..e984e2c 100644
--- a/muyu-modules/muyu-system/pom.xml
+++ b/muyu-modules/muyu-system/pom.xml
@@ -35,6 +35,17 @@
spring-cloud-starter-alibaba-sentinel
+
+
+ com.alibaba.csp
+ sentinel-datasource-nacos
+
+
+
+ com.alibaba.csp
+ sentinel-transport-simple-http
+
+
org.springframework.boot
@@ -78,6 +89,7 @@
muyu-common-swagger
+
diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java
index bb1ac3d..5a1488e 100644
--- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java
+++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java
@@ -3,6 +3,9 @@ package com.muyu.system.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+
+import com.muyu.common.security.auth.AuthUtil;
+import com.muyu.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -38,11 +41,14 @@ public class BookInfoController extends BaseController
/**
* 查询【请填写功能名称】列表
*/
- @RequiresPermissions("system:info:list")
+ @RequiresPermissions("system:book:list")
@GetMapping("/list")
public Result> list(BookInfo bookInfo)
{
startPage();
+ if (!AuthUtil.hasRole("admin")){
+ bookInfo.setCreateBy(SecurityUtils.getUsername());
+ }
List list = bookInfoService.selectBookInfoList(bookInfo);
return getDataTable(list);
}
@@ -50,7 +56,7 @@ public class BookInfoController extends BaseController
/**
* 导出【请填写功能名称】列表
*/
- @RequiresPermissions("system:info:export")
+ @RequiresPermissions("system:book:list")
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BookInfo bookInfo)
@@ -63,7 +69,7 @@ public class BookInfoController extends BaseController
/**
* 获取【请填写功能名称】详细信息
*/
- @RequiresPermissions("system:info:query")
+ @RequiresPermissions("system:book:list")
@GetMapping(value = "/{bid}")
public Result getInfo(@PathVariable("bid") Long bid)
{
@@ -73,29 +79,31 @@ public class BookInfoController extends BaseController
/**
* 新增【请填写功能名称】
*/
- @RequiresPermissions("system:info:add")
+ @RequiresPermissions("system:book:list")
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
@PostMapping
public Result add(@RequestBody BookInfo bookInfo)
{
+ bookInfo.setCreateBy(SecurityUtils.getUsername());
return toAjax(bookInfoService.insertBookInfo(bookInfo));
}
/**
* 修改【请填写功能名称】
*/
- @RequiresPermissions("system:info:edit")
+ @RequiresPermissions("system:book:list")
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
@PutMapping
public Result edit(@RequestBody BookInfo bookInfo)
{
+ bookInfo.setUpdateBy(SecurityUtils.getUsername());
return toAjax(bookInfoService.updateBookInfo(bookInfo));
}
/**
* 删除【请填写功能名称】
*/
- @RequiresPermissions("system:info:remove")
+ @RequiresPermissions("system:book:list")
@Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
@DeleteMapping("/{bids}")
public Result remove(@PathVariable Long[] bids)
diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
index ed48248..2be32cc 100644
--- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
@@ -11,6 +11,14 @@ spring:
# 环境配置
active: dev
cloud:
+ sentinel:
+ # 取消控制台懒加载
+ eager: true
+ transport:
+ # 控制台地址
+ dashboard: 43.142.44.217:8858
+ client-ip: 127.0.0.1
+ port: 8721
nacos:
discovery:
# 服务注册地址
diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/BookInfoMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/BookInfoMapper.xml
index 7a98b51..e67ff2f 100644
--- a/muyu-modules/muyu-system/src/main/resources/mapper/system/BookInfoMapper.xml
+++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/BookInfoMapper.xml
@@ -26,6 +26,7 @@