admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 重命名 菜单字段 query -> query_param 解决系统关键字问题

Browse Source
This commit is contained in:
疯狂的狮子li 2022-03-11 13:29:04 +08:00
parent 91c7b46d52
commit 333a38978e
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -194,8 +194,6 @@ mybatis-plus:
updateStrategy: NOT_NULL updateStrategy: NOT_NULL
# 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件 # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件
where-strategy: NOT_NULL where-strategy: NOT_NULL
# 对 mysql 的字段做格式化 防止出现系统关键字
column-format: "`%s`"
# Swagger配置 # Swagger配置
swagger: swagger:

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
View File

@ -65,7 +65,7 @@ public class SysMenu extends TreeEntity {
* 路由参数 * 路由参数
*/ */
@ApiModelProperty(value = "路由参数") @ApiModelProperty(value = "路由参数")
private String query; private String queryParam;
/** /**
* 是否为外链（0是 1否） * 是否为外链（0是 1否）

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -141,7 +141,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
router.setName(getRouteName(menu)); router.setName(getRouteName(menu));
router.setPath(getRouterPath(menu)); router.setPath(getRouterPath(menu));
router.setComponent(getComponent(menu)); router.setComponent(getComponent(menu));
router.setQuery(menu.getQuery()); router.setQuery(menu.getQueryParam());
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
List<SysMenu> cMenus = (List<SysMenu>) menu.getChildren(); List<SysMenu> cMenus = (List<SysMenu>) menu.getChildren();
if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
@ -156,7 +156,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
children.setComponent(menu.getComponent()); children.setComponent(menu.getComponent());
children.setName(StringUtils.capitalize(menu.getPath())); children.setName(StringUtils.capitalize(menu.getPath()));
children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
children.setQuery(menu.getQuery()); children.setQuery(menu.getQueryParam());
childrenList.add(children); childrenList.add(children);
router.setChildren(childrenList); router.setChildren(childrenList);
} else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) { } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {

6
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View File

@ -12,7 +12,7 @@
<result property="orderNum" column="order_num"/> <result property="orderNum" column="order_num"/>
<result property="path" column="path"/> <result property="path" column="path"/>
<result property="component" column="component"/> <result property="component" column="component"/>
<result property="query" column="query"/> <result property="queryParam" column="query_param"/>
<result property="isFrame" column="is_frame"/> <result property="isFrame" column="is_frame"/>
<result property="isCache" column="is_cache"/> <result property="isCache" column="is_cache"/>
<result property="menuType" column="menu_type"/> <result property="menuType" column="menu_type"/>
@ -28,7 +28,7 @@
</resultMap> </resultMap>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query_param, m.visible, m.status,
m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
@ -43,7 +43,7 @@
m.menu_name, m.menu_name,
m.path, m.path,
m.component, m.component,
m.query, m.query_param,
m.visible, m.visible,
m.status, m.status,
m.perms, m.perms,

2
ruoyi-ui/src/views/system/menu/index.vue
View File

@ -208,7 +208,7 @@
</el-col> </el-col>
<el-col :span="12" v-if="form.menuType == 'C'"> <el-col :span="12" v-if="form.menuType == 'C'">
<el-form-item> <el-form-item>
<el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" /> <el-input v-model="form.queryParam" placeholder="请输入路由参数" maxlength="255" />
<span slot="label"> <span slot="label">
<el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top"> <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
<i class="el-icon-question"></i> <i class="el-icon-question"></i>

2
script/sql/ry_vue_4.0.sql → script/sql/ry_vue_4.X.sql
View File

@ -137,7 +137,7 @@ create table sys_menu (
order_num int(4) default 0 comment '显示顺序', order_num int(4) default 0 comment '显示顺序',
path varchar(200) default '' comment '路由地址', path varchar(200) default '' comment '路由地址',
component varchar(255) default null comment '组件路径', component varchar(255) default null comment '组件路径',
query varchar(255) default null comment '路由参数', query_param varchar(255) default null comment '路由参数',
is_frame int(1) default 1 comment '是否为外链（0是 1否）', is_frame int(1) default 1 comment '是否为外链（0是 1否）',
is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）',
menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）',