From 7d3a1a5230ea125d0a94163cf9f223ca1d7ed582 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sun, 22 Dec 2024 14:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/im-admin.sql | 46 +++--- im-admin-ui/.env.development | 2 +- im-admin-ui/.env.production | 2 +- im-admin-ui/index.html | 2 +- im-admin-ui/package.json | 2 +- .../src/views/tool/gen/importTable.vue | 2 +- im-admin/pom.xml | 7 +- im-admin/ruoyi-admin/pom.xml | 5 +- .../src/main/resources/application-dev.yml | 20 +-- .../src/main/resources/application.yml | 3 +- im-admin/ruoyi-im/pom.xml | 27 ++++ .../org/dromara/im/constant/ImConstant.java | 14 ++ .../org/dromara/im/constant/ImRedisKey.java | 27 ++++ .../im/controller/ImGroupController.java | 105 +++++++++++++ .../controller/ImGroupMemberController.java | 105 +++++++++++++ .../controller/ImGroupMessageController.java | 105 +++++++++++++ .../ImPrivateMessageController.java | 105 +++++++++++++ .../controller/ImSensitiveWordController.java | 105 +++++++++++++ .../im/controller/ImSmPushTaskController.java | 105 +++++++++++++ .../controller/ImSystemMessageController.java | 105 +++++++++++++ .../im/controller/ImUserController.java | 89 +++++++++++ .../java/org/dromara/im/domain/ImGroup.java | 84 +++++++++++ .../org/dromara/im/domain/ImGroupMember.java | 79 ++++++++++ .../org/dromara/im/domain/ImGroupMessage.java | 87 +++++++++++ .../dromara/im/domain/ImPrivateMessage.java | 62 ++++++++ .../dromara/im/domain/ImSensitiveWord.java | 45 ++++++ .../org/dromara/im/domain/ImSmPushTask.java | 83 ++++++++++ .../dromara/im/domain/ImSystemMessage.java | 82 ++++++++++ .../java/org/dromara/im/domain/ImUser.java | 104 +++++++++++++ .../org/dromara/im/domain/bo/ImGroupBo.java | 94 ++++++++++++ .../dromara/im/domain/bo/ImGroupMemberBo.java | 88 +++++++++++ .../im/domain/bo/ImGroupMessageBo.java | 98 ++++++++++++ .../im/domain/bo/ImPrivateMessageBo.java | 68 +++++++++ .../im/domain/bo/ImSensitiveWordBo.java | 48 ++++++ .../dromara/im/domain/bo/ImSmPushTaskBo.java | 86 +++++++++++ .../im/domain/bo/ImSystemMessageBo.java | 84 +++++++++++ .../org/dromara/im/domain/bo/ImUserBo.java | 102 +++++++++++++ .../dromara/im/domain/dto/ImUserBanDTO.java | 24 +++ .../dromara/im/domain/dto/ImUserUnbanDTO.java | 20 +++ .../dromara/im/domain/vo/ImGroupMemberVo.java | 96 ++++++++++++ .../im/domain/vo/ImGroupMessageVo.java | 106 +++++++++++++ .../org/dromara/im/domain/vo/ImGroupVo.java | 103 +++++++++++++ .../im/domain/vo/ImPrivateMessageVo.java | 76 ++++++++++ .../im/domain/vo/ImSensitiveWordVo.java | 56 +++++++ .../dromara/im/domain/vo/ImSmPushTaskVo.java | 94 ++++++++++++ .../im/domain/vo/ImSystemMessageVo.java | 92 ++++++++++++ .../org/dromara/im/domain/vo/ImUserVo.java | 126 ++++++++++++++++ .../org/dromara/im/mapper/ImGroupMapper.java | 15 ++ .../im/mapper/ImGroupMemberMapper.java | 15 ++ .../im/mapper/ImGroupMessageMapper.java | 15 ++ .../im/mapper/ImPrivateMessageMapper.java | 15 ++ .../im/mapper/ImSensitiveWordMapper.java | 15 ++ .../dromara/im/mapper/ImSmPushTaskMapper.java | 15 ++ .../im/mapper/ImSystemMessageMapper.java | 15 ++ .../org/dromara/im/mapper/ImUserMapper.java | 15 ++ .../org/dromara/im/mq/ImRedisMQConfig.java | 31 ++++ .../org/dromara/im/mq/ImRedisMQTemplate.java | 12 ++ .../im/service/IImGroupMemberService.java | 68 +++++++++ .../im/service/IImGroupMessageService.java | 68 +++++++++ .../dromara/im/service/IImGroupService.java | 68 +++++++++ .../im/service/IImPrivateMessageService.java | 68 +++++++++ .../im/service/IImSensitiveWordService.java | 68 +++++++++ .../im/service/IImSmPushTaskService.java | 68 +++++++++ .../im/service/IImSystemMessageService.java | 68 +++++++++ .../dromara/im/service/IImUserService.java | 60 ++++++++ .../impl/ImGroupMemberServiceImpl.java | 140 +++++++++++++++++ .../impl/ImGroupMessageServiceImpl.java | 142 ++++++++++++++++++ .../im/service/impl/ImGroupServiceImpl.java | 140 +++++++++++++++++ .../impl/ImPrivateMessageServiceImpl.java | 137 +++++++++++++++++ .../impl/ImSensitiveWordServiceImpl.java | 134 +++++++++++++++++ .../service/impl/ImSmPushTaskServiceImpl.java | 140 +++++++++++++++++ .../impl/ImSystemMessageServiceImpl.java | 140 +++++++++++++++++ .../im/service/impl/ImUserServiceImpl.java | 109 ++++++++++++++ .../src/main/resources/generator.yml | 6 +- .../service/impl/SysConfigServiceImpl.java | 1 - 75 files changed, 4810 insertions(+), 48 deletions(-) create mode 100644 im-admin/ruoyi-im/pom.xml create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/constant/ImConstant.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/constant/ImRedisKey.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupMemberController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupMessageController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPrivateMessageController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImSensitiveWordController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImSmPushTaskController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImSystemMessageController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroup.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroupMember.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroupMessage.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImPrivateMessage.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImSensitiveWord.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImSmPushTask.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImSystemMessage.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUser.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMemberBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMessageBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPrivateMessageBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImSensitiveWordBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImSmPushTaskBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImSystemMessageBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/dto/ImUserBanDTO.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/dto/ImUserUnbanDTO.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupMemberVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupMessageVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImPrivateMessageVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImSensitiveWordVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImSmPushTaskVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImSystemMessageVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImGroupMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImGroupMemberMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImGroupMessageMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImPrivateMessageMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImSensitiveWordMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImSmPushTaskMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImSystemMessageMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mq/ImRedisMQConfig.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mq/ImRedisMQTemplate.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMemberService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMessageService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPrivateMessageService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImSensitiveWordService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImSmPushTaskService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImSystemMessageService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMemberServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMessageServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPrivateMessageServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSensitiveWordServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSmPushTaskServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSystemMessageServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java diff --git a/db/im-admin.sql b/db/im-admin.sql index f12bf90..434e078 100644 --- a/db/im-admin.sql +++ b/db/im-admin.sql @@ -3,7 +3,7 @@ -- ---------------------------- create table sys_social ( - id bigint not null comment '主键', + id bigint not null auto_increment comment '主键', user_id bigint not null comment '用户ID', tenant_id varchar(20) default null comment '租户id', auth_id varchar(255) not null comment '平台+平台唯一id', @@ -41,7 +41,7 @@ create table sys_social -- ---------------------------- create table sys_tenant ( - id bigint(20) not null comment 'id', + id bigint(20) not null auto_increment comment 'id', tenant_id varchar(20) not null comment '租户编号', contact_user_name varchar(20) comment '联系人', contact_phone varchar(20) comment '联系电话', @@ -69,7 +69,7 @@ create table sys_tenant -- 租户套餐表 -- ---------------------------- create table sys_tenant_package ( - package_id bigint(20) not null comment '租户套餐id', + package_id bigint(20) not null auto_increment comment '租户套餐id', package_name varchar(20) comment '套餐名称', menu_ids varchar(3000) comment '关联菜单id', remark varchar(200) comment '备注', @@ -89,7 +89,7 @@ create table sys_tenant_package ( -- 1、部门表 -- ---------------------------- create table sys_dept ( - dept_id bigint(20) not null comment '部门id', + dept_id bigint(20) not null auto_increment comment '部门id', tenant_id varchar(20) default '000000' comment '租户编号', parent_id bigint(20) default 0 comment '父部门id', ancestors varchar(500) default '' comment '祖级列表', @@ -121,7 +121,7 @@ insert into sys_dept values(100, '000000', 0, '0', '盒子科技', null,0 -- 2、用户信息表 -- ---------------------------- create table sys_user ( - user_id bigint(20) not null comment '用户ID', + user_id bigint(20) not null auto_increment comment '用户ID', tenant_id varchar(20) default '000000' comment '租户编号', dept_id bigint(20) default null comment '部门ID', user_name varchar(30) not null comment '用户账号', @@ -155,7 +155,7 @@ insert into sys_user values(1, '000000', 100, 'admin', 'admin', 'sys_user', 'xxx -- ---------------------------- create table sys_post ( - post_id bigint(20) not null comment '岗位ID', + post_id bigint(20) not null auto_increment comment '岗位ID', tenant_id varchar(20) default '000000' comment '租户编号', dept_id bigint(20) not null comment '部门id', post_code varchar(64) not null comment '岗位编码', @@ -178,7 +178,7 @@ create table sys_post -- 4、角色信息表 -- ---------------------------- create table sys_role ( - role_id bigint(20) not null comment '角色ID', + role_id bigint(20) not null auto_increment comment '角色ID', tenant_id varchar(20) default '000000' comment '租户编号', role_name varchar(30) not null comment '角色名称', role_key varchar(100) not null comment '角色权限字符串', @@ -206,7 +206,7 @@ insert into sys_role values(1, '000000', '超级管理员', 'superadmin', 1, 1 -- 5、菜单权限表 -- ---------------------------- create table sys_menu ( - menu_id bigint(20) not null comment '菜单ID', + menu_id bigint(20) not null auto_increment comment '菜单ID', menu_name varchar(50) not null comment '菜单名称', parent_id bigint(20) default 0 comment '父菜单ID', order_num int(4) default 0 comment '显示顺序', @@ -349,7 +349,7 @@ insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', ' -- 6、用户和角色关联表 用户N-1角色 -- ---------------------------- create table sys_user_role ( - user_id bigint(20) not null comment '用户ID', + user_id bigint(20) not null auto_increment comment '用户ID', role_id bigint(20) not null comment '角色ID', primary key(user_id, role_id) ) engine=innodb comment = '用户和角色关联表'; @@ -363,7 +363,7 @@ insert into sys_user_role values ('1', '1'); -- 7、角色和菜单关联表 角色1-N菜单 -- ---------------------------- create table sys_role_menu ( - role_id bigint(20) not null comment '角色ID', + role_id bigint(20) not null auto_increment comment '角色ID', menu_id bigint(20) not null comment '菜单ID', primary key(role_id, menu_id) ) engine=innodb comment = '角色和菜单关联表'; @@ -372,7 +372,7 @@ create table sys_role_menu ( -- 8、角色和部门关联表 角色1-N部门 -- ---------------------------- create table sys_role_dept ( - role_id bigint(20) not null comment '角色ID', + role_id bigint(20) not null auto_increment comment '角色ID', dept_id bigint(20) not null comment '部门ID', primary key(role_id, dept_id) ) engine=innodb comment = '角色和部门关联表'; @@ -382,7 +382,7 @@ create table sys_role_dept ( -- ---------------------------- create table sys_user_post ( - user_id bigint(20) not null comment '用户ID', + user_id bigint(20) not null auto_increment comment '用户ID', post_id bigint(20) not null comment '岗位ID', primary key (user_id, post_id) ) engine=innodb comment = '用户与岗位关联表'; @@ -396,7 +396,7 @@ insert into sys_user_post values ('1', '1'); -- 10、操作日志记录 -- ---------------------------- create table sys_oper_log ( - oper_id bigint(20) not null comment '日志主键', + oper_id bigint(20) not null auto_increment comment '日志主键', tenant_id varchar(20) default '000000' comment '租户编号', title varchar(50) default '' comment '模块标题', business_type int(2) default 0 comment '业务类型(0其它 1新增 2修改 3删除)', @@ -426,7 +426,7 @@ create table sys_oper_log ( -- ---------------------------- create table sys_dict_type ( - dict_id bigint(20) not null comment '字典主键', + dict_id bigint(20) not null auto_increment comment '字典主键', tenant_id varchar(20) default '000000' comment '租户编号', dict_name varchar(100) default '' comment '字典名称', dict_type varchar(100) default '' comment '字典类型', @@ -457,7 +457,7 @@ insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type' -- ---------------------------- create table sys_dict_data ( - dict_code bigint(20) not null comment '字典编码', + dict_code bigint(20) not null auto_increment comment '字典编码', tenant_id varchar(20) default '000000' comment '租户编号', dict_sort int(4) default 0 comment '字典排序', dict_label varchar(100) default '' comment '字典标签', @@ -515,7 +515,7 @@ insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sy -- 13、参数配置表 -- ---------------------------- create table sys_config ( - config_id bigint(20) not null comment '参数主键', + config_id bigint(20) not null auto_increment comment '参数主键', tenant_id varchar(20) default '000000' comment '租户编号', config_name varchar(100) default '' comment '参数名称', config_key varchar(100) default '' comment '参数键名', @@ -541,7 +541,7 @@ insert into sys_config values(11, '000000', 'OSS预览列表资源开关', -- 14、系统访问记录 -- ---------------------------- create table sys_logininfor ( - info_id bigint(20) not null comment '访问ID', + info_id bigint(20) not null auto_increment comment '访问ID', tenant_id varchar(20) default '000000' comment '租户编号', user_name varchar(50) default '' comment '用户账号', client_key varchar(32) default '' comment '客户端', @@ -563,7 +563,7 @@ create table sys_logininfor ( -- 17、通知公告表 -- ---------------------------- create table sys_notice ( - notice_id bigint(20) not null comment '公告ID', + notice_id bigint(20) not null auto_increment comment '公告ID', tenant_id varchar(20) default '000000' comment '租户编号', notice_title varchar(50) not null comment '公告标题', notice_type char(1) not null comment '公告类型(1通知 2公告)', @@ -583,7 +583,7 @@ create table sys_notice ( -- 18、代码生成业务表 -- ---------------------------- create table gen_table ( - table_id bigint(20) not null comment '编号', + table_id bigint(20) not null auto_increment comment '编号', data_name varchar(200) default '' comment '数据源名称', table_name varchar(200) default '' comment '表名称', table_comment varchar(500) default '' comment '表描述', @@ -613,7 +613,7 @@ create table gen_table ( -- 19、代码生成业务表字段 -- ---------------------------- create table gen_table_column ( - column_id bigint(20) not null comment '编号', + column_id bigint(20) not null auto_increment comment '编号', table_id bigint(20) comment '归属表编号', column_name varchar(200) comment '列名称', column_comment varchar(500) comment '列描述', @@ -643,7 +643,7 @@ create table gen_table_column ( -- OSS对象存储表 -- ---------------------------- create table sys_oss ( - oss_id bigint(20) not null comment '对象存储主键', + oss_id bigint(20) not null auto_increment comment '对象存储主键', tenant_id varchar(20) default '000000' comment '租户编号', file_name varchar(255) not null default '' comment '文件名', original_name varchar(255) not null default '' comment '原名', @@ -662,7 +662,7 @@ create table sys_oss ( -- OSS对象存储动态配置表 -- ---------------------------- create table sys_oss_config ( - oss_config_id bigint(20) not null comment '主键', + oss_config_id bigint(20) not null auto_increment comment '主键', tenant_id varchar(20) default '000000'comment '租户编号', config_key varchar(20) not null default '' comment '配置key', access_key varchar(255) default '' comment 'accessKey', @@ -691,7 +691,7 @@ insert into sys_oss_config values (1, '000000', 'minio', 'ruoyi', 'r -- 系统授权表 -- ---------------------------- create table sys_client ( - id bigint(20) not null comment 'id', + id bigint(20) not null auto_increment comment 'id', client_id varchar(64) default null comment '客户端id', client_key varchar(32) default null comment '客户端key', client_secret varchar(255) default null comment '客户端秘钥', diff --git a/im-admin-ui/.env.development b/im-admin-ui/.env.development index 773ed86..6755992 100644 --- a/im-admin-ui/.env.development +++ b/im-admin-ui/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 盒子IM后台管理系统 +VITE_APP_TITLE = 盒子IM后台管理 # 开发环境配置 VITE_APP_ENV = 'development' diff --git a/im-admin-ui/.env.production b/im-admin-ui/.env.production index bfcb2c7..0e6e762 100644 --- a/im-admin-ui/.env.production +++ b/im-admin-ui/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 盒子IM后台管理系统 +VITE_APP_TITLE = 盒子IM后台管理 # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/im-admin-ui/index.html b/im-admin-ui/index.html index aa1c86d..9ce0dc6 100644 --- a/im-admin-ui/index.html +++ b/im-admin-ui/index.html @@ -6,7 +6,7 @@ - RuoYi-Vue-Plus多租户管理系统 + 盒子IM后台管理