From af54608f62b0d8fa29d17a4e550dcca778e31020 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 11 七月 2022 16:29:16 +0800
Subject: [PATCH] update 优化 移除自带 swagger-ui 界面包 建议使用外置工具
---
script/sql/update/oracle/update-4.2-4.3.sql | 2 ++
/dev/null | 15 ---------------
script/sql/postgres/postgres_ry_vue_4.X.sql | 1 -
script/sql/sqlserver/sqlserver_ry_vue_4.X.sql | 2 --
script/sql/update/postgres/update-4.2-4.3.sql | 2 ++
script/sql/oracle/oracle_ry_vue_4.X.sql | 1 -
script/sql/ry_vue_4.X.sql | 1 -
script/sql/update/update-4.2-4.3.sql | 1 +
pom.xml | 2 +-
ruoyi-admin/src/main/resources/application.yml | 8 +-------
ruoyi-common/pom.xml | 2 +-
script/sql/update/sqlserver/update-4.2-4.3.sql | 3 +++
12 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index f49ba5a..6beabcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
+ <artifactId>springdoc-openapi-webmvc-core</artifactId>
<version>${springdoc.version}</version>
</dependency>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 25940ef..09c0ee1 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -121,8 +121,7 @@
- /**/*.js
# swagger 鏂囨。閰嶇疆
- /favicon.ico
- - /doc.html
- - /swagger-ui/**
+ - /*/api-docs
- /*/api-docs/**
# druid 鐩戞帶閰嶇疆
- /druid/**
@@ -199,11 +198,6 @@
name: ${sa-token.token-name}
springdoc:
- swagger-ui:
- # 淇敼Swagger UI璺緞
- path: /doc.html
- # 鎸佷箙鍖栬璇佹暟鎹�
- persistAuthorization: true
#杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
group-configs:
- group: 1.婕旂ず妯″潡
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 78ad596..0444727 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
+ <artifactId>springdoc-openapi-webmvc-core</artifactId>
</dependency>
<dependency>
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 b782968..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 + "/doc.html"
- };
- },
-};
-</script>
diff --git a/script/sql/oracle/oracle_ry_vue_4.X.sql b/script/sql/oracle/oracle_ry_vue_4.X.sql
index f53ca82..2ca7d23 100644
--- a/script/sql/oracle/oracle_ry_vue_4.X.sql
+++ b/script/sql/oracle/oracle_ry_vue_4.X.sql
@@ -262,7 +262,6 @@
insert into sys_menu values('113', '缂撳瓨鐩戞帶', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', sysdate, '', null, '缂撳瓨鐩戞帶鑿滃崟');
insert into sys_menu values('114', '琛ㄥ崟鏋勫缓', '3', '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate, '', null, '琛ㄥ崟鏋勫缓鑿滃崟');
insert into sys_menu values('115', '浠ｇ爜鐢熸垚', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate, '', null, '浠ｇ爜鐢熸垚鑿滃崟');
-insert into sys_menu values('116', '绯荤粺鎺ュ彛', '3', '3', 'swagger', 'tool/swagger/index', '', 1, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate, '', null, '绯荤粺鎺ュ彛鑿滃崟');
-- springboot-admin鐩戞帶
insert into sys_menu values('117', 'Admin鐩戞帶', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 'admin', sysdate, '', null, 'Admin鐩戞帶鑿滃崟');
-- oss鑿滃崟
diff --git a/script/sql/postgres/postgres_ry_vue_4.X.sql b/script/sql/postgres/postgres_ry_vue_4.X.sql
index ad49672..75a38e1 100644
--- a/script/sql/postgres/postgres_ry_vue_4.X.sql
+++ b/script/sql/postgres/postgres_ry_vue_4.X.sql
@@ -265,7 +265,6 @@
insert into sys_menu values('113', '缂撳瓨鐩戞帶', '2', '5', 'cache', 'monitor/cache/index', '', '1', '0', 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', now(), '', null, '缂撳瓨鐩戞帶鑿滃崟');
insert into sys_menu values('114', '琛ㄥ崟鏋勫缓', '3', '1', 'build', 'tool/build/index', '', '1', '0', 'C', '0', '0', 'tool:build:list', 'build', 'admin', now(), '', null, '琛ㄥ崟鏋勫缓鑿滃崟');
insert into sys_menu values('115', '浠ｇ爜鐢熸垚', '3', '2', 'gen', 'tool/gen/index', '', '1', '0', 'C', '0', '0', 'tool:gen:list', 'code', 'admin', now(), '', null, '浠ｇ爜鐢熸垚鑿滃崟');
-insert into sys_menu values('116', '绯荤粺鎺ュ彛', '3', '3', 'swagger', 'tool/swagger/index', '', '1', '0', 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', now(), '', null, '绯荤粺鎺ュ彛鑿滃崟');
-- springboot-admin鐩戞帶
insert into sys_menu values('117', 'Admin鐩戞帶', '2', '5', 'Admin', 'monitor/admin/index', '', '1', '0', 'C', '0', '0', 'monitor:admin:list', 'dashboard', 'admin', now(), '', null, 'Admin鐩戞帶鑿滃崟');
-- oss鑿滃崟
diff --git a/script/sql/ry_vue_4.X.sql b/script/sql/ry_vue_4.X.sql
index b10eacb..52aedce 100644
--- a/script/sql/ry_vue_4.X.sql
+++ b/script/sql/ry_vue_4.X.sql
@@ -177,7 +177,6 @@
insert into sys_menu values('113', '缂撳瓨鐩戞帶', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', sysdate(), '', null, '缂撳瓨鐩戞帶鑿滃崟');
insert into sys_menu values('114', '琛ㄥ崟鏋勫缓', '3', '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate(), '', null, '琛ㄥ崟鏋勫缓鑿滃崟');
insert into sys_menu values('115', '浠ｇ爜鐢熸垚', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate(), '', null, '浠ｇ爜鐢熸垚鑿滃崟');
-insert into sys_menu values('116', '绯荤粺鎺ュ彛', '3', '3', 'swagger', 'tool/swagger/index', '', 1, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate(), '', null, '绯荤粺鎺ュ彛鑿滃崟');
-- springboot-admin鐩戞帶
insert into sys_menu values('117', 'Admin鐩戞帶', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 'admin', sysdate(), '', null, 'Admin鐩戞帶鑿滃崟');
-- oss鑿滃崟
diff --git a/script/sql/sqlserver/sqlserver_ry_vue_4.X.sql b/script/sql/sqlserver/sqlserver_ry_vue_4.X.sql
index 9d8e1ee..3286654 100644
--- a/script/sql/sqlserver/sqlserver_ry_vue_4.X.sql
+++ b/script/sql/sqlserver/sqlserver_ry_vue_4.X.sql
@@ -1086,8 +1086,6 @@
GO
INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (115, N'浠ｇ爜鐢熸垚', 3, 2, N'gen', N'tool/gen/index', N'', 1, 0, N'C', N'0', N'0', N'tool:gen:list', N'code', N'admin', getdate(), N'', NULL, N'浠ｇ爜鐢熸垚鑿滃崟')
GO
-INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (116, N'绯荤粺鎺ュ彛', 3, 3, N'swagger', N'tool/swagger/index', N'', 1, 0, N'C', N'0', N'0', N'tool:swagger:list', N'swagger', N'admin', getdate(), N'', NULL, N'绯荤粺鎺ュ彛鑿滃崟')
-GO
INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (117, N'Admin鐩戞帶', 2, 5, N'Admin', N'monitor/admin/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:admin:list', N'dashboard', N'admin', getdate(), N'', NULL, N'Admin鐩戞帶鑿滃崟');
GO
INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (118, N'鏂囦欢绠＄悊', 1, 10, N'oss', N'system/oss/index', N'', 1, 0, N'C', '0', N'0', N'system:oss:list', N'upload', N'admin', getdate(), N'', NULL, N'鏂囦欢绠＄悊鑿滃崟');
diff --git a/script/sql/update/oracle/update-4.2-4.3.sql b/script/sql/update/oracle/update-4.2-4.3.sql
index a995acc..7ecec0b 100644
--- a/script/sql/update/oracle/update-4.2-4.3.sql
+++ b/script/sql/update/oracle/update-4.2-4.3.sql
@@ -1 +1,3 @@
insert into sys_menu values('112', '缂撳瓨鍒楄〃', '2', '6', 'cacheList', 'monitor/cache/list', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis-list', 'admin', sysdate, '', null, '缂撳瓨鍒楄〃鑿滃崟');
+
+delete from sys_menu WHERE menu_id = 116;
diff --git a/script/sql/update/postgres/update-4.2-4.3.sql b/script/sql/update/postgres/update-4.2-4.3.sql
index 9a3c41b..731360f 100644
--- a/script/sql/update/postgres/update-4.2-4.3.sql
+++ b/script/sql/update/postgres/update-4.2-4.3.sql
@@ -1 +1,3 @@
insert into sys_menu values('112', '缂撳瓨鍒楄〃', '2', '6', 'cacheList', 'monitor/cache/list', '', '1', '0', 'C', '0', '0', 'monitor:cache:list', 'redis-list', 'admin', now(), '', null, '缂撳瓨鍒楄〃鑿滃崟');
+
+delete from sys_menu WHERE menu_id = 116;
diff --git a/script/sql/update/sqlserver/update-4.2-4.3.sql b/script/sql/update/sqlserver/update-4.2-4.3.sql
index fd42238..cf3f3a1 100644
--- a/script/sql/update/sqlserver/update-4.2-4.3.sql
+++ b/script/sql/update/sqlserver/update-4.2-4.3.sql
@@ -1,2 +1,5 @@
INSERT [sys_menu] ([menu_id], [menu_name], [parent_id], [order_num], [path], [component], [query_param], [is_frame], [is_cache], [menu_type], [visible], [status], [perms], [icon], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (112, N'缂撳瓨鍒楄〃', 2, 6, N'cacheList', N'monitor/cache/list', N'', 1, 0, N'C', N'0', N'0', N'monitor:cache:list', N'redis-list', N'admin', getdate(), N'', NULL, N'缂撳瓨鍒楄〃鑿滃崟')
GO
+
+delete from sys_menu WHERE menu_id = 116;
+GO
diff --git a/script/sql/update/update-4.2-4.3.sql b/script/sql/update/update-4.2-4.3.sql
index 8486c38..7939197 100644
--- a/script/sql/update/update-4.2-4.3.sql
+++ b/script/sql/update/update-4.2-4.3.sql
@@ -1,2 +1,3 @@
insert into sys_menu values('112', '缂撳瓨鍒楄〃', '2', '6', 'cacheList', 'monitor/cache/list', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis-list', 'admin', sysdate(), '', null, '缂撳瓨鍒楄〃鑿滃崟');
+delete from sys_menu WHERE menu_id = 116;
--
Gitblit v1.9.3