同步ruoyi-vue更新

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 => {

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 '创建者',

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);
         }

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())

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))

ruoyi/src/main/resources/application.yml

@@ -116,6 +116,10 @@ pagehelper:
   supportMethodsArguments: true
   params: count=countSql 
 
+# Swagger配置
+swagger:
+  enable: true
+
 # 防止XSS攻击
 xss: 
   # 过滤开关

ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${dataScope}
+		order by r.role_sort
 	</select>
     
 	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">

ruoyi/src/main/resources/vm/vue/index-tree.vue.vm

@@ -146,7 +146,8 @@
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="dict.dictValue"
+              #if($column.javaType == "Integer"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -162,7 +163,8 @@
             <el-radio
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
-              :label="dict.dictValue"
+              #if($column.javaType == "Integer"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>

ruoyi/src/main/resources/vm/vue/index.vue.vm

@@ -174,7 +174,8 @@
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="dict.dictValue"
+              #if($column.javaType == "Integer"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+
             ></el-option>
           </el-select>
         </el-form-item>
@@ -190,7 +191,8 @@
             <el-radio
               v-for="dict in ${field}Options"
               :key="dict.dictValue"
-              :label="dict.dictValue"
+              #if($column.javaType == "Integer"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>