fix 初始化数据

data/init/sys_config.json

@@ -1,6 +1,6 @@
  [
     {
-      "config_id": 1,
+      "id": 1,
       "tenant_id": "000000",
       "config_name": "主框架页-默认皮肤样式名称",
       "config_key": "sys.index.skinName",
@@ -14,7 +14,7 @@
       "remark": "蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow"
     },
     {
-      "config_id": 2,
+      "id": 2,
       "tenant_id": "000000",
       "config_name": "用户管理-账号初始密码",
       "config_key": "sys.user.initPassword",
@@ -28,7 +28,7 @@
       "remark": "初始化密码 123456"
     },
     {
-      "config_id": 3,
+      "id": 3,
       "tenant_id": "000000",
       "config_name": "主框架页-侧边栏主题",
       "config_key": "sys.index.sideTheme",
@@ -42,7 +42,7 @@
       "remark": "深色主题theme-dark，浅色主题theme-light"
     },
     {
-      "config_id": 5,
+      "id": 5,
       "tenant_id": "000000",
       "config_name": "账号自助-是否开启用户注册功能",
       "config_key": "sys.account.registerUser",
@@ -56,7 +56,7 @@
       "remark": "是否开启注册用户功能（true开启，false关闭）"
     },
     {
-      "config_id": 11,
+      "id": 11,
       "tenant_id": "000000",
       "config_name": "OSS预览列表资源开关",
       "config_key": "sys.oss.previewListResource",

data/init/sys_dept.json

@@ -1,6 +1,6 @@
  [
     {
-      "dept_id": 100,
+      "id": 100,
       "tenant_id": "000000",
       "parent_id": 0,
       "ancestors": "0",
@@ -18,7 +18,7 @@
       "update_time": null
     },
     {
-      "dept_id": 101,
+      "id": 101,
       "tenant_id": "000000",
       "parent_id": 100,
       "ancestors": "0,100",
@@ -36,7 +36,7 @@
       "update_time": null
     },
     {
-      "dept_id": 102,
+      "id": 102,
       "tenant_id": "000000",
       "parent_id": 100,
       "ancestors": "0,100",
@@ -54,7 +54,7 @@
       "update_time": null
     },
     {
-      "dept_id": 103,
+      "id": 103,
       "tenant_id": "000000",
       "parent_id": 101,
       "ancestors": "0,100,101",
@@ -72,7 +72,7 @@
       "update_time": null
     },
     {
-      "dept_id": 104,
+      "id": 104,
       "tenant_id": "000000",
       "parent_id": 101,
       "ancestors": "0,100,101",
@@ -90,7 +90,7 @@
       "update_time": null
     },
     {
-      "dept_id": 105,
+      "id": 105,
       "tenant_id": "000000",
       "parent_id": 101,
       "ancestors": "0,100,101",
@@ -108,7 +108,7 @@
       "update_time": null
     },
     {
-      "dept_id": 106,
+      "id": 106,
       "tenant_id": "000000",
       "parent_id": 101,
       "ancestors": "0,100,101",
@@ -126,7 +126,7 @@
       "update_time": null
     },
     {
-      "dept_id": 107,
+      "id": 107,
       "tenant_id": "000000",
       "parent_id": 101,
       "ancestors": "0,100,101",
@@ -144,7 +144,7 @@
       "update_time": null
     },
     {
-      "dept_id": 108,
+      "id": 108,
       "tenant_id": "000000",
       "parent_id": 102,
       "ancestors": "0,100,102",
@@ -162,7 +162,7 @@
       "update_time": null
     },
     {
-      "dept_id": 109,
+      "id": 109,
       "tenant_id": "000000",
       "parent_id": 102,
       "ancestors": "0,100,102",

data/init/sys_dict_data.json

@@ -1,6 +1,6 @@
  [
     {
-      "dict_code": 1,
+      "id": 1,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "男",
@@ -18,7 +18,7 @@
       "remark": "性别男"
     },
     {
-      "dict_code": 2,
+      "id": 2,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "女",
@@ -36,7 +36,7 @@
       "remark": "性别女"
     },
     {
-      "dict_code": 3,
+      "id": 3,
       "tenant_id": "000000",
       "dict_sort": 3,
       "dict_label": "未知",
@@ -54,7 +54,7 @@
       "remark": "性别未知"
     },
     {
-      "dict_code": 4,
+      "id": 4,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "显示",
@@ -72,7 +72,7 @@
       "remark": "显示菜单"
     },
     {
-      "dict_code": 5,
+      "id": 5,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "隐藏",
@@ -90,7 +90,7 @@
       "remark": "隐藏菜单"
     },
     {
-      "dict_code": 6,
+      "id": 6,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "正常",
@@ -108,7 +108,7 @@
       "remark": "正常状态"
     },
     {
-      "dict_code": 7,
+      "id": 7,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "停用",
@@ -126,7 +126,7 @@
       "remark": "停用状态"
     },
     {
-      "dict_code": 12,
+      "id": 12,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "是",
@@ -144,7 +144,7 @@
       "remark": "系统默认是"
     },
     {
-      "dict_code": 13,
+      "id": 13,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "否",
@@ -162,7 +162,7 @@
       "remark": "系统默认否"
     },
     {
-      "dict_code": 14,
+      "id": 14,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "通知",
@@ -180,7 +180,7 @@
       "remark": "通知"
     },
     {
-      "dict_code": 15,
+      "id": 15,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "公告",
@@ -198,7 +198,7 @@
       "remark": "公告"
     },
     {
-      "dict_code": 16,
+      "id": 16,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "正常",
@@ -216,7 +216,7 @@
       "remark": "正常状态"
     },
     {
-      "dict_code": 17,
+      "id": 17,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "关闭",
@@ -234,7 +234,7 @@
       "remark": "关闭状态"
     },
     {
-      "dict_code": 18,
+      "id": 18,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "新增",
@@ -252,7 +252,7 @@
       "remark": "新增操作"
     },
     {
-      "dict_code": 19,
+      "id": 19,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "修改",
@@ -270,7 +270,7 @@
       "remark": "修改操作"
     },
     {
-      "dict_code": 20,
+      "id": 20,
       "tenant_id": "000000",
       "dict_sort": 3,
       "dict_label": "删除",
@@ -288,7 +288,7 @@
       "remark": "删除操作"
     },
     {
-      "dict_code": 21,
+      "id": 21,
       "tenant_id": "000000",
       "dict_sort": 4,
       "dict_label": "授权",
@@ -306,7 +306,7 @@
       "remark": "授权操作"
     },
     {
-      "dict_code": 22,
+      "id": 22,
       "tenant_id": "000000",
       "dict_sort": 5,
       "dict_label": "导出",
@@ -324,7 +324,7 @@
       "remark": "导出操作"
     },
     {
-      "dict_code": 23,
+      "id": 23,
       "tenant_id": "000000",
       "dict_sort": 6,
       "dict_label": "导入",
@@ -342,7 +342,7 @@
       "remark": "导入操作"
     },
     {
-      "dict_code": 24,
+      "id": 24,
       "tenant_id": "000000",
       "dict_sort": 7,
       "dict_label": "强退",
@@ -360,7 +360,7 @@
       "remark": "强退操作"
     },
     {
-      "dict_code": 25,
+      "id": 25,
       "tenant_id": "000000",
       "dict_sort": 8,
       "dict_label": "生成代码",
@@ -378,7 +378,7 @@
       "remark": "生成操作"
     },
     {
-      "dict_code": 26,
+      "id": 26,
       "tenant_id": "000000",
       "dict_sort": 9,
       "dict_label": "清空数据",
@@ -396,7 +396,7 @@
       "remark": "清空操作"
     },
     {
-      "dict_code": 27,
+      "id": 27,
       "tenant_id": "000000",
       "dict_sort": 1,
       "dict_label": "成功",
@@ -414,7 +414,7 @@
       "remark": "正常状态"
     },
     {
-      "dict_code": 28,
+      "id": 28,
       "tenant_id": "000000",
       "dict_sort": 2,
       "dict_label": "失败",
@@ -432,7 +432,7 @@
       "remark": "停用状态"
     },
     {
-      "dict_code": 29,
+      "id": 29,
       "tenant_id": "000000",
       "dict_sort": 99,
       "dict_label": "其他",

data/init/sys_dict_type.json

@@ -1,6 +1,6 @@
  [
     {
-      "dict_id": 1,
+      "id": 1,
       "tenant_id": "000000",
       "dict_name": "用户性别",
       "dict_type": "sys_user_sex",
@@ -13,7 +13,7 @@
       "remark": "用户性别列表"
     },
     {
-      "dict_id": 2,
+      "id": 2,
       "tenant_id": "000000",
       "dict_name": "菜单状态",
       "dict_type": "sys_show_hide",
@@ -26,7 +26,7 @@
       "remark": "菜单状态列表"
     },
     {
-      "dict_id": 3,
+      "id": 3,
       "tenant_id": "000000",
       "dict_name": "系统开关",
       "dict_type": "sys_normal_disable",
@@ -39,7 +39,7 @@
       "remark": "系统开关列表"
     },
     {
-      "dict_id": 6,
+      "id": 6,
       "tenant_id": "000000",
       "dict_name": "系统是否",
       "dict_type": "sys_yes_no",
@@ -52,7 +52,7 @@
       "remark": "系统是否列表"
     },
     {
-      "dict_id": 7,
+      "id": 7,
       "tenant_id": "000000",
       "dict_name": "通知类型",
       "dict_type": "sys_notice_type",
@@ -65,7 +65,7 @@
       "remark": "通知类型列表"
     },
     {
-      "dict_id": 8,
+      "id": 8,
       "tenant_id": "000000",
       "dict_name": "通知状态",
       "dict_type": "sys_notice_status",
@@ -78,7 +78,7 @@
       "remark": "通知状态列表"
     },
     {
-      "dict_id": 9,
+      "id": 9,
       "tenant_id": "000000",
       "dict_name": "操作类型",
       "dict_type": "sys_oper_type",
@@ -91,7 +91,7 @@
       "remark": "操作类型列表"
     },
     {
-      "dict_id": 10,
+      "id": 10,
       "tenant_id": "000000",
       "dict_name": "系统状态",
       "dict_type": "sys_common_status",

data/init/sys_logininfor.json

@@ -1,6 +1,6 @@
  [
     {
-      "info_id": 1665628533390614529,
+      "id": 1665628533390614529,
       "tenant_id": "000000",
       "user_name": "admin",
       "ipaddr": "127.0.0.1",

data/init/sys_menu.json

@@ -1,6 +1,6 @@
  [
     {
-      "menu_id": 1,
+      "id": 1,
       "menu_name": "系统管理",
       "parent_id": 0,
       "order_num": 1,
@@ -22,7 +22,7 @@
       "remark": "系统管理目录"
     },
     {
-      "menu_id": 2,
+      "id": 2,
       "menu_name": "系统监控",
       "parent_id": 0,
       "order_num": 3,
@@ -44,7 +44,7 @@
       "remark": "系统监控目录"
     },
     {
-      "menu_id": 3,
+      "id": 3,
       "menu_name": "系统工具",
       "parent_id": 0,
       "order_num": 4,
@@ -66,7 +66,7 @@
       "remark": "系统工具目录"
     },
     {
-      "menu_id": 4,
+      "id": 4,
       "menu_name": "PLUS官网",
       "parent_id": 0,
       "order_num": 5,
@@ -88,7 +88,7 @@
       "remark": "RuoYi-Vue-Plus官网地址"
     },
     {
-      "menu_id": 6,
+      "id": 6,
       "menu_name": "租户管理",
       "parent_id": 0,
       "order_num": 2,
@@ -110,7 +110,7 @@
       "remark": "租户管理目录"
     },
     {
-      "menu_id": 100,
+      "id": 100,
       "menu_name": "用户管理",
       "parent_id": 1,
       "order_num": 1,
@@ -132,7 +132,7 @@
       "remark": "用户管理菜单"
     },
     {
-      "menu_id": 101,
+      "id": 101,
       "menu_name": "角色管理",
       "parent_id": 1,
       "order_num": 2,
@@ -154,7 +154,7 @@
       "remark": "角色管理菜单"
     },
     {
-      "menu_id": 102,
+      "id": 102,
       "menu_name": "菜单管理",
       "parent_id": 1,
       "order_num": 3,
@@ -176,7 +176,7 @@
       "remark": "菜单管理菜单"
     },
     {
-      "menu_id": 103,
+      "id": 103,
       "menu_name": "部门管理",
       "parent_id": 1,
       "order_num": 4,
@@ -198,7 +198,7 @@
       "remark": "部门管理菜单"
     },
     {
-      "menu_id": 104,
+      "id": 104,
       "menu_name": "岗位管理",
       "parent_id": 1,
       "order_num": 5,
@@ -220,7 +220,7 @@
       "remark": "岗位管理菜单"
     },
     {
-      "menu_id": 105,
+      "id": 105,
       "menu_name": "字典管理",
       "parent_id": 1,
       "order_num": 6,
@@ -242,7 +242,7 @@
       "remark": "字典管理菜单"
     },
     {
-      "menu_id": 106,
+      "id": 106,
       "menu_name": "参数设置",
       "parent_id": 1,
       "order_num": 7,
@@ -264,7 +264,7 @@
       "remark": "参数设置菜单"
     },
     {
-      "menu_id": 107,
+      "id": 107,
       "menu_name": "通知公告",
       "parent_id": 1,
       "order_num": 8,
@@ -286,7 +286,7 @@
       "remark": "通知公告菜单"
     },
     {
-      "menu_id": 108,
+      "id": 108,
       "menu_name": "日志管理",
       "parent_id": 1,
       "order_num": 9,
@@ -308,7 +308,7 @@
       "remark": "日志管理菜单"
     },
     {
-      "menu_id": 109,
+      "id": 109,
       "menu_name": "在线用户",
       "parent_id": 2,
       "order_num": 1,
@@ -330,7 +330,7 @@
       "remark": "在线用户菜单"
     },
     {
-      "menu_id": 113,
+      "id": 113,
       "menu_name": "缓存监控",
       "parent_id": 2,
       "order_num": 5,
@@ -352,7 +352,7 @@
       "remark": "缓存监控菜单"
     },
     {
-      "menu_id": 114,
+      "id": 114,
       "menu_name": "表单构建",
       "parent_id": 3,
       "order_num": 1,
@@ -374,7 +374,7 @@
       "remark": "表单构建菜单"
     },
     {
-      "menu_id": 115,
+      "id": 115,
       "menu_name": "代码生成",
       "parent_id": 3,
       "order_num": 2,
@@ -396,7 +396,7 @@
       "remark": "代码生成菜单"
     },
     {
-      "menu_id": 117,
+      "id": 117,
       "menu_name": "Admin监控",
       "parent_id": 2,
       "order_num": 5,
@@ -418,7 +418,7 @@
       "remark": "Admin监控菜单"
     },
     {
-      "menu_id": 118,
+      "id": 118,
       "menu_name": "文件管理",
       "parent_id": 1,
       "order_num": 10,
@@ -440,7 +440,7 @@
       "remark": "文件管理菜单"
     },
     {
-      "menu_id": 120,
+      "id": 120,
       "menu_name": "任务调度中心",
       "parent_id": 2,
       "order_num": 5,
@@ -462,7 +462,7 @@
       "remark": "Xxl-Job控制台菜单"
     },
     {
-      "menu_id": 121,
+      "id": 121,
       "menu_name": "租户管理",
       "parent_id": 6,
       "order_num": 1,
@@ -484,7 +484,7 @@
       "remark": "租户管理菜单"
     },
     {
-      "menu_id": 122,
+      "id": 122,
       "menu_name": "租户套餐管理",
       "parent_id": 6,
       "order_num": 2,
@@ -506,7 +506,7 @@
       "remark": "租户套餐管理菜单"
     },
     {
-      "menu_id": 500,
+      "id": 500,
       "menu_name": "操作日志",
       "parent_id": 108,
       "order_num": 1,
@@ -528,7 +528,7 @@
       "remark": "操作日志菜单"
     },
     {
-      "menu_id": 501,
+      "id": 501,
       "menu_name": "登录日志",
       "parent_id": 108,
       "order_num": 2,
@@ -550,7 +550,7 @@
       "remark": "登录日志菜单"
     },
     {
-      "menu_id": 1001,
+      "id": 1001,
       "menu_name": "用户查询",
       "parent_id": 100,
       "order_num": 1,
@@ -572,7 +572,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1002,
+      "id": 1002,
       "menu_name": "用户新增",
       "parent_id": 100,
       "order_num": 2,
@@ -594,7 +594,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1003,
+      "id": 1003,
       "menu_name": "用户修改",
       "parent_id": 100,
       "order_num": 3,
@@ -616,7 +616,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1004,
+      "id": 1004,
       "menu_name": "用户删除",
       "parent_id": 100,
       "order_num": 4,
@@ -638,7 +638,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1005,
+      "id": 1005,
       "menu_name": "用户导出",
       "parent_id": 100,
       "order_num": 5,
@@ -660,7 +660,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1006,
+      "id": 1006,
       "menu_name": "用户导入",
       "parent_id": 100,
       "order_num": 6,
@@ -682,7 +682,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1007,
+      "id": 1007,
       "menu_name": "重置密码",
       "parent_id": 100,
       "order_num": 7,
@@ -704,7 +704,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1008,
+      "id": 1008,
       "menu_name": "角色查询",
       "parent_id": 101,
       "order_num": 1,
@@ -726,7 +726,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1009,
+      "id": 1009,
       "menu_name": "角色新增",
       "parent_id": 101,
       "order_num": 2,
@@ -748,7 +748,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1010,
+      "id": 1010,
       "menu_name": "角色修改",
       "parent_id": 101,
       "order_num": 3,
@@ -770,7 +770,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1011,
+      "id": 1011,
       "menu_name": "角色删除",
       "parent_id": 101,
       "order_num": 4,
@@ -792,7 +792,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1012,
+      "id": 1012,
       "menu_name": "角色导出",
       "parent_id": 101,
       "order_num": 5,
@@ -814,7 +814,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1013,
+      "id": 1013,
       "menu_name": "菜单查询",
       "parent_id": 102,
       "order_num": 1,
@@ -836,7 +836,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1014,
+      "id": 1014,
       "menu_name": "菜单新增",
       "parent_id": 102,
       "order_num": 2,
@@ -858,7 +858,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1015,
+      "id": 1015,
       "menu_name": "菜单修改",
       "parent_id": 102,
       "order_num": 3,
@@ -880,7 +880,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1016,
+      "id": 1016,
       "menu_name": "菜单删除",
       "parent_id": 102,
       "order_num": 4,
@@ -902,7 +902,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1017,
+      "id": 1017,
       "menu_name": "部门查询",
       "parent_id": 103,
       "order_num": 1,
@@ -924,7 +924,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1018,
+      "id": 1018,
       "menu_name": "部门新增",
       "parent_id": 103,
       "order_num": 2,
@@ -946,7 +946,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1019,
+      "id": 1019,
       "menu_name": "部门修改",
       "parent_id": 103,
       "order_num": 3,
@@ -968,7 +968,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1020,
+      "id": 1020,
       "menu_name": "部门删除",
       "parent_id": 103,
       "order_num": 4,
@@ -990,7 +990,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1021,
+      "id": 1021,
       "menu_name": "岗位查询",
       "parent_id": 104,
       "order_num": 1,
@@ -1012,7 +1012,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1022,
+      "id": 1022,
       "menu_name": "岗位新增",
       "parent_id": 104,
       "order_num": 2,
@@ -1034,7 +1034,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1023,
+      "id": 1023,
       "menu_name": "岗位修改",
       "parent_id": 104,
       "order_num": 3,
@@ -1056,7 +1056,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1024,
+      "id": 1024,
       "menu_name": "岗位删除",
       "parent_id": 104,
       "order_num": 4,
@@ -1078,7 +1078,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1025,
+      "id": 1025,
       "menu_name": "岗位导出",
       "parent_id": 104,
       "order_num": 5,
@@ -1100,7 +1100,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1026,
+      "id": 1026,
       "menu_name": "字典查询",
       "parent_id": 105,
       "order_num": 1,
@@ -1122,7 +1122,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1027,
+      "id": 1027,
       "menu_name": "字典新增",
       "parent_id": 105,
       "order_num": 2,
@@ -1144,7 +1144,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1028,
+      "id": 1028,
       "menu_name": "字典修改",
       "parent_id": 105,
       "order_num": 3,
@@ -1166,7 +1166,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1029,
+      "id": 1029,
       "menu_name": "字典删除",
       "parent_id": 105,
       "order_num": 4,
@@ -1188,7 +1188,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1030,
+      "id": 1030,
       "menu_name": "字典导出",
       "parent_id": 105,
       "order_num": 5,
@@ -1210,7 +1210,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1031,
+      "id": 1031,
       "menu_name": "参数查询",
       "parent_id": 106,
       "order_num": 1,
@@ -1232,7 +1232,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1032,
+      "id": 1032,
       "menu_name": "参数新增",
       "parent_id": 106,
       "order_num": 2,
@@ -1254,7 +1254,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1033,
+      "id": 1033,
       "menu_name": "参数修改",
       "parent_id": 106,
       "order_num": 3,
@@ -1276,7 +1276,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1034,
+      "id": 1034,
       "menu_name": "参数删除",
       "parent_id": 106,
       "order_num": 4,
@@ -1298,7 +1298,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1035,
+      "id": 1035,
       "menu_name": "参数导出",
       "parent_id": 106,
       "order_num": 5,
@@ -1320,7 +1320,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1036,
+      "id": 1036,
       "menu_name": "公告查询",
       "parent_id": 107,
       "order_num": 1,
@@ -1342,7 +1342,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1037,
+      "id": 1037,
       "menu_name": "公告新增",
       "parent_id": 107,
       "order_num": 2,
@@ -1364,7 +1364,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1038,
+      "id": 1038,
       "menu_name": "公告修改",
       "parent_id": 107,
       "order_num": 3,
@@ -1386,7 +1386,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1039,
+      "id": 1039,
       "menu_name": "公告删除",
       "parent_id": 107,
       "order_num": 4,
@@ -1408,7 +1408,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1040,
+      "id": 1040,
       "menu_name": "操作查询",
       "parent_id": 500,
       "order_num": 1,
@@ -1430,7 +1430,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1041,
+      "id": 1041,
       "menu_name": "操作删除",
       "parent_id": 500,
       "order_num": 2,
@@ -1452,7 +1452,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1042,
+      "id": 1042,
       "menu_name": "日志导出",
       "parent_id": 500,
       "order_num": 4,
@@ -1474,7 +1474,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1043,
+      "id": 1043,
       "menu_name": "登录查询",
       "parent_id": 501,
       "order_num": 1,
@@ -1496,7 +1496,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1044,
+      "id": 1044,
       "menu_name": "登录删除",
       "parent_id": 501,
       "order_num": 2,
@@ -1518,7 +1518,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1045,
+      "id": 1045,
       "menu_name": "日志导出",
       "parent_id": 501,
       "order_num": 3,
@@ -1540,7 +1540,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1046,
+      "id": 1046,
       "menu_name": "在线查询",
       "parent_id": 109,
       "order_num": 1,
@@ -1562,7 +1562,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1047,
+      "id": 1047,
       "menu_name": "批量强退",
       "parent_id": 109,
       "order_num": 2,
@@ -1584,7 +1584,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1048,
+      "id": 1048,
       "menu_name": "单条强退",
       "parent_id": 109,
       "order_num": 3,
@@ -1606,7 +1606,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1050,
+      "id": 1050,
       "menu_name": "账户解锁",
       "parent_id": 501,
       "order_num": 4,
@@ -1628,7 +1628,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1055,
+      "id": 1055,
       "menu_name": "生成查询",
       "parent_id": 115,
       "order_num": 1,
@@ -1650,7 +1650,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1056,
+      "id": 1056,
       "menu_name": "生成修改",
       "parent_id": 115,
       "order_num": 2,
@@ -1672,7 +1672,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1057,
+      "id": 1057,
       "menu_name": "生成删除",
       "parent_id": 115,
       "order_num": 3,
@@ -1694,7 +1694,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1058,
+      "id": 1058,
       "menu_name": "导入代码",
       "parent_id": 115,
       "order_num": 2,
@@ -1716,7 +1716,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1059,
+      "id": 1059,
       "menu_name": "预览代码",
       "parent_id": 115,
       "order_num": 4,
@@ -1738,7 +1738,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1060,
+      "id": 1060,
       "menu_name": "生成代码",
       "parent_id": 115,
       "order_num": 5,
@@ -1760,7 +1760,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1600,
+      "id": 1600,
       "menu_name": "文件查询",
       "parent_id": 118,
       "order_num": 1,
@@ -1782,7 +1782,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1601,
+      "id": 1601,
       "menu_name": "文件上传",
       "parent_id": 118,
       "order_num": 2,
@@ -1804,7 +1804,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1602,
+      "id": 1602,
       "menu_name": "文件下载",
       "parent_id": 118,
       "order_num": 3,
@@ -1826,7 +1826,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1603,
+      "id": 1603,
       "menu_name": "文件删除",
       "parent_id": 118,
       "order_num": 4,
@@ -1848,7 +1848,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1604,
+      "id": 1604,
       "menu_name": "配置添加",
       "parent_id": 118,
       "order_num": 5,
@@ -1870,7 +1870,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1605,
+      "id": 1605,
       "menu_name": "配置编辑",
       "parent_id": 118,
       "order_num": 6,
@@ -1892,7 +1892,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1606,
+      "id": 1606,
       "menu_name": "租户查询",
       "parent_id": 121,
       "order_num": 1,
@@ -1914,7 +1914,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1607,
+      "id": 1607,
       "menu_name": "租户新增",
       "parent_id": 121,
       "order_num": 2,
@@ -1936,7 +1936,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1608,
+      "id": 1608,
       "menu_name": "租户修改",
       "parent_id": 121,
       "order_num": 3,
@@ -1958,7 +1958,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1609,
+      "id": 1609,
       "menu_name": "租户删除",
       "parent_id": 121,
       "order_num": 4,
@@ -1980,7 +1980,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1610,
+      "id": 1610,
       "menu_name": "租户导出",
       "parent_id": 121,
       "order_num": 5,
@@ -2002,7 +2002,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1611,
+      "id": 1611,
       "menu_name": "租户套餐查询",
       "parent_id": 122,
       "order_num": 1,
@@ -2024,7 +2024,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1612,
+      "id": 1612,
       "menu_name": "租户套餐新增",
       "parent_id": 122,
       "order_num": 2,
@@ -2046,7 +2046,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1613,
+      "id": 1613,
       "menu_name": "租户套餐修改",
       "parent_id": 122,
       "order_num": 3,
@@ -2068,7 +2068,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1614,
+      "id": 1614,
       "menu_name": "租户套餐删除",
       "parent_id": 122,
       "order_num": 4,
@@ -2090,7 +2090,7 @@
       "remark": ""
     },
     {
-      "menu_id": 1615,
+      "id": 1615,
       "menu_name": "租户套餐导出",
       "parent_id": 122,
       "order_num": 5,

data/init/sys_notice.json

@@ -1,6 +1,6 @@
  [
     {
-      "notice_id": 1,
+      "id": 1,
       "tenant_id": "000000",
       "notice_title": "温馨提醒：2018-07-01 新版本发布啦",
       "notice_type": "2",
@@ -14,7 +14,7 @@
       "remark": "管理员"
     },
     {
-      "notice_id": 2,
+      "id": 2,
       "tenant_id": "000000",
       "notice_title": "维护通知：2018-07-01 系统凌晨维护",
       "notice_type": "1",

data/init/sys_oper_log.json

@@ -1,6 +1,6 @@
  [
     {
-      "oper_id": 1665641342438514690,
+      "id": 1665641342438514690,
       "tenant_id": "000000",
       "title": "代码生成",
       "business_type": 6,

data/init/sys_oss_config.json

@@ -1,6 +1,6 @@
  [
     {
-      "oss_config_id": 1,
+      "id": 1,
       "tenant_id": "000000",
       "config_key": "minio",
       "access_key": "ruoyi",
@@ -22,7 +22,7 @@
       "remark": null
     },
     {
-      "oss_config_id": 2,
+      "id": 2,
       "tenant_id": "000000",
       "config_key": "qiniu",
       "access_key": "XXXXXXXXXXXXXXX",
@@ -44,7 +44,7 @@
       "remark": null
     },
     {
-      "oss_config_id": 3,
+      "id": 3,
       "tenant_id": "000000",
       "config_key": "aliyun",
       "access_key": "XXXXXXXXXXXXXXX",
@@ -66,7 +66,7 @@
       "remark": null
     },
     {
-      "oss_config_id": 4,
+      "id": 4,
       "tenant_id": "000000",
       "config_key": "qcloud",
       "access_key": "XXXXXXXXXXXXXXX",
@@ -88,7 +88,7 @@
       "remark": null
     },
     {
-      "oss_config_id": 5,
+      "id": 5,
       "tenant_id": "000000",
       "config_key": "image",
       "access_key": "ruoyi",

data/init/sys_post.json

@@ -1,6 +1,6 @@
  [
     {
-      "post_id": 1,
+      "id": 1,
       "tenant_id": "000000",
       "post_code": "ceo",
       "post_name": "董事长",
@@ -14,7 +14,7 @@
       "remark": ""
     },
     {
-      "post_id": 2,
+      "id": 2,
       "tenant_id": "000000",
       "post_code": "se",
       "post_name": "项目经理",
@@ -28,7 +28,7 @@
       "remark": ""
     },
     {
-      "post_id": 3,
+      "id": 3,
       "tenant_id": "000000",
       "post_code": "hr",
       "post_name": "人力资源",
@@ -42,7 +42,7 @@
       "remark": ""
     },
     {
-      "post_id": 4,
+      "id": 4,
       "tenant_id": "000000",
       "post_code": "user",
       "post_name": "普通员工",

data/init/sys_role.json

@@ -1,6 +1,6 @@
  [
     {
-      "role_id": 1,
+      "id": 1,
       "tenant_id": "000000",
       "role_name": "超级管理员",
       "role_key": "superadmin",
@@ -18,7 +18,7 @@
       "remark": "超级管理员"
     },
     {
-      "role_id": 2,
+      "id": 2,
       "tenant_id": "000000",
       "role_name": "普通角色",
       "role_key": "common",

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictData.java

@@ -24,12 +24,14 @@ import javax.persistence.Table;
 @ApiModel(value = "字典数据表")
 public class TbSysDictData extends BaseEntity {
 
+
+
     /**
      * 字典编码
      */
     @Id
     @ApiModelProperty(value = "字典编码")
-    private Long dictCode;
+    private Long id;
 
     /**
      * 租户编号

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictType.java

@@ -32,7 +32,7 @@ public class TbSysDictType extends BaseEntity {
      */
     @Id
     @ApiModelProperty(value = "字典主键")
-    private Long dictId;
+    private Long id;
 
     /**
      * 租户编号

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysMenu.java

@@ -32,7 +32,7 @@ public class TbSysMenu extends BaseEntity {
     @GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
     @Column(name = "menu_id")
     @ApiModelProperty(value = "菜单ID")
-    private Long menuId;
+    private Long id;
 
     /**
      * 父菜单ID

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysNotice.java

@@ -31,7 +31,7 @@ public class TbSysNotice extends BaseEntity {
      */
     @Id
     @ApiModelProperty(value = "公告ID")
-    private Long noticeId;
+    private Long id;
 
     /**
      * 租户编号

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java

@@ -30,7 +30,7 @@ public class TbSysOss extends BaseEntity {
      */
     @Id
     @ApiModelProperty(value = "对象存储主键")
-    private Long ossId;
+    private Long id;
 
     /**
      * 租户编号

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOssConfig.java

@@ -30,7 +30,7 @@ public class TbSysOssConfig extends BaseEntity {
      */
     @Id
     @ApiModelProperty(value = "主建")
-    private Long ossConfigId;
+    private Long id;
 
     /**
      * 租户编号

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java

@@ -29,7 +29,7 @@ public class TbSysTenantPackage extends BaseEntity {
      */
     @Id
     @ApiModelProperty(value = "租户套餐id")
-    private Long packageId;
+    private Long id;
     /**
      * 套餐名称
      */

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysMenuDataImpl.java

@@ -115,12 +115,12 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
                     .where(predicateBuilder.build())
                     .orderBy(tbSysMenu.parentId.asc(), tbSysMenu.orderNum.asc()).fetch();
         } else {
-            tbSysMenuList = jpaQueryFactory.select(Projections.bean(TbSysMenu.class, tbSysMenu.menuId.countDistinct().as(tbSysMenu.menuId),
+            tbSysMenuList = jpaQueryFactory.select(Projections.bean(TbSysMenu.class, tbSysMenu.id.countDistinct().as(tbSysMenu.id),
                             tbSysMenu.parentId, tbSysMenu.menuName, tbSysMenu.path, tbSysMenu.component, tbSysMenu.queryParam,
                             tbSysMenu.visible, tbSysMenu.status, tbSysMenu.perms, tbSysMenu.isFrame, tbSysMenu.isCache, tbSysMenu.menuType,
                             tbSysMenu.icon, tbSysMenu.orderNum, tbSysMenu.createTime))
                     .from(tbSysMenu)
-                    .leftJoin(tbSysRoleMenu).on(tbSysMenu.menuId.eq(tbSysRoleMenu.menuId))
+                    .leftJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
                     .leftJoin(tbSysUserRole).on(tbSysRoleMenu.roleId.eq(tbSysUserRole.roleId))
                     .leftJoin(tbSysRole).on(tbSysUserRole.roleId.eq(tbSysRole.id))
                     .where(predicateBuilder
@@ -137,7 +137,7 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
     public List<String> selectMenuPermsByUserId(Long userId) {
         return jpaQueryFactory.select(Projections.bean(String.class, tbSysMenu.perms.countDistinct()))
                 .from(tbSysMenu)
-                .leftJoin(tbSysRoleMenu).on(tbSysMenu.menuId.eq(tbSysRoleMenu.menuId))
+                .leftJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
                 .leftJoin(tbSysUserRole).on(tbSysRoleMenu.roleId.eq(tbSysUserRole.roleId))
                 .leftJoin(tbSysRole).on(tbSysUserRole.roleId.eq(tbSysRole.id))
                 .where(PredicateBuilder.instance()
@@ -151,7 +151,7 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
     public List<String> selectMenuPermsByRoleId(Long roleId) {
         return jpaQueryFactory.select(Projections.bean(String.class, tbSysMenu.perms.countDistinct()))
                 .from(tbSysMenu)
-                .leftJoin(tbSysRoleMenu).on(tbSysMenu.menuId.eq(tbSysRoleMenu.menuId))
+                .leftJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
                 .where(PredicateBuilder.instance()
                         .and(tbSysMenu.status.eq("0"))
                         .and(tbSysRoleMenu.roleId.eq(roleId))
@@ -171,12 +171,12 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
 
     @Override
     public List<SysMenu> selectMenuTreeByUserId(Long userId) {
-        return jpaQueryFactory.select(Projections.bean(SysMenu.class, tbSysMenu.menuId.countDistinct().as(tbSysMenu.menuId),
+        return jpaQueryFactory.select(Projections.bean(SysMenu.class, tbSysMenu.id.countDistinct().as(tbSysMenu.id),
                         tbSysMenu.parentId, tbSysMenu.menuName, tbSysMenu.path, tbSysMenu.component, tbSysMenu.queryParam,
                         tbSysMenu.visible, tbSysMenu.status, tbSysMenu.perms, tbSysMenu.isFrame, tbSysMenu.isCache, tbSysMenu.menuType,
                         tbSysMenu.icon, tbSysMenu.orderNum, tbSysMenu.createTime))
                 .from(tbSysMenu)
-                .leftJoin(tbSysRoleMenu).on(tbSysMenu.menuId.eq(tbSysRoleMenu.menuId))
+                .leftJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
                 .leftJoin(tbSysUserRole).on(tbSysRoleMenu.roleId.eq(tbSysUserRole.roleId))
                 .leftJoin(tbSysRole).on(tbSysUserRole.roleId.eq(tbSysRole.id))
                 .leftJoin(tbSysUser).on(tbSysUserRole.userId.eq(tbSysUser.id))
@@ -203,7 +203,7 @@ public class SysMenuDataImpl implements ISysMenuData, IJPACommData<SysMenu, Long
                         PredicateBuilder.instance()
                                 .and(QTbSysMenu.tbSysMenu.menuName.eq(menu.getMenuName()))
                                 .and(QTbSysMenu.tbSysMenu.parentId.eq(menu.getParentId()))
-                                .and(ObjectUtil.isNotNull(menu.getId()), () -> QTbSysMenu.tbSysMenu.menuId.ne(menu.getId()))
+                                .and(ObjectUtil.isNotNull(menu.getId()), () -> QTbSysMenu.tbSysMenu.id.ne(menu.getId()))
                                 .build()).fetchOne();
         return Objects.isNull(tbSysMenu);
     }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysRoleDataImpl.java

@@ -67,9 +67,9 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
     @Override
     public List<Long> selectMenuListByRoleId(Long roleId, boolean menuCheckStrictly) {
 
-        List<Long> roleIds = jpaQueryFactory.select(Projections.bean(Long.class, tbSysMenu.menuId))
+        List<Long> roleIds = jpaQueryFactory.select(Projections.bean(Long.class, tbSysMenu.id))
                 .from(tbSysMenu)
-                .innerJoin(tbSysRoleMenu).on(tbSysMenu.menuId.eq(tbSysRoleMenu.menuId))
+                .innerJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
                 .where(PredicateBuilder.instance()
                         .and(tbSysRoleMenu.roleId.eq(roleId))
                         .build())
@@ -79,12 +79,12 @@ public class SysRoleDataImpl implements ISysRoleData, IJPACommData<SysRole, Long
                 .and(tbSysRoleMenu.roleId.eq(roleId));
 
         if (menuCheckStrictly) {
-            predicateBuilder.and(tbSysMenu.menuId.notIn(roleIds));
+            predicateBuilder.and(tbSysMenu.id.notIn(roleIds));
         }
 
-        return jpaQueryFactory.select(Projections.bean(Long.class, tbSysMenu.menuId))
+        return jpaQueryFactory.select(Projections.bean(Long.class, tbSysMenu.id))
                 .from(tbSysMenu)
-                .leftJoin(tbSysRoleMenu).on(tbSysMenu.menuId.eq(tbSysRoleMenu.menuId))
+                .leftJoin(tbSysRoleMenu).on(tbSysMenu.id.eq(tbSysRoleMenu.menuId))
                 .where(predicateBuilder.build())
                 .orderBy(tbSysMenu.parentId.asc(), tbSysMenu.orderNum.asc()).fetch();
     }