!3 清理冗余代码

Merge pull request !3 from blue/v_3.0.0

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, '');

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 {

im-admin-ui/src/views/im/user/index.vue

@@ -41,11 +41,6 @@
             <dict-tag :options="im_bool" :value="scope.row.isBanned" />
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="im_user_status" :value="scope.row.status" />
-          </template>
-        </el-table-column>
         <el-table-column label="注册时间" align="center" prop="createdTime" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
@@ -103,9 +98,6 @@
         <el-form-item v-if="form.isBanned" label="被封禁原因" prop="reason">
           <el-input v-model="form.reason" placeholder="请输入被封禁原因" />
         </el-form-item>
-        <el-form-item label="客户端id" prop="cid">
-          <el-input v-model="form.cid" placeholder="请输入客户端id,用于uni-push推送" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -150,9 +142,7 @@ const initFormData: UserForm = {
   createdTime: undefined,
   type: undefined,
   isBanned: undefined,
-  reason: undefined,
+  reason: undefined
-  cid: undefined,
-  status: undefined
 }
 const data = reactive<PageData<UserForm, UserQuery>>({
   form: { ...initFormData },
@@ -169,7 +159,6 @@ const data = reactive<PageData<UserForm, UserQuery>>({
 const { queryParams, form, rules } = toRefs(data);
 
 const { im_bool } = toRefs<any>(proxy?.useDict('im_bool'));
-const { im_user_status } = toRefs<any>(proxy?.useDict('im_user_status'));
 const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
 
 /** 查询用户列表 */

im-admin/ruoyi-admin/src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@ spring:
       datasource:
         admin:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/im_admin2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://localhost:3306/im_admin?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
           username: root
           password: root
         platform:

im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroup.java

@@ -49,10 +49,6 @@ public class ImGroup implements TransPojo {
      */
     private String notice;
 
-    /**
-     * 群备注
-     */
-    private String remark;
 
     /**
      * 是否已解散

im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUser.java

@@ -83,15 +83,6 @@ public class ImUser implements TransPojo {
      */
     private String reason;
 
-    /**
-     * 客户端id,用于uni-push推送
-     */
-    private String cid;
-
-    /**
-     * 状态 0：正常   1:已注销
-     */
-    private Long status;
 
 
 }

im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java

@@ -81,14 +81,4 @@ public class ImUserBo {
      */
     private String reason;
 
-    /**
-     * 客户端id,用于uni-push推送
-     */
-    private String cid;
-
-    /**
-     * 状态 0：正常   1:已注销
-     */
-    private Long status;
-
 }

im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java

@@ -101,18 +101,5 @@ public class ImUserVo {
     @ExcelProperty(value = "被封禁原因")
     private String reason;
 
-    /**
-     * 客户端id,用于uni-push推送
-     */
-    @ExcelProperty(value = "客户端id")
-    private String cid;
-
-    /**
-     * 状态 0：正常   1:已注销
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=正常,1=已注销")
-    private Long status;
-
 
 }