feat(t14-s1s2): 数据迁移基础设施 + 用户迁移
T14 数据迁移工具 S1/S2 阶段： S1 基础设施： - source_app/migrate_task 建表 + 实体 + Mapper - TencentImClient 双密钥 callApiAs（老应用拉取，不走主应用限流，审计记 migrate） - 后台「老应用配置」页（CRUD + 测试连通） S2 用户迁移： - batchImport（multiaccount_import，每批≤100） - MigrateService.migrateUsers（前缀转换+导入+映射+校验，幂等） - 后台「数据迁移」页（上传清单文件/粘贴列表 + 任务记录） 联调通过：3用户清单→加sa前缀→腾讯导入OK→user_mapping→校验3/3/3。 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
yixiong
@@ -66,6 +66,8 @@
|
||||
<a href="${basePath}/admin/grant" class="nav-item <#if active=='grant'>active</#if>">跨租户授权</a>
|
||||
<a href="${basePath}/admin/queue" class="nav-item <#if active=='queue'>active</#if>">队列监控</a>
|
||||
<a href="${basePath}/admin/usage" class="nav-item <#if active=='usage'>active</#if>">用量报表</a>
|
||||
<a href="${basePath}/admin/sourceapp" class="nav-item <#if active=='sourceapp'>active</#if>">老应用配置</a>
|
||||
<a href="${basePath}/admin/migrate" class="nav-item <#if active=='migrate'>active</#if>">数据迁移</a>
|
||||
</nav>
|
||||
<div class="sidebar-footer">
|
||||
<a href="${basePath}/admin/logout" class="logout-link">退出登录</a>
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
<#import "_macros.ftl" as m>
|
||||
<@m.layout active="migrate" title="数据迁移">
|
||||
<#if msg?has_content>
|
||||
<div class="alert">
|
||||
<#if msg=='done'>✅ 迁移完成（成功导入 ${imported!'0'} 用户，详见任务记录）
|
||||
<#elseif msg=='empty'>❌ 用户清单为空（每行一个 UserID，# 开头为注释）
|
||||
<#elseif msg=='noapp'>❌ 请选择老应用
|
||||
<#else>${msg}
|
||||
</#if>
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
<div class="stat-card" style="margin-bottom:20px">
|
||||
<div class="modal-title">用户迁移</div>
|
||||
<p class="muted">上传用户清单文件（txt/csv，每行一个老应用 UserID，# 开头注释）或粘贴列表，选择老应用后触发。老 UserID 将加租户前缀后批量导入主应用，并写 user_mapping。幂等可重跑。</p>
|
||||
<form method="post" action="${basePath}/admin/migrate/users" enctype="multipart/form-data" style="margin-top:14px">
|
||||
<div class="modal-body">
|
||||
<div class="form-group">
|
||||
<label>老应用</label>
|
||||
<select name="sourceAppId" required>
|
||||
<option value="">请选择老应用</option>
|
||||
<#list apps as a>
|
||||
<option value="${a.id!}">${a.appName!}（SDK ${a.sdkAppId!} → 租户 ${a.tenantId!}）</option>
|
||||
</#list>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group"><label>上传用户清单文件（每行一个 UserID）</label><input type="file" name="file" style="padding:7px;border:1px solid #ddd;border-radius:6px;width:100%"></div>
|
||||
<div class="form-group"><label>或粘贴用户 ID 列表（每行一个）</label><textarea name="userText" rows="6" style="width:100%;padding:9px;border:1px solid #ddd;border-radius:6px;font-family:monospace;font-size:13px"></textarea></div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">开始迁移</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<h3 style="margin:20px 0 10px;font-size:15px;color:#2c3e50">迁移任务记录</h3>
|
||||
<#if tasks?has_content>
|
||||
<table class="data-table">
|
||||
<thead>
|
||||
<tr><th>ID</th><th>老应用</th><th>对象</th><th>进度(已处理/总数)</th><th>状态</th><th>校验结果</th><th>开始时间</th></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<#list tasks as t>
|
||||
<tr>
|
||||
<td>${t.id!}</td>
|
||||
<td>${t.sourceAppId!}</td>
|
||||
<td>${t.objectType!}</td>
|
||||
<td>${t.processedCount!'0'}/${t.totalCount!'0'}</td>
|
||||
<td>
|
||||
<#if t.status?? && t.status==3><span class="badge badge-ok">完成</span>
|
||||
<#elseif t.status?? && t.status==1><span class="badge badge-warn">运行</span>
|
||||
<#elseif t.status?? && t.status==4><span class="badge badge-no">失败</span>
|
||||
<#else><span class="badge">待</span>
|
||||
</#if>
|
||||
</td>
|
||||
<td class="muted">${t.verifyResult!'-'}</td>
|
||||
<td class="muted">${t.startedAt!}</td>
|
||||
</tr>
|
||||
</#list>
|
||||
</tbody>
|
||||
</table>
|
||||
<#else>
|
||||
<div class="empty">暂无迁移任务</div>
|
||||
</#if>
|
||||
</@m.layout>
|
||||
@@ -0,0 +1,94 @@
|
||||
<#import "_macros.ftl" as m>
|
||||
<@m.layout active="sourceapp" title="老应用配置">
|
||||
<#if msg?has_content>
|
||||
<div class="alert">
|
||||
<#if msg=='saved'>保存成功
|
||||
<#elseif msg=='toggled'>状态已切换
|
||||
<#elseif msg=='test_ok'>✅ 连通成功（SDKAppId/密钥/sig 正确）
|
||||
<#elseif msg=='test_sigfail'>❌ 连通失败：UserSig 错误（70003，SDKAppId/密钥不匹配）
|
||||
<#elseif msg=='test_fail'>❌ 连通失败（详见日志）
|
||||
<#elseif msg=='sdkappid_required'>SDKAppID 必填
|
||||
<#elseif msg=='tenant_required'>对应租户必填
|
||||
<#elseif msg=='notfound'>老应用不存在
|
||||
<#else>${msg}
|
||||
</#if>
|
||||
</div>
|
||||
</#if>
|
||||
<p class="muted">数据迁移源：每个老应用对应主应用一个租户（决定 UserID 前缀）。迁移时用其 SDKAppID/密钥调腾讯 API 拉取存量数据，加前缀后导入主应用。密钥仅本工具持有。</p>
|
||||
<div style="margin-bottom:14px">
|
||||
<button class="btn btn-success" onclick="document.getElementById('addModal').classList.add('show')">➕ 新增老应用</button>
|
||||
</div>
|
||||
<#if apps?has_content>
|
||||
<table class="data-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th><th>应用名称</th><th>SDKAppID</th><th>密钥</th><th>对应租户</th>
|
||||
<th>状态</th><th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<#list apps as a>
|
||||
<tr>
|
||||
<td>${a.id!}</td>
|
||||
<td>${a.appName!}</td>
|
||||
<td>${a.sdkAppId!}</td>
|
||||
<td class="muted">••••••••</td>
|
||||
<td>${a.tenantId!}</td>
|
||||
<td>
|
||||
<#if a.status?? && a.status == 1>
|
||||
<span class="badge badge-ok">启用</span>
|
||||
<#else>
|
||||
<span class="badge badge-no">停用</span>
|
||||
</#if>
|
||||
</td>
|
||||
<td>
|
||||
<form method="post" action="${basePath}/admin/sourceapp/toggle" style="display:inline">
|
||||
<input type="hidden" name="id" value="${a.id!}">
|
||||
<#if a.status?? && a.status == 1>
|
||||
<input type="hidden" name="status" value="0">
|
||||
<button class="btn btn-sm btn-secondary">停用</button>
|
||||
<#else>
|
||||
<input type="hidden" name="status" value="1">
|
||||
<button class="btn btn-sm btn-success">启用</button>
|
||||
</#if>
|
||||
</form>
|
||||
<form method="post" action="${basePath}/admin/sourceapp/test" style="display:inline">
|
||||
<input type="hidden" name="id" value="${a.id!}">
|
||||
<button class="btn btn-sm btn-primary">测试连通</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</#list>
|
||||
</tbody>
|
||||
</table>
|
||||
<#else>
|
||||
<div class="empty">暂无老应用配置，点击「新增老应用」添加</div>
|
||||
</#if>
|
||||
|
||||
<div id="addModal" class="modal" onclick="if(event.target===this)this.classList.remove('show')">
|
||||
<div class="modal-content">
|
||||
<div class="modal-title">新增老应用</div>
|
||||
<form method="post" action="${basePath}/admin/sourceapp/save">
|
||||
<div class="modal-body">
|
||||
<div class="form-group"><label>应用名称</label><input name="appName" required></div>
|
||||
<div class="form-group"><label>SDKAppID（老应用）</label><input name="sdkAppId" required></div>
|
||||
<div class="form-group"><label>SecretKey（老应用密钥）</label><input name="secretKey" required></div>
|
||||
<div class="form-group">
|
||||
<label>对应租户（决定 UserID 前缀）</label>
|
||||
<select name="tenantId" required>
|
||||
<option value="">请选择租户</option>
|
||||
<#list tenants as t>
|
||||
<option value="${t.tenantId!}">${t.tenantId!}（${t.tenantName!}，前缀 ${t.prefixCode!}）</option>
|
||||
</#list>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group"><label>备注</label><input name="remark" placeholder="如：原XX系统IM应用"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" onclick="document.getElementById('addModal').classList.remove('show')">取消</button>
|
||||
<button type="submit" class="btn btn-primary">保存</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</@m.layout>
|
||||
Reference in New Issue
Block a user