From 333a38978e9f46b0768e7c19ea3e870bb0cf8508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 11 Mar 2022 13:29:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E5=91=BD=E5=90=8D=20?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AD=97=E6=AE=B5=20query=20->=20query=5Fpar?=
 =?UTF-8?q?am=20=E8=A7=A3=E5=86=B3=E7=B3=BB=E7=BB=9F=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml              | 2 --
 .../java/com/ruoyi/common/core/domain/entity/SysMenu.java   | 2 +-
 .../com/ruoyi/system/service/impl/SysMenuServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/system/SysMenuMapper.xml      | 6 +++---
 ruoyi-ui/src/views/system/menu/index.vue                    | 2 +-
 script/sql/{ry_vue_4.0.sql => ry_vue_4.X.sql}               | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename script/sql/{ry_vue_4.0.sql => ry_vue_4.X.sql} (99%)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b445974d..b46caabe 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -194,8 +194,6 @@ mybatis-plus:
       updateStrategy: NOT_NULL
       # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件
       where-strategy: NOT_NULL
-      # 对 mysql 的字段做格式化 防止出现系统关键字
-      column-format: "`%s`"
 
 # Swagger配置
 swagger:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index a44e749a..00db9416 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -65,7 +65,7 @@ public class SysMenu extends TreeEntity {
      * 路由参数
      */
     @ApiModelProperty(value = "路由参数")
-    private String query;
+    private String queryParam;
 
     /**
      * 是否为外链（0是 1否）
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 8d1613f5..47aed2c3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -141,7 +141,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(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()));
             List<SysMenu> cMenus = (List<SysMenu>) menu.getChildren();
             if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
@@ -156,7 +156,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 children.setComponent(menu.getComponent());
                 children.setName(StringUtils.capitalize(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);
                 router.setChildren(childrenList);
             } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index b219b955..df17efd4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -12,7 +12,7 @@
         <result property="orderNum" column="order_num"/>
         <result property="path" column="path"/>
         <result property="component" column="component"/>
-        <result property="query" column="query"/>
+        <result property="queryParam" column="query_param"/>
         <result property="isFrame" column="is_frame"/>
         <result property="isCache" column="is_cache"/>
         <result property="menuType" column="menu_type"/>
@@ -28,7 +28,7 @@
     </resultMap>
 
     <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
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -43,7 +43,7 @@
                         m.menu_name,
                         m.path,
                         m.component,
-                        m.query,
+                        m.query_param,
                         m.visible,
                         m.status,
                         m.perms,
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 1b6f39de..42905270 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -208,7 +208,7 @@
           </el-col>
           <el-col :span="12" v-if="form.menuType == 'C'">
             <el-form-item>
-              <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
+              <el-input v-model="form.queryParam" placeholder="请输入路由参数" maxlength="255" />
               <span slot="label">
                 <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
                 <i class="el-icon-question"></i>
diff --git a/script/sql/ry_vue_4.0.sql b/script/sql/ry_vue_4.X.sql
similarity index 99%
rename from script/sql/ry_vue_4.0.sql
rename to script/sql/ry_vue_4.X.sql
index 1fe490ee..47f5da65 100644
--- a/script/sql/ry_vue_4.0.sql
+++ b/script/sql/ry_vue_4.X.sql
@@ -137,7 +137,7 @@ create table sys_menu (
   order_num         int(4)          default 0                  comment '显示顺序',
   path              varchar(200)    default ''                 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_cache          int(1)          default 0                  comment '是否缓存（0缓存 1不缓存）',
   menu_type         char(1)         default ''                 comment '菜单类型（M目录 C菜单 F按钮）',