From 36460e00525f0f8925008e0da9a52a8b895f10c1 Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Sat, 29 Jul 2023 08:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E2=80=9C=E7=B3=BB=E7=BB=9F=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E2=80=9D=E8=8F=9C=E5=8D=95=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
=?UTF-8?q?=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-admin/src/main/resources/application.yml | 9 +++++----
ruoyi-modules/ruoyi-demo/pom.xml | 5 +++++
ruoyi-ui/src/views/tool/swagger/index.vue | 15 ---------------
sql/update.sql | 5 ++++-
4 files changed, 14 insertions(+), 20 deletions(-)
delete mode 100644 ruoyi-ui/src/views/tool/swagger/index.vue
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 67f25d9..e58ec2f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -127,19 +127,20 @@ pagehelper:
# SpringDoc配置
springdoc:
- packages-to-scan: ##需要扫描的包,可以配置多个
- - com.ruoyi.demo.*
- paths-to-exclude: ##配置不包含在swagger文档中的api
+ #需要扫描的包,可以配置多个，使用逗号分割
+ packages-to-scan: com.ruoyi.demo
+ paths-to-exclude: #配置不包含在swagger文档中的api
- /api/test/**
- /api/mockito/data
swagger-ui:
enabled: true #开启/禁止swagger,prod可以设置为false
+ disable-swagger-default-url: true #禁用default petstore url
path: /swagger-ui.html #swagger页面
+ persistAuthorization: true # 持久化认证数据，如果设置为 true，它会保留授权数据并且不会在浏览器关闭/刷新时丢失
csrf:
enabled: true # 启用CSRF支持
api-docs:
enabled: true #开启/禁止api-docs, prod可以设置为false
- path: /api-docs #api的json文档
use-management-port: false
enable-spring-security: true
diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml
index 8c30a71..5948627 100644
--- a/ruoyi-modules/ruoyi-demo/pom.xml
+++ b/ruoyi-modules/ruoyi-demo/pom.xml
@@ -21,6 +21,11 @@
<artifactId>ruoyi-common-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-springdoc</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/ruoyi-ui/src/views/tool/swagger/index.vue
deleted file mode 100644
index 7b10e8c..0000000
--- a/ruoyi-ui/src/views/tool/swagger/index.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
- <i-frame :src="url" />
-</template>
-<script>
-import iFrame from "@/components/iFrame/index";
-export default {
- name: "Swagger",
- components: { iFrame },
- data() {
- return {
- url: process.env.VUE_APP_BASE_API + "/swagger-ui.html"
- };
- },
-};
-</script>
diff --git a/sql/update.sql b/sql/update.sql
index 634d48c..b91a954 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -137,5 +137,8 @@ INSERT INTO `gen_table_column` (`column_id`, `table_id`, `column_name`, `column_
(72, 12, 'date', '商品时间', 'datetime', 'Date', 'date', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'datetime', '', 6, 'admin', '2023-07-11 15:52:15', '', NULL),
(73, 12, 'type', '商品种类', 'char(1)', 'String', 'type', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 7, 'admin', '2023-07-11 15:52:15', '', NULL);
--- udate to Ruoyi-Flex V4.1.2:
+-- udate to Ruoyi-Flex V4.1.2: 删除druid
delete FROM sys_menu where menu_id=111
+
+-- udate to Ruoyi-Flex V4.1.3: 将“系统接口”设置为外链
+update sys_menu SET path="http://localhost:8080/swagger-ui/index.html", component = "", is_frame = "0", menu_type = "M" where menu_id = 117