From b15be7078cf5f3494cc1e7327b28671b584d6171 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 06 五月 2020 11:57:51 +0800
Subject: [PATCH] 同步ruoyi-vue更新
---
ruoyi/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java | 5 ++++-
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml | 1 +
ruoyi-ui/src/store/modules/user.js | 2 +-
ruoyi/src/main/resources/vm/vue/index.vue.vm | 6 ++++--
ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java | 7 +++++++
ruoyi/src/main/resources/application.yml | 4 ++++
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm | 6 ++++--
ruoyi/sql/ry_20200415.sql | 2 +-
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java | 2 ++
9 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 2e77452..767d334 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -58,7 +58,7 @@
} 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 0e4c6a2..3cbc3bd 100644
--- a/ruoyi/sql/ry_20200415.sql
+++ b/ruoyi/sql/ry_20200415.sql
@@ -138,7 +138,7 @@
is_frame int(1) default 1 comment '鏄惁涓哄閾撅紙0鏄� 1鍚︼級',
menu_type char(1) default '' comment '鑿滃崟绫诲瀷锛圡鐩綍 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 a1125e3..6e3edfc 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.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 @@
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 bd60b8f..92fc5d1 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 @@
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 @@
@Autowired
private RuoYiConfig ruoyiConfig;
+ /** Swagger寮�鍏抽厤缃� */
+ @Value("${swagger.enable}")
+ private boolean swaggerEnable;
+
/**
* 鍒涘缓API
*/
@@ -39,6 +44,8 @@
public Docket createRestApi()
{
return new Docket(DocumentationType.SWAGGER_2)
+ // 鏄惁鍚敤Swagger
+ .enable(swaggerEnable)
.pathMapping("/dev-api")
// 鐢ㄦ潵鍒涘缓璇PI鐨勫熀鏈俊鎭紝灞曠ず鍦ㄦ枃妗ｇ殑椤甸潰涓紙鑷畾涔夊睍绀虹殑淇℃伅锛�
.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 850543a..126be47 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.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 @@
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 e0ba64f..029e77a 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -116,6 +116,10 @@
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 e2750f6..954d070 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
@@ -48,6 +48,7 @@
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${dataScope}
+ order by r.role_sort
</select>
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
diff --git a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
index 6c33b9f..1a74fca 100644
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/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>
diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm
index 0d2ca8c..003aae6 100644
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/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>
--
Gitblit v1.9.3