diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index 2e77452db..767d334f3 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -58,7 +58,7 @@ const user = { } else { commit('SET_ROLES', ['ROLE_DEFAULT']) } - commit('SET_NAME', user.username) + commit('SET_NAME', user.userName) commit('SET_AVATAR', avatar) resolve(res) }).catch(error => { diff --git a/ruoyi/sql/ry_20200415.sql b/ruoyi/sql/ry_20200415.sql index 0e4c6a20c..3cbc3bdfb 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/common/filter/RepeatableFilter.java b/ruoyi/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java index a1125e346..6e3edfcee 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/ruoyi/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java @@ -8,6 +8,8 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; +import org.springframework.http.MediaType; +import com.ruoyi.common.utils.StringUtils; /** * Repeatable 过滤器 @@ -27,7 +29,8 @@ public class RepeatableFilter implements Filter throws IOException, ServletException { ServletRequest requestWrapper = null; - if (request instanceof HttpServletRequest) + if (request instanceof HttpServletRequest && StringUtils.equalsAnyIgnoreCase(request.getContentType(), + MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_JSON_UTF8_VALUE)) { requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); } 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 bd60b8f72..92fc5d142 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/java/com/ruoyi/project/monitor/domain/SysJob.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java index 850543a9f..126be47f3 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java +++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java @@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.job.CronUtils; @@ -110,6 +111,7 @@ public class SysJob extends BaseEntity implements Serializable this.cronExpression = cronExpression; } + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") public Date getNextValidTime() { if (StringUtils.isNotEmpty(cronExpression)) diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml index e0ba64fa1..029e77a37 100644 --- a/ruoyi/src/main/resources/application.yml +++ b/ruoyi/src/main/resources/application.yml @@ -116,6 +116,10 @@ pagehelper: supportMethodsArguments: true params: count=countSql +# Swagger配置 +swagger: + enable: true + # 防止XSS攻击 xss: # 过滤开关 diff --git a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml index e2750f64b..954d070a1 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml @@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${dataScope} + order by r.role_sort