diff --git a/ruoyi/sql/ry_20200415.sql b/ruoyi/sql/ry_20200415.sql index 8663aad..cf51247 100644 --- a/ruoyi/sql/ry_20200415.sql +++ b/ruoyi/sql/ry_20200415.sql @@ -138,7 +138,7 @@ create table sys_menu ( is_frame int(1) default 1 comment '是否为外链(0是 1否)', menu_type char(1) default '' comment '菜单类型(M目录 C菜单 F按钮)', visible char(1) default 0 comment '菜单状态(0显示 1隐藏)', - status char(1) not null comment '菜单状态(0正常 1停用)', + status char(1) default 0 comment '菜单状态(0正常 1停用)', perms varchar(100) default null comment '权限标识', icon varchar(100) default '#' comment '菜单图标', create_by varchar(64) default '' comment '创建者', diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java index a51cd34..74786d9 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java @@ -3,6 +3,7 @@ package com.ruoyi.framework.config; import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import io.swagger.annotations.ApiOperation; @@ -32,6 +33,10 @@ public class SwaggerConfig @Autowired private RuoYiConfig ruoyiConfig; + /** Swagger开关配置 */ + @Value("${swagger.enable}") + private boolean swaggerEnable; + /** * 创建API */ @@ -39,6 +44,8 @@ public class SwaggerConfig public Docket createRestApi() { return new Docket(DocumentationType.SWAGGER_2) + // 是否启用Swagger + .enable(swaggerEnable) .pathMapping("/dev-api") // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息) .apiInfo(apiInfo()) diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml index 8658f87..34b1f43 100644 --- a/ruoyi/src/main/resources/application.yml +++ b/ruoyi/src/main/resources/application.yml @@ -100,6 +100,10 @@ pagehelper: supportMethodsArguments: true params: count=countSql +# Swagger配置 +swagger: + enable: true + # 防止XSS攻击 xss: # 过滤开关