pro/im_manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add short IM user numbers

Browse Source
This commit is contained in:
richjohnrambo
2026-09-10 21:51:23 +08:00
parent 047df08f84
commit 26e511113b
9 changed files with 126 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin-adfahi-research/sql/IM-Server改造.sql
+47
View File
@@ -8,6 +8,53 @@
SET NAMES utf8mb4;
USE `tinode`;
-- ============================================================
-- 0. User account number.
-- account_no is the short user number shown in Admin. The real primary key
-- im_users.id remains the internal Tinode/Snowflake user ID.
-- Existing users are backfilled from 1000 by created time; new users are
-- assigned by IM Server in the user creation transaction.
-- ============================================================
SET @sql := IF(
(SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'im_users' AND COLUMN_NAME = 'account_no') = 0,
'ALTER TABLE `im_users` ADD COLUMN `account_no` int unsigned NOT NULL DEFAULT 0 COMMENT ''用户编号'' AFTER `id`',
'SELECT 1'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
SET @im_user_account_no := (
SELECT GREATEST(COALESCE(MAX(`account_no`), 999), 999)
FROM `im_users`
WHERE `account_no` > 0
);
UPDATE `im_users` AS u
JOIN (
SELECT ordered.`id`, (@im_user_account_no := @im_user_account_no + 1) AS next_no
FROM (
SELECT `id`
FROM `im_users`
WHERE `account_no` = 0
ORDER BY `createdat`, `id`
) AS ordered
) AS seq ON seq.`id` = u.`id`
SET u.`account_no` = seq.next_no
WHERE u.`account_no` = 0;
SET @sql := IF(
(SELECT COUNT(*) FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'im_users' AND INDEX_NAME = 'uk_im_users_account_no') = 0,
'CREATE UNIQUE INDEX `uk_im_users_account_no` ON `im_users` (`account_no`)',
'SELECT 1'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
-- ============================================================
-- 1. Applied runtime policy snapshots.
-- policy_type: security, user_policy_groups, sensitive_words.
server/internal/logic/sys/im_user.go
+8 -17
View File
@@ -69,16 +69,17 @@ func (s *sSysImUser) Create(ctx context.Context, in *sysin.ImUserCreateInp) (res
"password": in.Password,
}
var wire struct {
UserId int64 `json:"user_id"`
Username string `json:"username"`
Nickname string `json:"nickname"`
Phone string `json:"phone"`
DisplayNo int `json:"display_no"`
UserId int64 `json:"user_id"`
Username string `json:"username"`
Nickname string `json:"nickname"`
Phone string `json:"phone"`
}
path := "/internal/admin-query/tenants/" + url.PathEscape(tenant.Code) + "/users"
if err = imadmin.DefaultClient(ctx).InternalPost(ctx, path, payload, &wire); err != nil {
return nil, err
}
res = &sysin.ImUserCreateModel{UserId: wire.UserId, Username: wire.Username, Nickname: wire.Nickname, Phone: wire.Phone}
res = &sysin.ImUserCreateModel{DisplayNo: wire.DisplayNo, UserId: wire.UserId, Username: wire.Username, Nickname: wire.Nickname, Phone: wire.Phone}
if in.GroupId > 0 {
if err = service.SysImUserPolicyGroup().MemberAdd(ctx, &sysin.ImUserPolicyGroupMemberAddInp{GroupId: in.GroupId, UserId: res.UserId}); err != nil {
return nil, gerror.Wrap(err, "用户已创建，但加入用户分组失败")
@@ -123,6 +124,7 @@ func (s *sSysImUser) Import(ctx context.Context, in *sysin.ImUserImportInp) (res
res.FailedCount++
} else {
item.Success = true
item.DisplayNo = created.DisplayNo
item.UserId = created.UserId
item.Username = created.Username
res.SuccessCount++
@@ -205,7 +207,7 @@ func (s *sSysImUser) List(ctx context.Context, in *sysin.ImUserListInp) (list []
values.Set("user_ids", strings.Join(userIds, ","))
}
if in.UserId != "" {
values.Set("user_id", in.UserId)
values.Set("account_no", in.UserId)
}
if in.Nickname != "" {
values.Set("nickname", in.Nickname)
@@ -239,17 +241,6 @@ func (s *sSysImUser) List(ctx context.Context, in *sysin.ImUserListInp) (list []
if err = fillImUserRegisterTypes(ctx, tenant.Id, list); err != nil {
return nil, 0, err
}
page := in.Page
if page < 1 {
page = 1
}
perPage := in.PerPage
if perPage < 1 {
perPage = 10
}
for index, item := range list {
item.DisplayNo = 1000 + (page-1)*perPage + index
}
return list, totalCount, nil
}
server/internal/model/input/sysin/im_user.go
+13 -11
View File
@@ -18,9 +18,9 @@ import (
type ImUserListInp struct {
form.PageReq
TenantId int64 `json:"tenantId" dc:"租户ID"`
UserId string `json:"userId" dc:"用户ID"`
UserId string `json:"userId" dc:"后台展示编号"`
GroupId int64 `json:"groupId" dc:"用户策略分组ID"`
Keyword string `json:"keyword" dc:"用户名、昵称或手机号"`
Keyword string `json:"keyword" dc:"用户名、昵称、手机号或编号"`
Nickname string `json:"nickname" dc:"昵称"`
AuthName string `json:"authName" dc:"登录标识"`
State *int `json:"state" dc:"账号状态"`
@@ -88,10 +88,11 @@ func (in *ImUserCreateInp) Filter(ctx context.Context) error {
}
type ImUserCreateModel struct {
UserId int64 `json:"userId" dc:"用户ID"`
Username string `json:"username" dc:"用户名"`
Nickname string `json:"nickname" dc:"昵称"`
Phone string `json:"phone" dc:"手机号"`
DisplayNo int `json:"displayNo" dc:"后台展示编号"`
UserId int64 `json:"userId" dc:"用户ID"`
Username string `json:"username" dc:"用户名"`
Nickname string `json:"nickname" dc:"昵称"`
Phone string `json:"phone" dc:"手机号"`
}
type ImUserBatchCreateInp struct {
@@ -114,11 +115,12 @@ func (in *ImUserBatchCreateInp) Filter(ctx context.Context) error {
}
type ImUserBatchItemModel struct {
Row int `json:"row" dc:"行号"`
Username string `json:"username" dc:"用户名"`
UserId int64 `json:"userId" dc:"用户ID"`
Success bool `json:"success" dc:"是否成功"`
Reason string `json:"reason" dc:"失败原因"`
Row int `json:"row" dc:"行号"`
DisplayNo int `json:"displayNo" dc:"后台展示编号"`
Username string `json:"username" dc:"用户名"`
UserId int64 `json:"userId" dc:"用户ID"`
Success bool `json:"success" dc:"是否成功"`
Reason string `json:"reason" dc:"失败原因"`
}
type ImUserBatchCreateModel struct {
web/src/views/imUser/DevicesModal.vue
+3 -1
View File
@@ -3,7 +3,7 @@
v-model:show="showModal"
preset="dialog"
:show-icon="false"
:title="'登录设备 ' + userId"
:title="'登录设备 #' + (displayNo || userId)"
:mask-closable="false"
:style="{ width: dialogWidth }"
>
@@ -33,6 +33,7 @@
const showModal = ref(false);
const actionRef = ref();
const tenantId = ref(0);
const displayNo = ref(0);
const userId = ref('');
const dialogWidth = computed(() => adaModalWidth(1080));
const scrollX = computed(() => adaTableScrollX(deviceColumns, 0));
@@ -46,6 +47,7 @@
function openModal(record: State) {
tenantId.value = record.tenantId;
displayNo.value = record.displayNo;
userId.value = record.userId;
showModal.value = true;
setTimeout(() => {
web/src/views/imUser/ResetPasswordModal.vue
+11 -3
View File
@@ -1,8 +1,14 @@
<template>
<n-modal v-model:show="showModal" preset="dialog" title="重置IM用户密码" :mask-closable="false">
<n-form ref="formRef" :model="formValue" :rules="rules" label-placement="left" :label-width="90">
<n-form-item label="用户ID">
<n-text>{{ userId }}</n-text>
<n-form
ref="formRef"
:model="formValue"
:rules="rules"
label-placement="left"
:label-width="90"
>
<n-form-item label="编号">
<n-text>{{ displayNo || '-' }}</n-text>
</n-form-item>
<n-form-item label="新密码" path="newPassword">
<n-input
@@ -44,6 +50,7 @@
const showModal = ref(false);
const loading = ref(false);
const tenantId = ref(0);
const displayNo = ref(0);
const userId = ref('');
const formValue = reactive({ newPassword: '', confirmPassword: '' });
const rules = {
@@ -66,6 +73,7 @@
function openModal(record: State) {
tenantId.value = record.tenantId;
displayNo.value = record.displayNo;
userId.value = record.userId;
formValue.newPassword = '';
formValue.confirmPassword = '';
web/src/views/imUser/governance.vue
+11 -4
View File
@@ -5,13 +5,13 @@
:show-icon="false"
preset="dialog"
transform-origin="center"
:title="'用户治理 #' + formValue.userId"
:title="'用户治理 #' + (formValue.displayNo || formValue.userId)"
:style="{ width: dialogWidth }"
>
<n-spin :show="loading" description="请稍候...">
<n-descriptions label-placement="left" bordered :column="settingStore.isMobile ? 1 : 2">
<n-descriptions-item label="商户">{{ formValue.tenantName || '-' }}</n-descriptions-item>
<n-descriptions-item label="用户ID">{{ formValue.userId }}</n-descriptions-item>
<n-descriptions-item label="编号">{{ formValue.displayNo || '-' }}</n-descriptions-item>
<n-descriptions-item label="昵称">{{ formValue.nickname || '-' }}</n-descriptions-item>
<n-descriptions-item label="状态">{{ stateLabel }}</n-descriptions-item>
</n-descriptions>
@@ -29,7 +29,12 @@
<n-switch v-model:value="actionForm.hard" />
</n-form-item>
<n-form-item label="原因">
<n-input v-model:value="actionForm.reason" type="textarea" clearable placeholder="请输入操作原因" />
<n-input
v-model:value="actionForm.reason"
type="textarea"
clearable
placeholder="请输入操作原因"
/>
</n-form-item>
</n-form>
</n-spin>
@@ -68,7 +73,9 @@
const showModal = ref(false);
const formValue = ref<State>(newState(null));
const dialogWidth = computed(() => adaModalWidth(720));
const stateLabel = computed(() => dict.getLabel('ImUserStateOptions', formValue.value.state) || '-');
const stateLabel = computed(
() => dict.getLabel('ImUserStateOptions', formValue.value.state) || '-'
);
const actionOptions = [
{ label: '封禁用户', value: 'ban' },
web/src/views/imUser/index.vue
+6 -6
View File
@@ -58,9 +58,9 @@
class="user-dialog"
>
<n-form label-placement="left" label-width="90">
<n-form-item label="用户"
>{{ operationUser?.username }}（{{ operationUser?.userId }}）</n-form-item
>
<n-form-item label="用户">
{{ operationUser?.username }}（{{ operationUser?.displayNo || operationUser?.userId }}）
</n-form-item>
<n-form-item label="IP/CIDR">
<n-input
v-model:value="ipWhitelistText"
@@ -90,9 +90,9 @@
class="user-dialog"
>
<n-form label-placement="left" label-width="90">
<n-form-item label="用户"
>{{ operationUser?.username }}（{{ operationUser?.userId }}）</n-form-item
>
<n-form-item label="用户">
{{ operationUser?.username }}（{{ operationUser?.displayNo || operationUser?.userId }}）
</n-form-item>
<n-form-item label="用户分组" required>
<n-select
v-model:value="adjustGroupId"
web/src/views/imUser/model.ts
+1 -1
View File
@@ -122,7 +122,7 @@ export const schemas = ref<FormSchema[]>([
label: '关键词',
componentProps: {
clearable: true,
placeholder: '用户名/昵称/手机号',
placeholder: '用户名/昵称/手机号/编号',
},
},
]);
web/src/views/imUser/view.vue
+26 -10
View File
@@ -6,7 +6,7 @@
:show-icon="false"
preset="dialog"
transform-origin="center"
:title="'IM用户详情 #' + formValue.userId"
:title="'IM用户详情 #' + (formValue.displayNo || formValue.userId)"
:style="{
width: dialogWidth,
}"
@@ -15,25 +15,41 @@
<n-spin :show="loading" description="请稍候...">
<n-descriptions label-placement="left" bordered :column="settingStore.isMobile ? 1 : 2">
<n-descriptions-item label="商户">{{ formValue.tenantName }}</n-descriptions-item>
<n-descriptions-item label="用户ID">{{ formValue.userId }}</n-descriptions-item>
<n-descriptions-item label="编号">{{ formValue.displayNo || '-' }}</n-descriptions-item>
<n-descriptions-item label="登录账号">{{ formValue.username }}</n-descriptions-item>
<n-descriptions-item label="手机号">{{ formValue.phone || '-' }}</n-descriptions-item>
<n-descriptions-item label="昵称">{{ formValue.nickname || '-' }}</n-descriptions-item>
<n-descriptions-item label="公开账号">{{ formValue.publicAccount || '-' }}</n-descriptions-item>
<n-descriptions-item label="公开账号">{{
formValue.publicAccount || '-'
}}</n-descriptions-item>
<n-descriptions-item label="状态">{{ stateLabel }}</n-descriptions-item>
<n-descriptions-item label="认证版本">{{ formValue.authVersion }}</n-descriptions-item>
<n-descriptions-item label="登录标识">{{ formValue.authNames || '-' }}</n-descriptions-item>
<n-descriptions-item label="凭证">{{ formValue.credentials || '-' }}</n-descriptions-item>
<n-descriptions-item label="登录标识">{{
formValue.authNames || '-'
}}</n-descriptions-item>
<n-descriptions-item label="凭证">{{
formValue.credentials || '-'
}}</n-descriptions-item>
<n-descriptions-item label="性别">{{ formValue.gender || '-' }}</n-descriptions-item>
<n-descriptions-item label="地区">{{ formValue.region || '-' }}</n-descriptions-item>
<n-descriptions-item label="出生日期">{{ formValue.birthDate || '-' }}</n-descriptions-item>
<n-descriptions-item label="出生日期">{{
formValue.birthDate || '-'
}}</n-descriptions-item>
<n-descriptions-item label="密码更新时间">
{{ formValue.passwordUpdatedAt || '-' }}
</n-descriptions-item>
<n-descriptions-item label="最后在线">{{ formValue.lastSeen || '-' }}</n-descriptions-item>
<n-descriptions-item label="资料版本">{{ formValue.profileVersion }}</n-descriptions-item>
<n-descriptions-item label="创建时间">{{ formValue.createdAt || '-' }}</n-descriptions-item>
<n-descriptions-item label="修改时间">{{ formValue.updatedAt || '-' }}</n-descriptions-item>
<n-descriptions-item label="最后在线">{{
formValue.lastSeen || '-'
}}</n-descriptions-item>
<n-descriptions-item label="资料版本">{{
formValue.profileVersion
}}</n-descriptions-item>
<n-descriptions-item label="创建时间">{{
formValue.createdAt || '-'
}}</n-descriptions-item>
<n-descriptions-item label="修改时间">{{
formValue.updatedAt || '-'
}}</n-descriptions-item>
<n-descriptions-item label="客户端" :span="2">
{{ formValue.userAgent || '-' }}
</n-descriptions-item>