From f8a6005faff977b7e1b31c62c6085930a7f71779 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Wed, 15 Jan 2025 00:09:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=86=97=E4=BD=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/im-admin.sql | 3 --- im-admin-ui/src/api/im/user/types.ts | 23 ++----------------- im-admin-ui/src/views/im/user/index.vue | 13 +---------- .../src/main/resources/application-dev.yml | 2 +- .../java/org/dromara/im/domain/ImGroup.java | 4 ---- .../java/org/dromara/im/domain/ImUser.java | 9 -------- .../org/dromara/im/domain/bo/ImUserBo.java | 10 -------- .../org/dromara/im/domain/vo/ImUserVo.java | 13 ----------- 8 files changed, 4 insertions(+), 73 deletions(-) diff --git a/db/im-admin.sql b/db/im-admin.sql index 5e1bfdf..58f012d 100644 --- a/db/im-admin.sql +++ b/db/im-admin.sql @@ -469,7 +469,6 @@ insert into sys_dict_type values(10, '000000', '系统状态', 'sys_common_statu insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); insert into sys_dict_type values(13, '000000', '布尔值', 'im_bool', 103, 1, sysdate(), null, null, '布尔值, true 或 false'); -insert into sys_dict_type values(14, '000000', '用户状态', 'im_user_status', 103, 1, sysdate(), null, null, 'IM用户状态'); insert into sys_dict_type values(15, '000000', '消息状态', 'im_message_status', 103, 1, sysdate(), null, null, 'IM消息状态'); insert into sys_dict_type values(16, '000000', '消息类型', 'im_message_type', 103, 1, sysdate(), null, null, 'IM消息类型'); @@ -533,8 +532,6 @@ insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_d insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); insert into sys_dict_data values(39, '000000', 0, '否', 'false', 'im_bool', '', 'danger', 'N', 103, 1, sysdate(), null, null, ''); insert into sys_dict_data values(40, '000000', 0, '是', 'true', 'im_bool', '', 'primary', 'N', 103, 1, sysdate(), null, null, ''); -insert into sys_dict_data values(41, '000000', 0, '正常', '0', 'im_user_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, ''); -insert into sys_dict_data values(42, '000000', 0, '已注销', '1', 'im_user_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, ''); insert into sys_dict_data values(43, '000000', 1, '未发送', '0', 'im_message_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, ''); insert into sys_dict_data values(44, '000000', 2, '送达', '1', 'im_message_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, ''); insert into sys_dict_data values(45, '000000', 3, '撤回', '2', 'im_message_status', '', 'warning', 'N', 103, 1, sysdate(), null, null, ''); diff --git a/im-admin-ui/src/api/im/user/types.ts b/im-admin-ui/src/api/im/user/types.ts index f2f535e..f41236a 100644 --- a/im-admin-ui/src/api/im/user/types.ts +++ b/im-admin-ui/src/api/im/user/types.ts @@ -54,7 +54,7 @@ export interface UserVO { createdTime: string; /** - * + * */ type: number; @@ -68,15 +68,6 @@ export interface UserVO { */ reason: string; - /** - * 客户端id,用于uni-push推送 - */ - cid: string | number; - - /** - * 状态 0：正常 1:已注销 - */ - status: number; } @@ -132,7 +123,7 @@ export interface UserForm extends BaseEntity { createdTime?: string; /** - * + * */ type?: number; @@ -146,16 +137,6 @@ export interface UserForm extends BaseEntity { */ reason?: string; - /** - * 客户端id,用于uni-push推送 - */ - cid?: string | number; - - /** - * 状态 0：正常 1:已注销 - */ - status?: number; - } export interface UserQuery extends PageQuery { diff --git a/im-admin-ui/src/views/im/user/index.vue b/im-admin-ui/src/views/im/user/index.vue index a4e4423..ae00420 100644 --- a/im-admin-ui/src/views/im/user/index.vue +++ b/im-admin-ui/src/views/im/user/index.vue @@ -41,11 +41,6 @@ - - -