From 46a733ff42d66b0921de61fbb5a4321b001c0070 Mon Sep 17 00:00:00 2001 From: Liu Rui Date: Wed, 13 Nov 2024 00:20:43 +0800 Subject: [PATCH] =?UTF-8?q?chore-=E5=A2=9E=E5=8A=A0=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/ModuleActionController.java | 12 ++++++------ .../muyun/platform/controller/ModuleController.java | 6 +++--- .../muyun/platform/controller/NoticeController.java | 2 +- .../platform/controller/RoleActionController.java | 12 +++++------- .../platform/controller/UserRoleController.java | 4 ++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleActionController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleActionController.java index 2657207b..2341ebcf 100644 --- a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleActionController.java +++ b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleActionController.java @@ -32,12 +32,12 @@ public String getMainTable() { public void fitOut(TableWrapper wrapper) { wrapper .setPrimaryKey(Column.ID_POSTGRES) - .addColumn("id_at_app_module") - .addColumn("v_name") - .addColumn("v_alias") - .addColumn("v_remark") - .addColumn(Column.of("b_white").setDefaultValue(false)) - .addColumn("i_order") + .addColumn("id_at_app_module", "模块id") + .addColumn("v_name", "功能名称") + .addColumn("v_alias", "功能标识") + .addColumn("v_remark", "备注") + .addColumn("b_white", "是否白名单", false) + .addColumn("i_order", "序号") .addIndex(List.of("id_at_app_module", "v_alias"), true); } diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java index 2d3c7667..14567db7 100644 --- a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java +++ b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java @@ -60,11 +60,11 @@ public void fitOut(TableWrapper wrapper) { wrapper .setPrimaryKey(Column.ID_POSTGRES) .setInherit(BaseBusinessTable.TABLE) - .addColumn("v_name") + .addColumn("v_name", "模块名称") .addColumn("v_alias", "模块标识，同后端Controller拦截入口名") .addColumn("v_url", "前端路径") - .addColumn("v_remark") - .addColumn("v_table") + .addColumn("v_remark", "备注") + .addColumn("v_table", "模块主表") .addColumn(Column.of("b_system").setDefaultValue(false)) .addColumn(Column.of("b_isolation").setComment("是否启用数据隔离").setDefaultValue(false)) .addIndex("v_alias"); diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/NoticeController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/NoticeController.java index 04e784ab..e665de01 100644 --- a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/NoticeController.java +++ b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/NoticeController.java @@ -144,7 +144,7 @@ private void broadcast(String id) { MuYunMessage message = new MuYunMessage( "收到新通知啦", - "%s 刚刚发布了《%s》的通知".formatted(map.get("v_name_from"), map.get("v_title")), + "%s 刚刚发布了题为「%s」的通知".formatted(map.get("v_name_from"), map.get("v_title")), "" ); diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RoleActionController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RoleActionController.java index a35e2714..f59fccd3 100644 --- a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RoleActionController.java +++ b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RoleActionController.java @@ -4,7 +4,6 @@ import jakarta.inject.Inject; import net.ximatai.muyun.ability.IChildAbility; import net.ximatai.muyun.ability.curd.std.IQueryAbility; -import net.ximatai.muyun.base.BaseBusinessTable; import net.ximatai.muyun.database.builder.Column; import net.ximatai.muyun.database.builder.TableWrapper; import net.ximatai.muyun.model.QueryItem; @@ -38,14 +37,13 @@ public String getMainTable() { public void fitOut(TableWrapper wrapper) { wrapper .setPrimaryKey(Column.ID_POSTGRES) - .setInherit(BaseBusinessTable.TABLE) - .addColumn("id_at_auth_role") - .addColumn("id_at_app_module") + .addColumn("id_at_auth_role", "角色id") + .addColumn("id_at_app_module", "模块id") .addColumn("v_alias_at_app_module", "冗余：模块别名") - .addColumn("id_at_app_module_action") + .addColumn("id_at_app_module_action", "模块id") .addColumn("v_alias_at_app_module_action", "冗余：功能别名") - .addColumn("dict_data_auth") - .addColumn("v_custom_condition") + .addColumn("dict_data_auth", "数据权限字典") + .addColumn("v_custom_condition", "自定义权限条件") .addIndex("id_at_auth_role") .addIndex("id_at_app_module_action") .addIndex(List.of("id_at_auth_role", "id_at_app_module_action"), true) diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/UserRoleController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/UserRoleController.java index bf4dcd49..e401a1fb 100644 --- a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/UserRoleController.java +++ b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/UserRoleController.java @@ -24,8 +24,8 @@ public String getMainTable() { public void fitOut(TableWrapper wrapper) { wrapper .setPrimaryKey(Column.ID_POSTGRES) - .addColumn(Column.of("id_at_auth_user").setNullable(false)) - .addColumn(Column.of("id_at_auth_role").setNullable(false)) + .addColumn(Column.of("id_at_auth_user").setNullable(false).setComment("用户id")) + .addColumn(Column.of("id_at_auth_role").setNullable(false).setComment("角色id")) .addIndex(List.of("id_at_auth_user", "id_at_auth_role"), true); }