fix: exclude test accounts from leaderboard

.gitea/workflows/deploy.yml

@@ -64,5 +64,18 @@ jobs:
           SSH_ARGS=(-i "$KEY_FILE" -o BatchMode=yes -o StrictHostKeyChecking=yes)
           printf '%s' "$REGISTRY_TOKEN" | ssh "${SSH_ARGS[@]}" "$DEPLOY_USER@$DEPLOY_HOST" \
             "docker login git.olns.shop -u admin --password-stdin"
-          ssh "${SSH_ARGS[@]}" "$DEPLOY_USER@$DEPLOY_HOST" \
+          ssh "${SSH_ARGS[@]}" "$DEPLOY_USER@$DEPLOY_HOST" '
-            "cd /opt/olns && docker compose pull olons-server && docker compose up -d --no-deps --wait olons-server"
+            set -euo pipefail
+            cd /opt/olns
+            docker compose pull olons-server
+            docker compose up -d --no-deps --wait olons-server
+            docker compose exec -T olons-server sh -c '"'"'
+              test -n "$OLONS_IM_INTERNAL_SECRET"
+              test "$OLONS_IM_TENANT_CODE" = "default"
+              test "$OLONS_SERVER_DEFAULT_TENANT_ID" = "0"
+              test "$OLONS_IM_BASE_URL" = "http://im-server:6060"
+              test "$OLONS_IM_HTTP_API_URL" = "http://im-server:6060/v1/im"
+              test "$OLONS_IM_WS_URL" = "ws://im-server:6060/v0/channels"
+              test "$OLONS_IM_FILE_URL" = "http://im-server:6060/v0/file"
+            '"'"'
+          '

docs/superpowers/plans/2026-10-19-customer-service-im-reliability.md

@@ -0,0 +1,78 @@
+# Customer Service IM Reliability Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Restore customer-service message and image delivery after WebSocket interruptions and route every browser IM request through its current frontend origin.
+
+**Architecture:** Browser-facing session endpoints are relative paths resolved against the current origin, while server-to-server calls use Docker-internal endpoints. Caddy routes the IM API, file service, and WebSocket before each site's frontend fallback. The mobile chat client reauthenticates and resubscribes after SDK reconnects.
+
+**Tech Stack:** Go, Vue 3, TypeScript, Tinode SDK, Vitest, Docker Compose, Caddy, Python/Bash deployment contract tests.
+
+---
+
+### Task 1: Relative browser endpoint contract
+
+**Files:**
+- Modify: `internal/support/service.go`
+- Modify: `internal/support/service_test.go`
+
+- [ ] Write a failing Go test asserting `OpenSession` returns `/v1/im`, `/v0/channels`, and `/v0/file` even when internal IM configuration contains an absolute host.
+- [ ] Run `go test ./internal/support -run TestOpenSessionReturnsSameOriginEndpoints -v` and confirm the absolute-host assertion failure.
+- [ ] Return the three relative public endpoints from `OpenSession` without changing `imclient.Config()` used for server calls.
+- [ ] Re-run the targeted test and `go test ./internal/support ./internal/imclient ./internal/httpapi`.
+
+### Task 2: Mobile reconnect and media authentication
+
+**Files:**
+- Modify: `web/package.json`
+- Modify: `web/pnpm-lock.yaml`
+- Modify: `web/src/mobile/im.ts`
+- Create: `web/src/mobile/im.test.ts`
+- Modify: `web/src/mobile/views/SupportView.vue`
+
+- [ ] Add Vitest and a test script.
+- [ ] Write failing tests for same-origin endpoint resolution, initial connect/login/subscribe, reconnect login/resubscribe with later data, and intentional disconnect.
+- [ ] Run `pnpm test --run` and confirm the failures are caused by missing reconnect behavior.
+- [ ] Add serialized reconnect recovery, connection-state callbacks, relative endpoint resolution, and Header-based upload authentication.
+- [ ] Add an offline/reconnecting banner, disable sending while disconnected, and add media error/retry UI.
+- [ ] Run `pnpm test --run`, `pnpm run build`, and the Go package tests.
+
+### Task 3: Remove fixed IM public origins from im_webapp
+
+**Files:**
+- Modify: `../im_webapp/tests/test_actions_workflow.py`
+- Modify: `../im_webapp/.gitea/workflows/deploy.yml`
+- Modify: `../im_webapp/Dockerfile`
+- Modify: `../im_webapp/web/src/lib/config.ts`
+- Modify or create: `../im_webapp/web/tests/same-origin-endpoints.test.mjs`
+
+- [ ] Change contract tests first so they reject fixed production API/file build arguments and the legacy default WebSocket host.
+- [ ] Run the Python and Node tests and confirm they fail on the current fixed values.
+- [ ] Remove fixed endpoint build arguments, make file base default empty, and derive the fallback WebSocket host from `window.location.host`.
+- [ ] Run Python contracts, Node tests, and `pnpm run build`.
+
+### Task 4: Caddy same-origin route contract
+
+**Files:**
+- Modify: `../deploy/olns-stack/test-deployment.sh`
+- Modify: `../deploy/olns-stack/Caddyfile`
+- Modify: `../deploy/olns-stack/compose.yaml`
+- Modify: `.gitea/workflows/deploy.yml`
+
+- [ ] Add failing deployment assertions requiring `/v1/im*`, `/v0/file*`, and `/v0/channels*` to be handled before frontend fallbacks for both site groups.
+- [ ] Run `bash ../deploy/olns-stack/test-deployment.sh` and confirm failure.
+- [ ] Add the Caddy route handlers with no-store responses.
+- [ ] Switch server-side IM HTTP/WS/base values to `im-server:6060` in Compose and the OLONS deployment overlay.
+- [ ] Re-run deployment contracts and workflow tests.
+
+### Task 5: Integration and production verification
+
+**Files:**
+- Update: `../DEPLOYMENT_RECORD.md` with non-secret route and acceptance notes.
+
+- [ ] Run full Go, web, workflow and deployment test suites and builds.
+- [ ] Commit each repository, merge the task branch into current `pro`, and push `pro` only after all local gates pass.
+- [ ] Back up `/opt/olns/Caddyfile` and Compose files, install the tested Caddy/Compose changes, validate Caddy, and reload atomically.
+- [ ] Wait for both Actions deployments and verify image digests, container health and restart counts.
+- [ ] Verify all five domains return IM responses instead of SPA HTML, WebSocket upgrades to 101, and file responses are not HTML.
+- [ ] Exercise a real support session, interrupt/recover its network connection, and verify a subsequent text and image arrive without refreshing.

docs/superpowers/specs/2026-10-19-customer-service-im-reliability-design.md

@@ -0,0 +1,43 @@
+# 客服 IM 投递可靠性设计
+
+## 目标
+
+修复 OLONS 会员端在 WebSocket 异常断线后无法继续接收客服文本或图片的问题，并保证 IM API、文件和 WebSocket 全部通过用户当前访问的前端域名转发。
+
+## 范围
+
+- `olons_server` 会员客服客户端的断线恢复、连接状态和媒体加载错误处理。
+- `olons_server` 客服会话返回给浏览器的公开端点。
+- `im_webapp` 生产构建中的固定公网域名。
+- 单机 Compose Caddy 的同源路径路由和部署契约。
+- 生产发布及五个前端域名的文本、图片、WebSocket 验收。
+
+不修改会员、消息或文件业务数据，不改支付、提现及其他业务功能。
+
+## 架构
+
+浏览器公开端点使用相对路径：`/v1/im`、`/v0/file`、`/v0/channels`。客户端以 `window.location.origin` 解析 HTTP/文件地址，并将当前页面协议转换为 `ws` 或 `wss`。因此同一镜像在 `olons.yuexuan.shop` 和三个公测域名下会自动使用当前域名，不读取或信任任意 Host Header。
+
+Caddy 在五个前端域名中优先把上述路径代理到 `im-server:6060`，其余路径仍进入原来的前端或 OLONS 服务。代理响应明确禁止缓存。`olons-server` 自身调用 IM 时使用 Docker 网络中的 `im-server:6060`，不再绕行 Cloudflare。
+
+## 断线恢复
+
+`CustomerServiceChat` 保存 token、当前 Topic 和最新 seq。首次连接仍执行 connect、token 登录和历史订阅。SDK 重新建立 WebSocket 后，客户端再次 token 登录，重新订阅当前 Topic，并通过 later-data 查询补拉本地最后 seq 之后的数据。恢复过程串行化，避免多个 reconnect 回调造成重复登录或订阅。
+
+页面接收连接状态：`connecting`、`online`、`reconnecting`、`offline`。断线时保留已显示消息但禁止发送，恢复成功后解除禁止。主动离开页面不触发恢复。
+
+## 图片处理
+
+上传使用 `X-MeetingIM-APIKey` 和 `Authorization: Token <token>` Header，不再把 token 放在 URL 查询参数中。下载继续使用当前域名；图片或视频加载失败时显示失败提示和重试入口，不能静默显示空白。
+
+## 测试
+
+- TypeScript 单测覆盖相对端点解析、首次订阅、断线重连、重新登录、重新订阅、补拉和主动断开。
+- Go 单测覆盖客服会话始终返回相对公开端点。
+- `im_webapp` 工作流契约禁止固定 `im-api.yuexuan.shop` 和旧 `118im.com` 文件/WS地址。
+- 部署契约要求五个域名都有三条同源路由，并保证 catch-all 顺序正确。
+- 生产验收验证 JSON API、文件、WebSocket 101、断线恢复后的文本和图片，不以数据库序号代替浏览器展示验收。
+
+## 回滚
+
+应用镜像可回滚到发布前 digest；Caddy 修改前保留生产文件副本。回滚只涉及 `olons-server`、`im-webapp` 和 Caddy，不修改数据库或 MinIO 数据。

internal/config/config.go

@@ -64,14 +64,15 @@ type RedisConfig struct {
 }
 
 type AuthConfig struct {
-	APIKeys            []string `json:"api_keys"`
+	APIKeys                 []string `json:"api_keys"`
-	SessionKeyPattern  string   `json:"session_key_pattern"`
+	SessionKeyPattern       string   `json:"session_key_pattern"`
-	SessionTTLSeconds  int      `json:"session_ttl_seconds"`
+	SessionTTLSeconds       int      `json:"session_ttl_seconds"`
-	DataEncryptionKey  string   `json:"data_encryption_key"`
+	DataEncryptionKey       string   `json:"data_encryption_key"`
-	LookupHMACKey      string   `json:"lookup_hmac_key"`
+	LookupHMACKey           string   `json:"lookup_hmac_key"`
-	FinanceMasterKey   string   `json:"finance_master_key"`
+	FinanceMasterKey        string   `json:"finance_master_key"`
-	AllowDevHeaderAuth bool     `json:"allow_dev_header_auth"`
+	FinanceLegacyMasterKeys []string `json:"finance_legacy_master_keys"`
-	RequiredAPIKey     bool     `json:"required_api_key"`
+	AllowDevHeaderAuth      bool     `json:"allow_dev_header_auth"`
+	RequiredAPIKey          bool     `json:"required_api_key"`
 }
 
 func Load() (*Config, error) {
@@ -85,7 +86,11 @@ func Load() (*Config, error) {
 			return nil, err
 		}
 	}
+	configuredFinanceMasterKey := strings.TrimSpace(cfg.Auth.FinanceMasterKey)
 	applyEnv(cfg)
+	if configuredFinanceMasterKey != "" && configuredFinanceMasterKey != strings.TrimSpace(cfg.Auth.FinanceMasterKey) {
+		cfg.Auth.FinanceLegacyMasterKeys = append(cfg.Auth.FinanceLegacyMasterKeys, configuredFinanceMasterKey)
+	}
 	if err := cfg.validate(); err != nil {
 		return nil, err
 	}
@@ -111,7 +116,7 @@ func defaultConfig() *Config {
 		IM: IMConfig{
 			BaseURL: "https://api.118im.com", HTTPAPIURL: "https://api.118im.com/v1/im",
 			WebSocketURL: "wss://api.118im.com/v0/channels", FileURL: "https://api.118im.com/v0/file",
-			TenantCode: "allrich", APIKey: "AQAAAAABAAChdu8_yk0OxZcId6FnwYNS",
+			TenantCode: "default", APIKey: "AQAAAAABAAChdu8_yk0OxZcId6FnwYNS",
 			InternalService: "olons-server", Timeout: 8 * time.Second,
 		},
 		ReadTimeout:  8 * time.Second,
@@ -134,6 +139,9 @@ func applyEnv(cfg *Config) {
 	setString(&cfg.Auth.DataEncryptionKey, "OLONS_SERVER_DATA_ENCRYPTION_KEY")
 	setString(&cfg.Auth.LookupHMACKey, "OLONS_SERVER_LOOKUP_HMAC_KEY")
 	setString(&cfg.Auth.FinanceMasterKey, "OLONS_SERVER_FINANCE_MASTER_KEY")
+	if keys := strings.TrimSpace(os.Getenv("OLONS_SERVER_FINANCE_LEGACY_MASTER_KEYS")); keys != "" {
+		cfg.Auth.FinanceLegacyMasterKeys = append(cfg.Auth.FinanceLegacyMasterKeys, splitCSV(keys)...)
+	}
 	setBool(&cfg.Auth.AllowDevHeaderAuth, "OLONS_SERVER_ALLOW_DEV_HEADER_AUTH")
 	setBool(&cfg.Auth.RequiredAPIKey, "OLONS_SERVER_REQUIRED_API_KEY")
 	ApplyUploadEnv(&cfg.Upload)

internal/config/config_test.go

@@ -1,12 +1,19 @@
 package config
 
-import "testing"
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
 
 func TestDefaultConfigUsesOlonsAdmin(t *testing.T) {
 	cfg := defaultConfig()
 	if err := cfg.validate(); err != nil {
 		t.Fatal(err)
 	}
+	if cfg.IM.TenantCode != "default" {
+		t.Fatalf("unexpected default IM tenant: %q", cfg.IM.TenantCode)
+	}
 }
 
 func TestConfigRejectsOtherDatabase(t *testing.T) {
@@ -17,6 +24,24 @@ func TestConfigRejectsOtherDatabase(t *testing.T) {
 	}
 }
 
+func TestLoadPreservesConfiguredFinanceKeyAsLegacyWhenEnvironmentOverridesIt(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "config.json")
+	data := []byte(`{"auth":{"finance_master_key":"legacy-finance-master-key-with-at-least-32-characters"}}`)
+	if err := os.WriteFile(path, data, 0o600); err != nil {
+		t.Fatal(err)
+	}
+	t.Setenv("OLONS_SERVER_CONFIG", path)
+	t.Setenv("OLONS_SERVER_FINANCE_MASTER_KEY", "current-finance-master-key-with-at-least-32-characters")
+	cfg, err := Load()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(cfg.Auth.FinanceLegacyMasterKeys) != 1 ||
+		cfg.Auth.FinanceLegacyMasterKeys[0] != "legacy-finance-master-key-with-at-least-32-characters" {
+		t.Fatalf("configured finance key was not retained for historical data: %#v", cfg.Auth.FinanceLegacyMasterKeys)
+	}
+}
+
 func TestApplyUploadSystemConfig(t *testing.T) {
 	cfg := UploadConfig{Driver: "local", Region: "us-east-1"}
 	ApplyUploadSystemConfig(&cfg, map[string]string{

internal/finance/service.go

@@ -35,7 +35,6 @@ const (
 var (
 	tradePasswordPattern = regexp.MustCompile(`^[0-9]{6}$`)
 	idempotencyPattern   = regexp.MustCompile(`^[A-Za-z0-9._:\-]{8,80}$`)
-	identityNoPattern    = regexp.MustCompile(`^[1-9][0-9]{14}(?:[0-9]{2}[0-9X])?$`)
 )
 
 type Repository interface {
@@ -59,19 +58,19 @@ type Repository interface {
 }
 
 type Service struct {
-	repository Repository
+	repository  Repository
-	redis      *redis.Client
+	redis       *redis.Client
-	aead       cipher.AEAD
+	aead        cipher.AEAD
-	lookupKey  []byte
+	legacyAEADs []cipher.AEAD
-	ready      bool
+	lookupKey   []byte
-	now        func() time.Time
+	ready       bool
+	now         func() time.Time
 }
 
 type PaymentAccountInput struct {
 	ID                   int64  `json:"id"`
 	BankName             string `json:"bank_name"`
 	HolderName           string `json:"holder_name"`
-	IdentityNo           string `json:"identity_no"`
 	AccountNo            string `json:"account_no"`
 	DigitalRMBCode       string `json:"digital_rmb_code"`
 	WechatQRAttachmentID int64  `json:"wechat_qr_attachment_id"`
@@ -84,7 +83,6 @@ type PaymentAccount struct {
 	BankCode             string `json:"bank_code"`
 	BankName             string `json:"bank_name"`
 	HolderMask           string `json:"holder_mask"`
-	IdentityNoMask       string `json:"identity_no_mask"`
 	AccountNoMask        string `json:"account_no_mask"`
 	DigitalRMBCodeMask   string `json:"digital_rmb_code_mask"`
 	WechatQRAttachmentID int64  `json:"wechat_qr_attachment_id"`
@@ -99,7 +97,6 @@ type PaymentAccountDetail struct {
 	ID                   int64  `json:"id"`
 	BankName             string `json:"bank_name"`
 	HolderName           string `json:"holder_name"`
-	IdentityNo           string `json:"identity_no"`
 	AccountNo            string `json:"account_no"`
 	DigitalRMBCode       string `json:"digital_rmb_code"`
 	WechatQRURL          string `json:"wechat_qr_url"`
@@ -266,20 +263,39 @@ func New(repository Repository, redisClient *redis.Client, cfg config.AuthConfig
 			return service
 		}
 	}
-	block, err := aes.NewCipher(encryptionKey)
+	aead, err := newAEAD(encryptionKey)
-	if err != nil {
-		return service
-	}
-	aead, err := cipher.NewGCM(block)
 	if err != nil {
 		return service
 	}
 	service.aead = aead
+	seenLegacyKeys := make(map[string]struct{}, len(cfg.FinanceLegacyMasterKeys))
+	for _, legacyMasterKey := range cfg.FinanceLegacyMasterKeys {
+		legacyMasterKey = strings.TrimSpace(legacyMasterKey)
+		if len([]byte(legacyMasterKey)) < 32 || legacyMasterKey == masterKey {
+			continue
+		}
+		if _, exists := seenLegacyKeys[legacyMasterKey]; exists {
+			continue
+		}
+		legacyAEAD, legacyErr := newAEAD(deriveKey(legacyMasterKey, "data-encryption"))
+		if legacyErr == nil {
+			service.legacyAEADs = append(service.legacyAEADs, legacyAEAD)
+			seenLegacyKeys[legacyMasterKey] = struct{}{}
+		}
+	}
 	service.lookupKey = lookupKey
 	service.ready = repository != nil && redisClient != nil
 	return service
 }
 
+func newAEAD(key []byte) (cipher.AEAD, error) {
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	return cipher.NewGCM(block)
+}
+
 func deriveKey(masterKey, purpose string) []byte {
 	mac := hmac.New(sha256.New, []byte(masterKey))
 	_, _ = mac.Write([]byte("olons-finance:" + purpose + ":v1"))
@@ -312,20 +328,13 @@ func (s *Service) PaymentAccountDetails(ctx context.Context, tenantID, memberID
 	items := make([]PaymentAccountDetail, 0, len(rows))
 	for _, row := range rows {
 		holderName, accountNo := row.HolderMask, row.AccountNoMask
-		identityNo, digitalRMBCode := row.IdentityNoMask, row.DigitalRMBCodeMask
+		digitalRMBCode := row.DigitalRMBCodeMask
 		masked := true
 		if s.ready {
 			decryptedHolder, holderErr := s.decrypt(row.HolderCipher)
 			decryptedAccount, accountErr := s.decrypt(row.AccountNoCipher)
 			if holderErr == nil && accountErr == nil {
 				holderName, accountNo, masked = decryptedHolder, decryptedAccount, false
-				if row.IdentityNoCipher != "" {
-					if value, decryptErr := s.decrypt(row.IdentityNoCipher); decryptErr == nil {
-						identityNo = value
-					} else {
-						masked = true
-					}
-				}
 				if row.DigitalRMBCodeCipher != "" {
 					if value, decryptErr := s.decrypt(row.DigitalRMBCodeCipher); decryptErr == nil {
 						digitalRMBCode = value
@@ -337,7 +346,7 @@ func (s *Service) PaymentAccountDetails(ctx context.Context, tenantID, memberID
 		}
 		items = append(items, PaymentAccountDetail{
 			ID: row.ID, BankName: row.BankName, HolderName: holderName,
-			IdentityNo: identityNo, AccountNo: accountNo, DigitalRMBCode: digitalRMBCode,
+			AccountNo: accountNo, DigitalRMBCode: digitalRMBCode,
 			WechatQRURL: row.WechatQRURL, AlipayQRURL: row.AlipayQRURL,
 			WechatQRAttachmentID: row.WechatQRAttachmentID, AlipayQRAttachmentID: row.AlipayQRAttachmentID,
 			VerifyStatus: verifyStatusName(row.VerifyStatus), IsDefault: row.IsDefault == 1, Masked: masked,
@@ -386,10 +395,6 @@ func (s *Service) paymentAccountCreation(tenantID, memberID int64, input Payment
 	if err != nil {
 		return store.PaymentAccountCreation{}, err
 	}
-	identityNoCipher, err := s.encrypt(input.IdentityNo)
-	if err != nil {
-		return store.PaymentAccountCreation{}, err
-	}
 	accountCipher, err := s.encrypt(input.AccountNo)
 	if err != nil {
 		return store.PaymentAccountCreation{}, err
@@ -406,9 +411,8 @@ func (s *Service) paymentAccountCreation(tenantID, memberID int64, input Payment
 	return store.PaymentAccountCreation{
 		TenantID: tenantID, MemberID: memberID, AccountType: 1, BankCode: "BANK", BankName: input.BankName,
 		HolderCipher: holderCipher, HolderMask: maskName(input.HolderName),
-		IdentityNoCipher: identityNoCipher, IdentityNoHash: s.lookupHash(input.IdentityNo),
+		AccountNoCipher: accountCipher,
-		IdentityNoMask: maskIdentityNo(input.IdentityNo), AccountNoCipher: accountCipher,
+		AccountNoHash:   s.lookupHash(input.AccountNo), AccountNoMask: maskAccount(input.AccountNo),
-		AccountNoHash: s.lookupHash(input.AccountNo), AccountNoMask: maskAccount(input.AccountNo),
 		DigitalRMBCodeCipher: digitalRMBCodeCipher, DigitalRMBCodeHash: digitalRMBCodeHash,
 		DigitalRMBCodeMask:   digitalRMBCodeMask,
 		WechatQRAttachmentID: input.WechatQRAttachmentID,
@@ -454,13 +458,6 @@ func (s *Service) CreateWithdrawal(ctx context.Context, tenantID, memberID int64
 	if err != nil {
 		return nil, store.ErrPaymentAccountInvalid
 	}
-	identityNo := ""
-	if account.IdentityNoCipher != "" {
-		identityNo, err = s.decrypt(account.IdentityNoCipher)
-		if err != nil {
-			return nil, store.ErrPaymentAccountInvalid
-		}
-	}
 	digitalRMBCode := ""
 	if account.DigitalRMBCodeCipher != "" {
 		digitalRMBCode, err = s.decrypt(account.DigitalRMBCodeCipher)
@@ -471,7 +468,7 @@ func (s *Service) CreateWithdrawal(ctx context.Context, tenantID, memberID int64
 	snapshot, err := json.Marshal(map[string]any{
 		"account_type": accountTypeName(account.AccountType), "bank_code": account.BankCode,
 		"bank_name": account.BankName, "holder_name": holderName,
-		"identity_no": identityNo, "account_no": accountNo,
+		"account_no":              accountNo,
 		"digital_rmb_code":        digitalRMBCode,
 		"wechat_qr_attachment_id": account.WechatQRAttachmentID,
 		"alipay_qr_attachment_id": account.AlipayQRAttachmentID,
@@ -849,10 +846,9 @@ func (s *Service) verifyTradePassword(ctx context.Context, tenantID, memberID in
 func normalizePaymentAccount(input *PaymentAccountInput) error {
 	input.BankName = strings.TrimSpace(input.BankName)
 	input.HolderName = strings.TrimSpace(input.HolderName)
-	input.IdentityNo = strings.ToUpper(strings.NewReplacer(" ", "", "-", "").Replace(input.IdentityNo))
 	input.AccountNo = strings.NewReplacer(" ", "", "-", "").Replace(strings.TrimSpace(input.AccountNo))
 	input.DigitalRMBCode = strings.NewReplacer(" ", "", "-", "").Replace(strings.TrimSpace(input.DigitalRMBCode))
-	if !validHumanName(input.HolderName) || !identityNoPattern.MatchString(input.IdentityNo) ||
+	if !validHumanName(input.HolderName) ||
 		utf8.RuneCountInString(input.BankName) < 2 || utf8.RuneCountInString(input.BankName) > 100 ||
 		len(input.AccountNo) < 8 || len(input.AccountNo) > 32 || !allDigits(input.AccountNo) ||
 		(input.DigitalRMBCode != "" && (len(input.DigitalRMBCode) < 6 || len(input.DigitalRMBCode) > 32 || !allDigits(input.DigitalRMBCode))) ||
@@ -865,7 +861,7 @@ func normalizePaymentAccount(input *PaymentAccountInput) error {
 
 func paymentAccountFromStore(row store.PaymentAccount) PaymentAccount {
 	return PaymentAccount{ID: row.ID, AccountType: accountTypeName(row.AccountType), BankCode: row.BankCode,
-		BankName: row.BankName, HolderMask: row.HolderMask, IdentityNoMask: row.IdentityNoMask,
+		BankName: row.BankName, HolderMask: row.HolderMask,
 		AccountNoMask: row.AccountNoMask, DigitalRMBCodeMask: row.DigitalRMBCodeMask,
 		WechatQRAttachmentID: row.WechatQRAttachmentID,
 		AlipayQRAttachmentID: row.AlipayQRAttachmentID,
@@ -1042,11 +1038,17 @@ func (s *Service) decrypt(value string) (string, error) {
 	if err != nil || len(payload) <= s.aead.NonceSize() {
 		return "", errors.New("encrypted value is invalid")
 	}
-	plain, err := s.aead.Open(nil, payload[:s.aead.NonceSize()], payload[s.aead.NonceSize():], nil)
+	aeads := append([]cipher.AEAD{s.aead}, s.legacyAEADs...)
-	if err != nil {
+	for _, aead := range aeads {
-		return "", err
+		if len(payload) <= aead.NonceSize() {
+			continue
+		}
+		plain, decryptErr := aead.Open(nil, payload[:aead.NonceSize()], payload[aead.NonceSize():], nil)
+		if decryptErr == nil {
+			return string(plain), nil
+		}
 	}
-	return string(plain), nil
+	return "", errors.New("encrypted value cannot be decrypted")
 }
 
 func (s *Service) lookupHash(value string) string {
@@ -1116,13 +1118,6 @@ func maskAccount(value string) string {
 	return string(runes[:prefix]) + strings.Repeat("*", len(runes)-prefix-4) + string(runes[len(runes)-4:])
 }
 
-func maskIdentityNo(value string) string {
-	if len(value) <= 8 {
-		return strings.Repeat("*", len(value))
-	}
-	return value[:4] + strings.Repeat("*", len(value)-8) + value[len(value)-4:]
-}
-
 func validHumanName(value string) bool {
 	count := utf8.RuneCountInString(value)
 	if count < 2 || count > 64 {

internal/finance/service_test.go

@@ -135,22 +135,21 @@ func TestQuoteHonorsExplicitDisabledWithdrawalSwitch(t *testing.T) {
 
 func TestNormalizePaymentAccount(t *testing.T) {
 	input := PaymentAccountInput{BankName: "中国工商银行", HolderName: "张三",
-		IdentityNo: "11010119900101123X", AccountNo: "6222 0000-0000 1234",
+		AccountNo:            "6222 0000-0000 1234",
 		DigitalRMBCode:       "1234 5678",
 		WechatQRAttachmentID: 8, AlipayQRAttachmentID: 9}
 	if err := normalizePaymentAccount(&input); err != nil {
 		t.Fatal(err)
 	}
-	if input.IdentityNo != "11010119900101123X" || input.AccountNo != "6222000000001234" ||
+	if input.AccountNo != "6222000000001234" || input.DigitalRMBCode != "12345678" ||
-		input.DigitalRMBCode != "12345678" ||
+		maskAccount(input.AccountNo) != "6222********1234" {
-		maskAccount(input.AccountNo) != "6222********1234" || maskIdentityNo(input.IdentityNo) != "1101**********123X" {
 		t.Fatalf("unexpected normalized input: %#v", input)
 	}
 }
 
 func TestNormalizePaymentAccountAllowsEmptyDigitalRMBCode(t *testing.T) {
 	input := PaymentAccountInput{BankName: "中国工商银行", HolderName: "张三",
-		IdentityNo: "11010119900101123X", AccountNo: "6222000000001234",
+		AccountNo:            "6222000000001234",
 		WechatQRAttachmentID: 8, AlipayQRAttachmentID: 9}
 	if err := normalizePaymentAccount(&input); err != nil {
 		t.Fatalf("empty digital RMB code should be optional: %v", err)
@@ -167,11 +166,10 @@ func TestPaymentAccountDetailsReturnsOriginalFields(t *testing.T) {
 		FinanceMasterKey: "test-finance-master-key-with-at-least-32-characters",
 	})
 	holder, _ := service.encrypt("张三")
-	identity, _ := service.encrypt("11010119900101123X")
 	account, _ := service.encrypt("6222000000001234")
 	digital, _ := service.encrypt("123456")
 	repository.details = []store.PaymentAccount{{
-		ID: 7, BankName: "中国工商银行", HolderCipher: holder, IdentityNoCipher: identity,
+		ID: 7, BankName: "中国工商银行", HolderCipher: holder,
 		AccountNoCipher: account, DigitalRMBCodeCipher: digital,
 		WechatQRURL: "/wechat.png", AlipayQRURL: "/alipay.png",
 		WechatQRAttachmentID: 8, AlipayQRAttachmentID: 9, VerifyStatus: 2,
@@ -180,7 +178,7 @@ func TestPaymentAccountDetailsReturnsOriginalFields(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(items) != 1 || items[0].HolderName != "张三" || items[0].IdentityNo != "11010119900101123X" ||
+	if len(items) != 1 || items[0].HolderName != "张三" ||
 		items[0].AccountNo != "6222000000001234" || items[0].DigitalRMBCode != "123456" ||
 		items[0].WechatQRURL != "/wechat.png" || items[0].AlipayQRURL != "/alipay.png" ||
 		items[0].WechatQRAttachmentID != 8 || items[0].AlipayQRAttachmentID != 9 {
@@ -188,13 +186,38 @@ func TestPaymentAccountDetailsReturnsOriginalFields(t *testing.T) {
 	}
 }
 
+func TestPaymentAccountDetailsDecryptsWithLegacyMasterKey(t *testing.T) {
+	repository := &fakeRepository{}
+	legacyMasterKey := "legacy-finance-master-key-with-at-least-32-characters"
+	legacyService := New(repository, &redis.Client{}, config.AuthConfig{FinanceMasterKey: legacyMasterKey})
+	holder, _ := legacyService.encrypt("张三")
+	account, _ := legacyService.encrypt("6222000000001234")
+	digital, _ := legacyService.encrypt("123456")
+	repository.details = []store.PaymentAccount{{
+		ID: 7, BankName: "中国工商银行", HolderCipher: holder, AccountNoCipher: account,
+		DigitalRMBCodeCipher: digital, WechatQRAttachmentID: 8, AlipayQRAttachmentID: 9,
+	}}
+	service := New(repository, &redis.Client{}, config.AuthConfig{
+		FinanceMasterKey:        "current-finance-master-key-with-at-least-32-characters",
+		FinanceLegacyMasterKeys: []string{legacyMasterKey},
+	})
+	items, err := service.PaymentAccountDetails(context.Background(), 1, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(items) != 1 || items[0].Masked || items[0].HolderName != "张三" ||
+		items[0].AccountNo != "6222000000001234" || items[0].DigitalRMBCode != "123456" {
+		t.Fatalf("unexpected legacy account details: %#v", items)
+	}
+}
+
 func TestUpdatePaymentAccountEncryptsEditedFields(t *testing.T) {
 	repository := &paymentAccountRepository{}
 	service := New(repository, &redis.Client{}, config.AuthConfig{
 		FinanceMasterKey: "test-finance-master-key-with-at-least-32-characters",
 	})
 	result, err := service.UpdatePaymentAccount(context.Background(), 1, 2, PaymentAccountInput{
-		ID: 7, BankName: "中国工商银行", HolderName: "李四", IdentityNo: "11010119900101123X",
+		ID: 7, BankName: "中国工商银行", HolderName: "李四",
 		AccountNo: "6222000000001234", WechatQRAttachmentID: 8, AlipayQRAttachmentID: 9,
 	})
 	if err != nil {
@@ -226,7 +249,7 @@ func TestPaymentAccountDetailsFallsBackToMasksWhenHistoricalKeyIsUnavailable(t *
 		t.Fatal(err)
 	}
 	if len(items) != 1 || !items[0].Masked || items[0].HolderName != "张*" ||
-		items[0].IdentityNo != "1101**********123X" || items[0].AccountNo != "6222********1234" ||
+		items[0].AccountNo != "6222********1234" ||
 		items[0].DigitalRMBCode != "12****78" {
 		t.Fatalf("unexpected masked fallback: %#v", items)
 	}
@@ -238,7 +261,7 @@ func TestCreatePaymentAccountDoesNotStoreEmptyDigitalRMBCode(t *testing.T) {
 		FinanceMasterKey: "test-finance-master-key-with-at-least-32-characters",
 	})
 	_, err := service.CreatePaymentAccount(context.Background(), 0, 1, PaymentAccountInput{
-		BankName: "中国工商银行", HolderName: "张三", IdentityNo: "11010119900101123X",
+		BankName: "中国工商银行", HolderName: "张三",
 		AccountNo: "6222000000001234", WechatQRAttachmentID: 8, AlipayQRAttachmentID: 9,
 	})
 	if err != nil {
@@ -247,6 +270,9 @@ func TestCreatePaymentAccountDoesNotStoreEmptyDigitalRMBCode(t *testing.T) {
 	if repository.created.DigitalRMBCodeCipher != "" || repository.created.DigitalRMBCodeHash != "" || repository.created.DigitalRMBCodeMask != "" {
 		t.Fatalf("empty digital RMB code must not be encrypted, hashed or masked: %#v", repository.created)
 	}
+	if repository.created.IdentityNoCipher != "" || repository.created.IdentityNoHash != "" || repository.created.IdentityNoMask != "" {
+		t.Fatalf("identity number must no longer be collected: %#v", repository.created)
+	}
 }
 
 func TestMaskAccountShortValueDoesNotLeak(t *testing.T) {

internal/imclient/client.go

@@ -25,6 +25,8 @@ import (
 
 const maxResponseBody = 2 << 20
 
+const defaultIMTenantCode = "default"
+
 type Error struct {
 	Status  int
 	Code    int
@@ -105,6 +107,11 @@ type Conversation struct {
 	CanSend      bool   `json:"can_send"`
 }
 
+type DirectFriendResult struct {
+	Relationship string `json:"relationship"`
+	Topic        string `json:"topic"`
+}
+
 func New(cfg config.IMConfig) *Client {
 	timeout := cfg.Timeout
 	if timeout <= 0 {
@@ -181,9 +188,13 @@ func (c *Client) LoginBasic(ctx context.Context, username, password, deviceID, p
 	}
 	loginID := "login-" + requestID()
 	secret := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
+	loginType := 0
+	if strings.EqualFold(strings.TrimSpace(c.cfg.TenantCode), defaultIMTenantCode) {
+		loginType = 1
+	}
 	if err = conn.WriteJSON(map[string]any{"login": map[string]any{
 		"id": loginID, "scheme": "basic", "secret": secret,
-		"login_type": 0, "tenant_code": c.cfg.TenantCode,
+		"login_type": loginType, "tenant_code": c.cfg.TenantCode,
 	}}); err != nil {
 		return nil, err
 	}
@@ -223,6 +234,18 @@ func (c *Client) CreateFriendRequest(ctx context.Context, token, userID, idempot
 	return &out, err
 }
 
+// AddFriendDirect establishes a trusted server-side friendship without
+// creating a user-visible friend request. The IM internal API authenticates
+// this operation with the configured internal secret.
+func (c *Client) AddFriendDirect(ctx context.Context, userID, peerUserID string) (*DirectFriendResult, error) {
+	var out DirectFriendResult
+	path := "/internal/admin-query/tenants/" + url.PathEscape(c.cfg.TenantCode) + "/friends/direct"
+	err := c.internalJSON(ctx, http.MethodPost, path, map[string]any{
+		"user_id": userID, "peer_user_id": peerUserID,
+	}, &out)
+	return &out, err
+}
+
 func (c *Client) EnsureP2P(ctx context.Context, token, userID, idempotencyKey string) (*Conversation, error) {
 	var out Conversation
 	err := c.productJSON(ctx, http.MethodPost, "/conversations/p2p", token, idempotencyKey,
@@ -382,6 +405,17 @@ func IsConflict(err error) bool {
 	return errors.As(err, &target) && target.Status == http.StatusConflict
 }
 
+func IsFriendRequestConflict(err error) bool {
+	var target *Error
+	return errors.As(err, &target) && target.Status == http.StatusConflict &&
+		strings.EqualFold(strings.TrimSpace(target.Reason), "FRIEND_REQUEST_CONFLICT")
+}
+
+func IsPermissionDenied(err error) bool {
+	var target *Error
+	return errors.As(err, &target) && target.Status == http.StatusForbidden
+}
+
 // IsAuthenticationFailed reports whether the IM server rejected user
 // credentials. Callers may use this to repair credentials which have drifted
 // from the local encrypted copy, while leaving transport failures untouched.

internal/imclient/client_test.go

@@ -52,6 +52,46 @@ func TestCreateUserAcceptsNumericIDAndSignsRequest(t *testing.T) {
 	}
 }
 
+func TestAddFriendDirectUsesSignedInternalAPI(t *testing.T) {
+	const secret = "internal-secret"
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		body, _ := io.ReadAll(r.Body)
+		if r.Method != http.MethodPost || r.URL.Path != "/internal/admin-query/tenants/default/friends/direct" {
+			t.Fatalf("unexpected request %s %s", r.Method, r.URL.Path)
+		}
+		if r.Header.Get("X-Service-Name") != "olons-server" {
+			t.Fatal("missing service header")
+		}
+		canonical := strings.Join([]string{r.Method, r.URL.RequestURI(), hashHex(body),
+			r.Header.Get("X-Timestamp"), r.Header.Get("X-Nonce")}, "\n")
+		mac := hmac.New(sha256.New, []byte(secret))
+		_, _ = mac.Write([]byte(canonical))
+		if r.Header.Get("X-Signature") != hex.EncodeToString(mac.Sum(nil)) {
+			t.Fatal("invalid signature")
+		}
+		var payload map[string]string
+		if err := json.Unmarshal(body, &payload); err != nil {
+			t.Fatal(err)
+		}
+		if payload["user_id"] != "usr_member" || payload["peer_user_id"] != "usr_agent" {
+			t.Fatalf("unexpected direct friendship payload: %+v", payload)
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"code":0,"data":{"relationship":"friend","topic":"p2pAB"}}`))
+	}))
+	defer server.Close()
+
+	client := New(config.IMConfig{BaseURL: server.URL, TenantCode: "default",
+		InternalService: "olons-server", InternalSecret: secret, Timeout: time.Second})
+	result, err := client.AddFriendDirect(context.Background(), "usr_member", "usr_agent")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result.Relationship != "friend" || result.Topic != "p2pAB" {
+		t.Fatalf("unexpected direct friendship result: %+v", result)
+	}
+}
+
 func TestProductRequestHeaders(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Header.Get("Authorization") != "Bearer user-token" || r.Header.Get("X-MeetingIM-APIKey") != "public-key" {
@@ -120,6 +160,39 @@ func TestLoginBasicUsesExistingWebSocketProtocol(t *testing.T) {
 	}
 }
 
+func TestLoginBasicUsesPersonalTypeForDefaultTenant(t *testing.T) {
+	upgrader := websocket.Upgrader{}
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		conn, err := upgrader.Upgrade(w, r, nil)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer conn.Close()
+		var packet map[string]map[string]any
+		if err = conn.ReadJSON(&packet); err != nil {
+			t.Fatal(err)
+		}
+		_ = conn.WriteJSON(map[string]any{"ctrl": map[string]any{"id": packet["hi"]["id"], "code": 201, "text": "created"}})
+		if err = conn.ReadJSON(&packet); err != nil {
+			t.Fatal(err)
+		}
+		login := packet["login"]
+		if login["login_type"] != float64(1) || login["tenant_code"] != defaultIMTenantCode {
+			t.Fatalf("unexpected login: %#v", login)
+		}
+		_ = conn.WriteJSON(map[string]any{"ctrl": map[string]any{"id": login["id"], "code": 200, "text": "ok",
+			"params": map[string]any{"user": "usr_member", "token": "token", "expires": "2026-10-27T10:00:00Z"}}})
+	}))
+	defer server.Close()
+
+	client := New(config.IMConfig{BaseURL: server.URL, HTTPAPIURL: server.URL,
+		WebSocketURL: "ws" + strings.TrimPrefix(server.URL, "http"), TenantCode: defaultIMTenantCode,
+		APIKey: "public-key", InternalService: "olons-server", InternalSecret: "secret", Timeout: time.Second})
+	if _, err := client.LoginBasic(context.Background(), "member01", "password", "web-1", "web"); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestResetPasswordSendsBase64BcryptHash(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var body struct {

internal/store/portal.go

@@ -256,7 +256,7 @@ func (s *Store) TaskLeaderboard(ctx context.Context, tenantID int64, limit int)
 		LEFT JOIN hg_sys_attachment a ON a.id=p.avatar_attachment_id AND a.status=1
 		JOIN hg_trade_order o ON o.tenant_id=m.tenant_id AND o.member_id=m.id
 			AND o.order_type=2 AND o.order_status=4
-		WHERE m.tenant_id=? AND m.member_status=1 AND m.deleted_at IS NULL
+		WHERE m.tenant_id=? AND m.member_status=1 AND m.is_test_account=2 AND m.deleted_at IS NULL
 		GROUP BY m.id,m.username,a.file_url
 		ORDER BY claimed_points DESC,m.id ASC LIMIT ?`, tenantID, limit)
 	return rows, err

internal/store/support.go

@@ -37,13 +37,14 @@ func (s *Store) CustomerServiceByID(ctx context.Context, tenantID, serviceID int
 	return &row, err
 }
 
-func (s *Store) MemberIMIdentity(ctx context.Context, tenantID, memberID int64) (*MemberIMIdentity, error) {
+func (s *Store) MemberIMIdentityForTenant(ctx context.Context, tenantID, memberID int64, imTenantCode string) (*MemberIMIdentity, error) {
 	if s == nil || s.db == nil {
 		return nil, errors.New("store is unavailable")
 	}
 	var row MemberIMIdentity
 	err := s.db.GetContext(ctx, &row, `SELECT id,tenant_id,member_id,im_tenant_code,im_user_id,im_username,im_password_cipher
-		FROM hg_app_member_im_identity WHERE tenant_id=? AND member_id=? LIMIT 1`, tenantID, memberID)
+		FROM hg_app_member_im_identity WHERE tenant_id=? AND member_id=? AND im_tenant_code=? LIMIT 1`,
+		tenantID, memberID, imTenantCode)
 	if errors.Is(err, sql.ErrNoRows) {
 		return nil, ErrResourceNotFound
 	}
@@ -77,10 +78,10 @@ func (s *Store) SaveMemberIMIdentity(ctx context.Context, identity *MemberIMIden
 		im_password_cipher=VALUES(im_password_cipher),sync_status=1,last_error='',updated_at=UTC_TIMESTAMP(3)`,
 		identity.TenantID, identity.MemberID, identity.IMTenantCode, identity.IMUserID, identity.IMUsername, identity.IMPasswordCipher)
 	if err == nil {
-		return s.MemberIMIdentity(ctx, identity.TenantID, identity.MemberID)
+		return s.MemberIMIdentityForTenant(ctx, identity.TenantID, identity.MemberID, identity.IMTenantCode)
 	}
 	// A concurrent request may have completed the same deterministic mapping.
-	existing, findErr := s.MemberIMIdentity(ctx, identity.TenantID, identity.MemberID)
+	existing, findErr := s.MemberIMIdentityForTenant(ctx, identity.TenantID, identity.MemberID, identity.IMTenantCode)
 	if findErr == nil {
 		return existing, nil
 	}

internal/support/service.go

@@ -20,7 +20,7 @@ import (
 
 type Repository interface {
 	CustomerServiceByID(context.Context, int64, int64) (*store.CustomerService, error)
-	MemberIMIdentity(context.Context, int64, int64) (*store.MemberIMIdentity, error)
+	MemberIMIdentityForTenant(context.Context, int64, int64, string) (*store.MemberIMIdentity, error)
 	MemberIMProfile(context.Context, int64, int64) (*store.MemberIMProfile, error)
 	SaveMemberIMIdentity(context.Context, *store.MemberIMIdentity) (*store.MemberIMIdentity, error)
 }
@@ -33,7 +33,7 @@ type IM interface {
 	LoginBasic(context.Context, string, string, string, string) (*imclient.Session, error)
 	ResetPassword(context.Context, string, string) error
 	UserProfile(context.Context, string, string) (*imclient.UserProfile, error)
-	CreateFriendRequest(context.Context, string, string, string) (*imclient.FriendRequest, error)
+	AddFriendDirect(context.Context, string, string) (*imclient.DirectFriendResult, error)
 	EnsureP2P(context.Context, string, string, string) (*imclient.Conversation, error)
 }
 
@@ -70,6 +70,12 @@ type Session struct {
 	Agent         Agent     `json:"agent"`
 }
 
+const (
+	publicIMAPIPath       = "/v1/im"
+	publicIMWebSocketPath = "/v0/channels"
+	publicIMFilePath      = "/v0/file"
+)
+
 func New(repository Repository, im IM, authConfig config.AuthConfig) *Service {
 	return &Service{repository: repository, im: im, aead: credentialAEAD(authConfig)}
 }
@@ -120,32 +126,24 @@ func (s *Service) OpenSession(ctx context.Context, tenantID, memberID, serviceID
 		return nil, ErrIMUnavailable
 	}
 	profile, err := s.im.UserProfile(ctx, imSession.Token, agent.IMUserID)
+	relationship := ""
 	if err != nil {
-		return nil, fmt.Errorf("query customer service relationship: %w", err)
+		if !imclient.IsPermissionDenied(err) {
+			return nil, fmt.Errorf("query customer service relationship: %w", err)
+		}
+		relationship = "unknown"
+	} else {
+		relationship = strings.TrimSpace(profile.Relationship)
 	}
-	relationship := strings.TrimSpace(profile.Relationship)
 	switch relationship {
 	case "friend":
-	case "none", "":
+	case "none", "", "pending_inbound", "pending_outbound", "pending", "unknown":
-		key := fmt.Sprintf("customer-service:%d:%d:%d", tenantID, memberID, serviceID)
+		if _, err = s.im.AddFriendDirect(ctx, identity.IMUserID, agent.IMUserID); err != nil {
-		request, requestErr := s.im.CreateFriendRequest(ctx, imSession.Token, agent.IMUserID, key)
+			if imclient.IsPermissionDenied(err) || imclient.IsConflict(err) {
-		if requestErr != nil && !imclient.IsConflict(requestErr) {
+				return nil, ErrRelationDenied
-			return nil, fmt.Errorf("create customer service friend request: %w", requestErr)
-		}
-		if requestErr != nil {
-			profile, err = s.im.UserProfile(ctx, imSession.Token, agent.IMUserID)
-			if err != nil {
-				return nil, fmt.Errorf("refresh customer service relationship: %w", err)
 			}
-			relationship = strings.TrimSpace(profile.Relationship)
+			return nil, fmt.Errorf("add customer service as friend: %w", err)
-		} else {
-			relationship = strings.TrimSpace(request.Status)
 		}
-		if relationship != "accepted" && relationship != "friend" {
-			return nil, ErrRelationPending
-		}
-	case "pending_inbound", "pending_outbound", "pending":
-		return nil, ErrRelationPending
 	default:
 		return nil, ErrRelationDenied
 	}
@@ -158,8 +156,8 @@ func (s *Service) OpenSession(ctx context.Context, tenantID, memberID, serviceID
 		return nil, ErrRelationDenied
 	}
 	return &Session{
-		TenantCode: cfg.TenantCode, APIBaseURL: cfg.HTTPAPIURL, WebSocketURL: cfg.WebSocketURL,
+		TenantCode: cfg.TenantCode, APIBaseURL: publicIMAPIPath, WebSocketURL: publicIMWebSocketPath,
-		FileURL: cfg.FileURL, APIKey: cfg.APIKey, Token: imSession.Token, ExpiresAt: imSession.ExpiresAt,
+		FileURL: publicIMFilePath, APIKey: cfg.APIKey, Token: imSession.Token, ExpiresAt: imSession.ExpiresAt,
 		CurrentUserID: imSession.UserID, Topic: conversation.Topic, Relationship: "friend",
 		Agent: Agent{ID: agent.ID, IMUserID: agent.IMUserID, Name: agent.Name, AvatarURL: agent.AvatarURL,
 			OnlineStatus: customerServiceStatus(agent.OnlineStatus)},
@@ -167,9 +165,9 @@ func (s *Service) OpenSession(ctx context.Context, tenantID, memberID, serviceID
 }
 
 func (s *Service) ensureIdentity(ctx context.Context, tenantID, memberID int64, imTenantCode string) (*store.MemberIMIdentity, error) {
-	identity, err := s.repository.MemberIMIdentity(ctx, tenantID, memberID)
+	identity, err := s.repository.MemberIMIdentityForTenant(ctx, tenantID, memberID, imTenantCode)
 	if err == nil {
-		if !strings.EqualFold(identity.IMTenantCode, imTenantCode) || identity.IMUserID == "" || identity.IMUsername == "" {
+		if identity.IMUserID == "" || identity.IMUsername == "" {
 			return nil, ErrIMUnavailable
 		}
 		if identity.IMPasswordCipher != "" {
@@ -180,6 +178,10 @@ func (s *Service) ensureIdentity(ctx context.Context, tenantID, memberID int64,
 	if !errors.Is(err, store.ErrResourceNotFound) {
 		return nil, err
 	}
+	return s.createIdentity(ctx, tenantID, memberID, imTenantCode)
+}
+
+func (s *Service) createIdentity(ctx context.Context, tenantID, memberID int64, imTenantCode string) (*store.MemberIMIdentity, error) {
 	member, err := s.repository.MemberIMProfile(ctx, tenantID, memberID)
 	if err != nil {
 		return nil, err
@@ -214,7 +216,7 @@ func (s *Service) ensureIdentity(ctx context.Context, tenantID, memberID int64,
 	if err != nil {
 		return nil, err
 	}
-	identity = &store.MemberIMIdentity{TenantID: tenantID, MemberID: memberID, IMTenantCode: imTenantCode,
+	identity := &store.MemberIMIdentity{TenantID: tenantID, MemberID: memberID, IMTenantCode: imTenantCode,
 		IMUserID: issued.UserID, IMUsername: created.Username, IMPasswordCipher: ciphertext}
 	return s.repository.SaveMemberIMIdentity(ctx, identity)
 }

internal/support/service_test.go

@@ -2,6 +2,7 @@ package support
 
 import (
 	"context"
+	"errors"
 	"strings"
 	"testing"
 	"time"
@@ -12,28 +13,44 @@ import (
 )
 
 type repositoryStub struct {
-	agent    *store.CustomerService
+	agent                 *store.CustomerService
-	identity *store.MemberIMIdentity
+	identity              *store.MemberIMIdentity
+	profile               *store.MemberIMProfile
+	requestedIMTenantCode string
 }
 
 func (r *repositoryStub) CustomerServiceByID(context.Context, int64, int64) (*store.CustomerService, error) {
 	return r.agent, nil
 }
-func (r *repositoryStub) MemberIMIdentity(context.Context, int64, int64) (*store.MemberIMIdentity, error) {
+func (r *repositoryStub) MemberIMIdentityForTenant(_ context.Context, _, _ int64, imTenantCode string) (*store.MemberIMIdentity, error) {
+	r.requestedIMTenantCode = imTenantCode
+	if r.identity == nil || !strings.EqualFold(r.identity.IMTenantCode, imTenantCode) {
+		return nil, store.ErrResourceNotFound
+	}
 	return r.identity, nil
 }
 func (r *repositoryStub) MemberIMProfile(context.Context, int64, int64) (*store.MemberIMProfile, error) {
-	return nil, store.ErrResourceNotFound
+	if r.profile == nil {
+		return nil, store.ErrResourceNotFound
+	}
+	return r.profile, nil
 }
-func (r *repositoryStub) SaveMemberIMIdentity(context.Context, *store.MemberIMIdentity) (*store.MemberIMIdentity, error) {
+func (r *repositoryStub) SaveMemberIMIdentity(_ context.Context, identity *store.MemberIMIdentity) (*store.MemberIMIdentity, error) {
+	copy := *identity
+	r.identity = &copy
 	return r.identity, nil
 }
 
 type imStub struct {
-	friendRequests int
+	directFriendAdds int
-	loginAttempts  int
+	loginAttempts    int
-	resetPasswords int
+	resetPasswords   int
-	loginError     error
+	loginError       error
+	profileError     error
+	friendError      error
+	conversation     *imclient.Conversation
+	conversationErr  error
+	ensureP2PCalls   int
 }
 
 func (i *imStub) Ready() bool { return true }
@@ -41,8 +58,8 @@ func (i *imStub) Config() config.IMConfig {
 	return config.IMConfig{TenantCode: "allrich", HTTPAPIURL: "https://api.118im.com/v1/im",
 		WebSocketURL: "wss://api.118im.com/v0/channels", FileURL: "https://api.118im.com/v0/file", APIKey: "key"}
 }
-func (i *imStub) CreateUser(context.Context, string, string, string) (*imclient.CreatedUser, error) {
+func (i *imStub) CreateUser(_ context.Context, username, nickname, _ string) (*imclient.CreatedUser, error) {
-	return nil, nil
+	return &imclient.CreatedUser{UserID: imclient.FlexibleID("1001"), Username: username, Nickname: nickname}, nil
 }
 func (i *imStub) FindUserByUsername(context.Context, string) (*imclient.CreatedUser, error) {
 	return nil, nil
@@ -61,13 +78,26 @@ func (i *imStub) ResetPassword(context.Context, string, string) error {
 	return nil
 }
 func (i *imStub) UserProfile(context.Context, string, string) (*imclient.UserProfile, error) {
+	if i.profileError != nil {
+		return nil, i.profileError
+	}
 	return &imclient.UserProfile{UserID: "usr_agent", Relationship: "none"}, nil
 }
-func (i *imStub) CreateFriendRequest(context.Context, string, string, string) (*imclient.FriendRequest, error) {
+func (i *imStub) AddFriendDirect(context.Context, string, string) (*imclient.DirectFriendResult, error) {
-	i.friendRequests++
+	i.directFriendAdds++
-	return &imclient.FriendRequest{RequestID: "frq_1", Status: "accepted"}, nil
+	if i.friendError != nil {
+		return nil, i.friendError
+	}
+	return &imclient.DirectFriendResult{Relationship: "friend", Topic: "p2p-topic"}, nil
 }
 func (i *imStub) EnsureP2P(context.Context, string, string, string) (*imclient.Conversation, error) {
+	i.ensureP2PCalls++
+	if i.conversationErr != nil {
+		return nil, i.conversationErr
+	}
+	if i.conversation != nil {
+		return i.conversation, nil
+	}
 	return &imclient.Conversation{Topic: "p2p-topic", Relationship: "friend", CanSend: true}, nil
 }
 
@@ -86,8 +116,48 @@ func TestOpenSessionAutoAcceptsAndReturnsTopic(t *testing.T) {
 	if session.Topic != "p2p-topic" || session.CurrentUserID != "usr_member" || session.Agent.IMUserID != "usr_agent" {
 		t.Fatalf("unexpected session: %+v", session)
 	}
-	if im.friendRequests != 1 {
+	if im.directFriendAdds != 1 {
-		t.Fatalf("friend requests = %d, want 1", im.friendRequests)
+		t.Fatalf("direct friend adds = %d, want 1", im.directFriendAdds)
+	}
+}
+
+func TestOpenSessionReturnsSameOriginEndpoints(t *testing.T) {
+	repository := &repositoryStub{
+		agent:    &store.CustomerService{ID: 3, Name: "客服01", IMTenantCode: "allrich", IMUserID: "usr_agent", OnlineStatus: 1},
+		identity: &store.MemberIMIdentity{TenantID: 0, MemberID: 9, IMTenantCode: "allrich", IMUserID: "usr_member", IMUsername: "member01"},
+	}
+	im := &imStub{}
+	service := New(repository, im, config.AuthConfig{FinanceMasterKey: strings.Repeat("k", 32)})
+	repository.identity.IMPasswordCipher, _ = service.encryptCredential("password")
+
+	session, err := service.OpenSession(context.Background(), 0, 9, 3, SessionRequest{DeviceID: "web-1", Platform: "web"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if session.APIBaseURL != "/v1/im" || session.WebSocketURL != "/v0/channels" || session.FileURL != "/v0/file" {
+		t.Fatalf("browser endpoints must be same-origin paths: %+v", session)
+	}
+}
+
+func TestOpenSessionDeniesWhenDirectFriendshipIsBlocked(t *testing.T) {
+	repository := &repositoryStub{
+		agent:    &store.CustomerService{ID: 3, Name: "客服01", IMTenantCode: "allrich", IMUserID: "usr_agent", OnlineStatus: 1},
+		identity: &store.MemberIMIdentity{TenantID: 0, MemberID: 9, IMTenantCode: "allrich", IMUserID: "usr_member", IMUsername: "member01"},
+	}
+	im := &imStub{
+		profileError:    &imclient.Error{Status: 403, Reason: "PERMISSION_DENIED"},
+		friendError:     &imclient.Error{Status: 403, Reason: "PERMISSION_DENIED"},
+		conversationErr: &imclient.Error{Status: 403, Reason: "PERMISSION_DENIED"},
+	}
+	service := New(repository, im, config.AuthConfig{FinanceMasterKey: strings.Repeat("k", 32)})
+	repository.identity.IMPasswordCipher, _ = service.encryptCredential("password")
+
+	_, err := service.OpenSession(context.Background(), 0, 9, 3, SessionRequest{DeviceID: "web-1", Platform: "web"})
+	if !errors.Is(err, ErrRelationDenied) {
+		t.Fatalf("error = %v, want ErrRelationDenied", err)
+	}
+	if im.ensureP2PCalls != 0 || im.directFriendAdds != 1 {
+		t.Fatalf("ensure p2p calls=%d direct friend adds=%d, want 0 and 1", im.ensureP2PCalls, im.directFriendAdds)
 	}
 }
 
@@ -123,3 +193,41 @@ func TestMemberIMUsernameMatchesIMConstraint(t *testing.T) {
 		}
 	}
 }
+
+func TestEnsureIdentityReprovisionsMemberWhenIMTenantChanges(t *testing.T) {
+	repository := &repositoryStub{
+		identity: &store.MemberIMIdentity{TenantID: 0, MemberID: 9, IMTenantCode: "allrich", IMUserID: "usr_old", IMUsername: "olduser"},
+		profile:  &store.MemberIMProfile{MemberID: 9, Username: "member01"},
+	}
+	im := &imStub{}
+	service := New(repository, im, config.AuthConfig{FinanceMasterKey: strings.Repeat("k", 32)})
+	identity, err := service.ensureIdentity(context.Background(), 0, 9, "default")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if identity.IMTenantCode != "default" || identity.IMUserID != "usr_member" || identity.IMUsername != memberIMUsername(0, 9, "default") {
+		t.Fatalf("unexpected migrated identity: %+v", identity)
+	}
+	if im.loginAttempts != 1 {
+		t.Fatalf("provisioning login attempts = %d, want 1", im.loginAttempts)
+	}
+}
+
+func TestEnsureIdentityQueriesTheActiveIMTenantMapping(t *testing.T) {
+	repository := &repositoryStub{
+		identity: &store.MemberIMIdentity{TenantID: 0, MemberID: 9, IMTenantCode: "allrich", IMUserID: "usr_old", IMUsername: "olduser"},
+		profile:  &store.MemberIMProfile{MemberID: 9, Username: "member01"},
+	}
+	im := &imStub{}
+	service := New(repository, im, config.AuthConfig{FinanceMasterKey: strings.Repeat("k", 32)})
+	identity, err := service.ensureIdentity(context.Background(), 0, 9, "default")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if repository.requestedIMTenantCode != "default" {
+		t.Fatalf("queried IM tenant = %q, want default", repository.requestedIMTenantCode)
+	}
+	if identity.IMTenantCode != "default" {
+		t.Fatalf("identity tenant = %q, want default", identity.IMTenantCode)
+	}
+}

tests/test_actions_workflow.py

@@ -26,14 +26,31 @@ class DeployWorkflowContractTest(unittest.TestCase):
         self.assertIn("DEPLOY_SSH_KEY", self.workflow)
         self.assertIn("DEPLOY_KNOWN_HOSTS", self.workflow)
         self.assertIn("StrictHostKeyChecking=yes", self.workflow)
-        self.assertIn("docker compose pull olons-server", self.workflow)
+        self.assertIn("pull olons-server", self.workflow)
-        self.assertIn("docker compose up -d --no-deps --wait olons-server", self.workflow)
+        self.assertIn("up -d --no-deps --wait olons-server", self.workflow)
 
     def test_removes_old_kubernetes_and_registry_targets(self):
         self.assertNotIn("kubectl", self.workflow)
         self.assertNotIn("KUBECONFIG", self.workflow)
         self.assertNotIn("git.118im.com", self.workflow)
 
+    def test_uses_internal_im_endpoints_for_server_calls(self):
+        self.assertIn('"$OLONS_IM_BASE_URL" = "http://im-server:6060"', self.workflow)
+        self.assertIn('"$OLONS_IM_HTTP_API_URL" = "http://im-server:6060/v1/im"', self.workflow)
+        self.assertIn('"$OLONS_IM_WS_URL" = "ws://im-server:6060/v0/channels"', self.workflow)
+        self.assertIn('"$OLONS_IM_FILE_URL" = "http://im-server:6060/v0/file"', self.workflow)
+        self.assertNotIn("OLONS_IM_BASE_URL=https://im-api.yuexuan.shop", self.workflow)
+
+    def test_deploy_uses_managed_compose_environment_without_secret_overlay(self):
+        self.assertNotIn(".env.olons-server", self.workflow)
+        self.assertNotIn("compose.olons-server-secret.yaml", self.workflow)
+        self.assertNotIn("INTERNAL_API_HOTGO_SECRET", self.workflow)
+        self.assertNotIn("OLONS_IM_API_KEY=", self.workflow)
+        self.assertIn("docker compose pull olons-server", self.workflow)
+        self.assertIn("docker compose up -d --no-deps --wait olons-server", self.workflow)
+        self.assertIn('test "$OLONS_IM_TENANT_CODE" = "default"', self.workflow)
+        self.assertIn('test "$OLONS_SERVER_DEFAULT_TENANT_ID" = "0"', self.workflow)
+
 if __name__ == "__main__":
     unittest.main()
 

tests/test_deployment_contract.py

@@ -9,9 +9,10 @@ class DeploymentContractTest(unittest.TestCase):
     def test_workflow_targets_only_olons_server(self):
         workflow = (ROOT / ".gitea/workflows/deploy.yml").read_text()
 
-        self.assertIn("Deploy olons-server (k3s test cluster)", workflow)
+        self.assertIn("Deploy olons-server production", workflow)
-        self.assertIn("git.118im.com/im_team/olons-server:", workflow)
+        self.assertIn("git.olns.shop/pro/olons_server", workflow)
-        self.assertIn("deployment/olons-server -n olons-server-system", workflow)
+        self.assertIn("pull olons-server", workflow)
+        self.assertIn("up -d --no-deps --wait olons-server", workflow)
         self.assertNotIn("im-workbench", workflow)
         self.assertNotIn("workbench-system", workflow)
 

web/package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest run"
   },
   "dependencies": {
     "@vicons/ionicons5": "^0.12.0",
@@ -20,7 +21,8 @@
     "@types/node": "^22.5.2",
     "@vitejs/plugin-vue": "^5.1.3",
     "typescript": "^5.5.4",
-    "vite": "^5.4.2"
+    "vite": "^5.4.2",
+    "vitest": "^2.1.9"
   },
   "engines": {
     "node": ">=18"

web/pnpm-lock.yaml

@@ -13,7 +13,7 @@ importers:
         version: 0.12.0
       axios:
         specifier: ^1.7.7
-        version: 1.7.7
+        version: 1.7.7(debug@4.4.3)
       naive-ui:
         specifier: ^2.44.1
         version: 2.45.3(vue@3.4.38(typescript@5.5.4))
@@ -39,6 +39,9 @@ importers:
       vite:
         specifier: ^5.4.2
         version: 5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6)
+      vitest:
+        specifier: ^2.1.9
+        version: 2.1.9(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6)
 
 packages:
 
@@ -225,9 +228,6 @@ packages:
   '@jridgewell/source-map@0.3.6':
     resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
 
-  '@jridgewell/sourcemap-codec@1.5.0':
-    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
-
   '@jridgewell/sourcemap-codec@1.5.5':
     resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
 
@@ -348,6 +348,35 @@ packages:
       vite: ^5.0.0
       vue: ^3.2.25
 
+  '@vitest/expect@2.1.9':
+    resolution: {integrity: sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==}
+
+  '@vitest/mocker@2.1.9':
+    resolution: {integrity: sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==}
+    peerDependencies:
+      msw: ^2.4.9
+      vite: ^5.0.0
+    peerDependenciesMeta:
+      msw:
+        optional: true
+      vite:
+        optional: true
+
+  '@vitest/pretty-format@2.1.9':
+    resolution: {integrity: sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==}
+
+  '@vitest/runner@2.1.9':
+    resolution: {integrity: sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==}
+
+  '@vitest/snapshot@2.1.9':
+    resolution: {integrity: sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==}
+
+  '@vitest/spy@2.1.9':
+    resolution: {integrity: sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==}
+
+  '@vitest/utils@2.1.9':
+    resolution: {integrity: sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==}
+
   '@vue/compiler-core@3.4.38':
     resolution: {integrity: sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==}
 
@@ -385,6 +414,10 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  assertion-error@2.0.1:
+    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
+    engines: {node: '>=12'}
+
   async-validator@4.2.5:
     resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
 
@@ -397,6 +430,18 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
+  cac@6.7.14:
+    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
+    engines: {node: '>=8'}
+
+  chai@5.3.3:
+    resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==}
+    engines: {node: '>=18'}
+
+  check-error@2.1.3:
+    resolution: {integrity: sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==}
+    engines: {node: '>= 16'}
+
   combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
@@ -424,6 +469,19 @@ packages:
   date-fns@4.4.0:
     resolution: {integrity: sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==}
 
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  deep-eql@5.0.2:
+    resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
+    engines: {node: '>=6'}
+
   delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
@@ -436,6 +494,9 @@ packages:
     resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
     hasBin: true
 
+  es-module-lexer@1.7.0:
+    resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
+
   esbuild@0.21.5:
     resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
     engines: {node: '>=12'}
@@ -444,9 +505,16 @@ packages:
   estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
+  estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+
   evtd@0.2.4:
     resolution: {integrity: sha512-qaeGN5bx63s/AXgQo8gj6fBkxge+OoLddLniox5qtLAEY5HSnuSlISXVPxnSae1dWblvTh4/HoMIB+mbMsvZzw==}
 
+  expect-type@1.4.0:
+    resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==}
+    engines: {node: '>=12.0.0'}
+
   follow-redirects@1.15.6:
     resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
     engines: {node: '>=4.0'}
@@ -495,9 +563,15 @@ packages:
   lodash@4.18.1:
     resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==}
 
+  loupe@3.2.1:
+    resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==}
+
   magic-string@0.30.11:
     resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
 
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
+
   make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
     engines: {node: '>=6'}
@@ -515,6 +589,9 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
   naive-ui@2.45.3:
     resolution: {integrity: sha512-D83gJ+6zUdkQ5DuUbmlfyaM1t8pV5WMPa6KmL9mByqQuiL12qBdA0n/iEIth4dQw1x/duNGpOS2anpt5FKO1kw==}
     engines: {node: '>=20'}
@@ -535,6 +612,13 @@ packages:
     resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
     engines: {node: '>= 0.10'}
 
+  pathe@1.1.2:
+    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+
+  pathval@2.0.1:
+    resolution: {integrity: sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==}
+    engines: {node: '>= 14.16'}
+
   picocolors@1.1.0:
     resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
 
@@ -570,6 +654,9 @@ packages:
     resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
     hasBin: true
 
+  siginfo@2.0.0:
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
+
   source-map-js@1.2.0:
     resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
     engines: {node: '>=0.10.0'}
@@ -581,6 +668,12 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
+  stackback@0.0.2:
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
+
+  std-env@3.10.0:
+    resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==}
+
   terser@5.31.6:
     resolution: {integrity: sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==}
     engines: {node: '>=10'}
@@ -589,6 +682,24 @@ packages:
   tinode-sdk@0.25.4:
     resolution: {integrity: sha512-EFWWR3JDFH1oognJT3K8vH6l7TmcOqblvqx3FwiRY1RAsSUypxOzGfWMZZo0nfc7EmjK3SogRgqNWH6NxLS5+w==}
 
+  tinybench@2.9.0:
+    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
+
+  tinyexec@0.3.2:
+    resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
+
+  tinypool@1.1.1:
+    resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+
+  tinyrainbow@1.2.0:
+    resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==}
+    engines: {node: '>=14.0.0'}
+
+  tinyspy@3.0.2:
+    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
+    engines: {node: '>=14.0.0'}
+
   to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
@@ -612,6 +723,11 @@ packages:
     peerDependencies:
       vue: ^3.0.11
 
+  vite-node@2.1.9:
+    resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+
   vite@5.4.2:
     resolution: {integrity: sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -643,6 +759,31 @@ packages:
       terser:
         optional: true
 
+  vitest@2.1.9:
+    resolution: {integrity: sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': 2.1.9
+      '@vitest/ui': 2.1.9
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
   vooks@0.2.12:
     resolution: {integrity: sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==}
     peerDependencies:
@@ -666,6 +807,11 @@ packages:
     peerDependencies:
       vue: ^3.0.11
 
+  why-is-node-running@2.3.0:
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
 snapshots:
 
   '@babel/helper-string-parser@7.24.8': {}
@@ -780,10 +926,7 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.25
     optional: true
 
-  '@jridgewell/sourcemap-codec@1.5.0': {}
+  '@jridgewell/sourcemap-codec@1.5.5': {}
-
-  '@jridgewell/sourcemap-codec@1.5.5':
-    optional: true
 
   '@jridgewell/trace-mapping@0.3.25':
     dependencies:
@@ -860,6 +1003,46 @@ snapshots:
       vite: 5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6)
       vue: 3.4.38(typescript@5.5.4)
 
+  '@vitest/expect@2.1.9':
+    dependencies:
+      '@vitest/spy': 2.1.9
+      '@vitest/utils': 2.1.9
+      chai: 5.3.3
+      tinyrainbow: 1.2.0
+
+  '@vitest/mocker@2.1.9(vite@5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6))':
+    dependencies:
+      '@vitest/spy': 2.1.9
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6)
+
+  '@vitest/pretty-format@2.1.9':
+    dependencies:
+      tinyrainbow: 1.2.0
+
+  '@vitest/runner@2.1.9':
+    dependencies:
+      '@vitest/utils': 2.1.9
+      pathe: 1.1.2
+
+  '@vitest/snapshot@2.1.9':
+    dependencies:
+      '@vitest/pretty-format': 2.1.9
+      magic-string: 0.30.21
+      pathe: 1.1.2
+
+  '@vitest/spy@2.1.9':
+    dependencies:
+      tinyspy: 3.0.2
+
+  '@vitest/utils@2.1.9':
+    dependencies:
+      '@vitest/pretty-format': 2.1.9
+      loupe: 3.2.1
+      tinyrainbow: 1.2.0
+
   '@vue/compiler-core@3.4.38':
     dependencies:
       '@babel/parser': 7.25.6
@@ -919,13 +1102,15 @@ snapshots:
   acorn@8.18.0:
     optional: true
 
+  assertion-error@2.0.1: {}
+
   async-validator@4.2.5: {}
 
   asynckit@0.4.0: {}
 
-  axios@1.7.7:
+  axios@1.7.7(debug@4.4.3):
     dependencies:
-      follow-redirects: 1.15.6
+      follow-redirects: 1.15.6(debug@4.4.3)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
@@ -934,6 +1119,18 @@ snapshots:
   buffer-from@1.1.2:
     optional: true
 
+  cac@6.7.14: {}
+
+  chai@5.3.3:
+    dependencies:
+      assertion-error: 2.0.1
+      check-error: 2.1.3
+      deep-eql: 5.0.2
+      loupe: 3.2.1
+      pathval: 2.0.1
+
+  check-error@2.1.3: {}
+
   combined-stream@1.0.8:
     dependencies:
       delayed-stream: 1.0.0
@@ -961,6 +1158,12 @@ snapshots:
 
   date-fns@4.4.0: {}
 
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  deep-eql@5.0.2: {}
+
   delayed-stream@1.0.0: {}
 
   entities@4.5.0: {}
@@ -970,6 +1173,8 @@ snapshots:
       prr: 1.0.1
     optional: true
 
+  es-module-lexer@1.7.0: {}
+
   esbuild@0.21.5:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.21.5
@@ -998,9 +1203,17 @@ snapshots:
 
   estree-walker@2.0.2: {}
 
+  estree-walker@3.0.3:
+    dependencies:
+      '@types/estree': 1.0.5
+
   evtd@0.2.4: {}
 
-  follow-redirects@1.15.6: {}
+  expect-type@1.4.0: {}
+
+  follow-redirects@1.15.6(debug@4.4.3):
+    optionalDependencies:
+      debug: 4.4.3
 
   form-data@4.0.0:
     dependencies:
@@ -1046,9 +1259,15 @@ snapshots:
 
   lodash@4.18.1: {}
 
+  loupe@3.2.1: {}
+
   magic-string@0.30.11:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  magic-string@0.30.21:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
 
   make-dir@2.1.0:
     dependencies:
@@ -1065,6 +1284,8 @@ snapshots:
   mime@1.6.0:
     optional: true
 
+  ms@2.1.3: {}
+
   naive-ui@2.45.3(vue@3.4.38(typescript@5.5.4)):
     dependencies:
       '@css-render/plugin-bem': 0.15.14(css-render@0.15.14)
@@ -1098,6 +1319,10 @@ snapshots:
   parse-node-version@1.0.1:
     optional: true
 
+  pathe@1.1.2: {}
+
+  pathval@2.0.1: {}
+
   picocolors@1.1.0: {}
 
   pify@4.0.1:
@@ -1147,6 +1372,8 @@ snapshots:
   semver@5.7.2:
     optional: true
 
+  siginfo@2.0.0: {}
+
   source-map-js@1.2.0: {}
 
   source-map-support@0.5.21:
@@ -1158,6 +1385,10 @@ snapshots:
   source-map@0.6.1:
     optional: true
 
+  stackback@0.0.2: {}
+
+  std-env@3.10.0: {}
+
   terser@5.31.6:
     dependencies:
       '@jridgewell/source-map': 0.3.6
@@ -1168,6 +1399,16 @@ snapshots:
 
   tinode-sdk@0.25.4: {}
 
+  tinybench@2.9.0: {}
+
+  tinyexec@0.3.2: {}
+
+  tinypool@1.1.1: {}
+
+  tinyrainbow@1.2.0: {}
+
+  tinyspy@3.0.2: {}
+
   to-fast-properties@2.0.0: {}
 
   treemate@0.3.11: {}
@@ -1184,6 +1425,24 @@ snapshots:
       evtd: 0.2.4
       vue: 3.4.38(typescript@5.5.4)
 
+  vite-node@2.1.9(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6):
+    dependencies:
+      cac: 6.7.14
+      debug: 4.4.3
+      es-module-lexer: 1.7.0
+      pathe: 1.1.2
+      vite: 5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6)
+    transitivePeerDependencies:
+      - '@types/node'
+      - less
+      - lightningcss
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+
   vite@5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6):
     dependencies:
       esbuild: 0.21.5
@@ -1195,6 +1454,41 @@ snapshots:
       less: 4.2.0
       terser: 5.31.6
 
+  vitest@2.1.9(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6):
+    dependencies:
+      '@vitest/expect': 2.1.9
+      '@vitest/mocker': 2.1.9(vite@5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6))
+      '@vitest/pretty-format': 2.1.9
+      '@vitest/runner': 2.1.9
+      '@vitest/snapshot': 2.1.9
+      '@vitest/spy': 2.1.9
+      '@vitest/utils': 2.1.9
+      chai: 5.3.3
+      debug: 4.4.3
+      expect-type: 1.4.0
+      magic-string: 0.30.21
+      pathe: 1.1.2
+      std-env: 3.10.0
+      tinybench: 2.9.0
+      tinyexec: 0.3.2
+      tinypool: 1.1.1
+      tinyrainbow: 1.2.0
+      vite: 5.4.2(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6)
+      vite-node: 2.1.9(@types/node@22.5.2)(less@4.2.0)(terser@5.31.6)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 22.5.2
+    transitivePeerDependencies:
+      - less
+      - lightningcss
+      - msw
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+
   vooks@0.2.12(vue@3.4.38(typescript@5.5.4)):
     dependencies:
       evtd: 0.2.4
@@ -1225,3 +1519,8 @@ snapshots:
       vdirs: 0.1.8(vue@3.4.38(typescript@5.5.4))
       vooks: 0.2.12(vue@3.4.38(typescript@5.5.4))
       vue: 3.4.38(typescript@5.5.4)
+
+  why-is-node-running@2.3.0:
+    dependencies:
+      siginfo: 2.0.0
+      stackback: 0.0.2

web/src/mobile/components/AnnouncementPopup.vue

@@ -35,6 +35,7 @@
     title: string;
     content: string;
     body_html?: string;
+    source_type?: string;
   }
 
   const props = defineProps<{

web/src/mobile/im.test.ts

@@ -0,0 +1,306 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mocks = vi.hoisted(() => ({ instances: [] as any[] }));
+
+vi.mock('tinode-sdk', () => {
+  class QueryBuilder {
+    private kind = '';
+    private since?: number;
+    private limit?: number;
+
+    constructor(private topic?: { maxMsgSeq?: () => number }) {}
+
+    withData(_since?: number, _before?: number, limit?: number) {
+      this.kind = 'initial';
+      this.limit = limit;
+      return this;
+    }
+
+    withLaterData(limit?: number) {
+      this.kind = 'later';
+      this.since = (this.topic?.maxMsgSeq?.() || 0) + 1;
+      this.limit = limit;
+      return this;
+    }
+
+    build() {
+      return { kind: this.kind, since: this.since, limit: this.limit };
+    }
+  }
+
+  class MockTinode {
+    onConnect?: () => Promise<void> | void;
+    onDisconnect?: () => void;
+    onAutoreconnectIteration?: (timeoutMs: number) => void;
+    _connection = { sendText: vi.fn() };
+    connect = vi.fn(async () => undefined);
+    loginToken = vi.fn(async () => ({ code: 200 }));
+    disconnect = vi.fn();
+    authorizeURL = vi.fn((value: string) => value);
+    topic = {
+      onData: undefined as (() => void) | undefined,
+      onAllMessagesReceived: undefined as ((count: number) => void) | undefined,
+      maxSeq: 0,
+      maxMsgSeq: vi.fn(() => this.topic.maxSeq),
+      startMetaQuery: () => new QueryBuilder(this.topic),
+      subscribe: vi.fn(async () => {
+        setTimeout(() => this.topic.onAllMessagesReceived?.(0), 0);
+        return { code: 200, params: { what: 'data', count: 0 } };
+      }),
+      getMeta: vi.fn(async () => ({ code: 200, params: { what: 'data', count: 0 } })),
+      leave: vi.fn(),
+      messages: vi.fn(),
+      createMessage: vi.fn(),
+      publishDraft: vi.fn(),
+    };
+
+    constructor(public options: Record<string, unknown>) {
+      mocks.instances.push(this);
+    }
+
+    getTopic() {
+      return this.topic;
+    }
+  }
+
+  return {
+    Tinode: MockTinode,
+    Drafty: { appendImage: vi.fn(), insertVideo: vi.fn() },
+  };
+});
+
+import {
+  CustomerServiceChat,
+  resolveCustomerServiceEndpoints,
+  type CustomerServiceSession,
+} from './im';
+
+const session = (overrides: Partial<CustomerServiceSession> = {}): CustomerServiceSession => ({
+  tenant_code: 'default',
+  api_base_url: '/v1/im',
+  file_url: '/v0/file',
+  websocket_url: '/v0/channels',
+  api_key: 'public-key',
+  token: 'token-1',
+  current_user_id: 'usr_member',
+  topic: 'p2p-topic',
+  ...overrides,
+});
+
+describe('customer service IM endpoints', () => {
+  it('resolves API, file and websocket paths against the current page origin', () => {
+    expect(resolveCustomerServiceEndpoints(session(), 'https://www.yuexuan2.shop')).toEqual({
+      apiBaseURL: 'https://www.yuexuan2.shop/v1/im',
+      fileURL: 'https://www.yuexuan2.shop/v0/file',
+      websocketURL: 'wss://www.yuexuan2.shop/v0/channels',
+    });
+  });
+
+  it('does not follow legacy absolute IM hosts from a cached session response', () => {
+    expect(
+      resolveCustomerServiceEndpoints(
+        session({
+          api_base_url: 'https://im-api.yuexuan.shop/v1/im',
+          file_url: 'https://im-api.yuexuan.shop/v0/file',
+          websocket_url: 'wss://im-api.yuexuan.shop/v0/channels',
+        }),
+        'https://www.yuexuan3.shop',
+      ),
+    ).toEqual({
+      apiBaseURL: 'https://www.yuexuan3.shop/v1/im',
+      fileURL: 'https://www.yuexuan3.shop/v0/file',
+      websocketURL: 'wss://www.yuexuan3.shop/v0/channels',
+    });
+  });
+});
+
+describe('customer service reconnect', () => {
+  beforeEach(() => {
+    mocks.instances.length = 0;
+  });
+
+  it('reauthenticates and resubscribes with later data after reconnect', async () => {
+    const states: string[] = [];
+    const chat = new CustomerServiceChat(session(), vi.fn(), {
+      origin: 'https://www.yuexuan1.shop',
+      onConnectionState: (state) => states.push(state),
+    });
+    const tinode = mocks.instances[0];
+
+    await chat.connect('token-1');
+    tinode.onDisconnect?.();
+    await tinode.onConnect?.();
+
+    expect(tinode.loginToken).toHaveBeenCalledTimes(2);
+    expect(tinode.topic.subscribe).toHaveBeenCalledTimes(2);
+    expect(tinode.topic.subscribe.mock.calls[0][0]).toEqual({ kind: 'initial', limit: 50, since: undefined });
+    expect(tinode.topic.subscribe.mock.calls[1][0]).toEqual({ kind: 'later', limit: 50, since: 1 });
+    expect(states).toEqual(expect.arrayContaining(['connecting', 'online', 'reconnecting']));
+    expect(states.at(-1)).toBe('online');
+  });
+
+  it('does not restore a deliberately disconnected chat', async () => {
+    const chat = new CustomerServiceChat(session(), vi.fn(), { origin: 'https://olons.yuexuan.shop' });
+    const tinode = mocks.instances[0];
+
+    await chat.connect('token-1');
+    chat.disconnect();
+    await tinode.onConnect?.();
+
+    expect(tinode.loginToken).toHaveBeenCalledTimes(1);
+    expect(tinode.topic.subscribe).toHaveBeenCalledTimes(1);
+  });
+
+  it('reports offline without leaking a rejected reconnect callback', async () => {
+    const states: string[] = [];
+    const chat = new CustomerServiceChat(session(), vi.fn(), {
+      origin: 'https://www.yuexuan3.shop',
+      onConnectionState: (state) => states.push(state),
+    });
+    const tinode = mocks.instances[0];
+
+    await chat.connect('token-1');
+    tinode.loginToken.mockRejectedValueOnce(new Error('network unavailable'));
+    tinode.onDisconnect?.();
+
+    await expect(tinode.onConnect?.()).resolves.toBeUndefined();
+    expect(states.at(-1)).toBe('offline');
+  });
+
+  it('uses rotated login tokens for reconnect and media upload', async () => {
+    const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
+      new Response(JSON.stringify({ ctrl: { params: { url: '/v0/file/s/file-1' } } }), {
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      }),
+    );
+    const chat = new CustomerServiceChat(session(), vi.fn(), { origin: 'https://www.yuexuan1.shop' });
+    const tinode = mocks.instances[0];
+    tinode.loginToken
+      .mockResolvedValueOnce({ code: 200, params: { token: 'token-2' } })
+      .mockResolvedValueOnce({ code: 200, params: { token: 'token-3' } });
+
+    await chat.connect('token-1');
+    await tinode.onConnect?.();
+    await (chat as any).upload(new File(['image'], 'test.png', { type: 'image/png' }));
+
+    expect(tinode.loginToken.mock.calls.map((call: unknown[]) => call[0])).toEqual(['token-1', 'token-2']);
+    expect(fetchMock.mock.calls[0][1]?.headers).toMatchObject({ Authorization: 'Token token-3' });
+    fetchMock.mockRestore();
+  });
+
+  it('paginates all messages accumulated while disconnected', async () => {
+    const chat = new CustomerServiceChat(session(), vi.fn(), { origin: 'https://www.yuexuan1.shop' });
+    const tinode = mocks.instances[0];
+    await chat.connect('token-1');
+
+    tinode.topic.subscribe.mockImplementationOnce(async () => {
+      setTimeout(() => {
+        tinode.topic.maxSeq = 50;
+        tinode.topic.onAllMessagesReceived?.(50);
+      }, 10);
+      return { code: 200, params: { what: 'data', count: 50 } };
+    });
+    tinode.topic.getMeta
+      .mockImplementationOnce(async () => {
+        setTimeout(() => {
+          tinode.topic.maxSeq = 100;
+          tinode.topic.onAllMessagesReceived?.(50);
+        }, 10);
+        return { code: 200, params: { what: 'data', count: 50 } };
+      })
+      .mockImplementationOnce(async () => {
+        setTimeout(() => {
+          tinode.topic.maxSeq = 120;
+          tinode.topic.onAllMessagesReceived?.(20);
+        }, 10);
+        return { code: 200, params: { what: 'data', count: 20 } };
+      });
+
+    await tinode.onConnect?.();
+
+    expect(tinode.topic.getMeta).toHaveBeenCalledTimes(2);
+    expect(tinode.topic.getMeta.mock.calls.map((call: unknown[]) => call[0])).toEqual([
+      { kind: 'later', limit: 50, since: 51 },
+      { kind: 'later', limit: 50, since: 101 },
+    ]);
+  });
+});
+
+describe('customer service media upload', () => {
+  beforeEach(() => {
+    mocks.instances.length = 0;
+  });
+
+  it('keeps credentials in headers and out of the upload URL', async () => {
+    const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
+      new Response(JSON.stringify({ ctrl: { params: { url: '/v0/file/s/file-1' } } }), {
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      }),
+    );
+    const chat = new CustomerServiceChat(session(), vi.fn(), { origin: 'https://www.yuexuan1.shop' });
+
+    await (chat as any).upload(new File(['image'], 'test.png', { type: 'image/png' }));
+
+    const [url, init] = fetchMock.mock.calls[0];
+    expect(String(url)).toBe('https://www.yuexuan1.shop/v0/file/u/');
+    expect(String(url)).not.toContain('secret=');
+    expect(init?.headers).toEqual({
+      'X-MeetingIM-APIKey': 'public-key',
+      Authorization: 'Token token-1',
+    });
+    fetchMock.mockRestore();
+  });
+
+  it('rewrites historical absolute IM file references to the current frontend origin', () => {
+    const chat = new CustomerServiceChat(session(), vi.fn(), { origin: 'https://www.yuexuan3.shop' });
+    const tinode = mocks.instances[0];
+    tinode.authorizeURL.mockImplementation((value: string) => `${value}?auth=token-1`);
+
+    expect((chat as any).mediaURL('https://im-api.yuexuan.shop/v0/file/s/legacy-image')).toBe(
+      'https://www.yuexuan3.shop/v0/file/s/legacy-image?auth=token-1',
+    );
+    expect((chat as any).mediaURL('https://cdn.example.com/public/image.png')).toBe(
+      'https://cdn.example.com/public/image.png',
+    );
+  });
+
+  it('renders inline Drafty images sent by the IM web client', () => {
+    const onMessages = vi.fn();
+    new CustomerServiceChat(session(), onMessages, { origin: 'https://www.yuexuan1.shop' });
+    const tinode = mocks.instances[0];
+    tinode.topic.messages.mockImplementation((callback: (message: unknown) => void) => {
+      callback({
+        seq: 4,
+        from: 'usr_support',
+        ts: '2026-10-19T10:02:32.090Z',
+        content: {
+          ent: [{
+            tp: 'IM',
+            data: {
+              val: 'aGVsbG8=',
+              mime: 'image/png',
+              name: 'proof.png',
+              width: 70,
+              height: 70,
+            },
+          }],
+          fmt: [{ len: 1 }],
+          txt: ' ',
+        },
+      });
+    });
+
+    tinode.topic.onData?.();
+
+    expect(onMessages).toHaveBeenCalledWith([
+      expect.objectContaining({
+        seq: 4,
+        type: 'image',
+        media_url: 'data:image/png;base64,aGVsbG8=',
+        file_name: 'proof.png',
+      }),
+    ]);
+  });
+});

web/src/mobile/im.ts

@@ -25,18 +25,57 @@ export interface ChatMessage {
   file_name?: string;
 }
 
+export type CustomerServiceConnectionState = 'connecting' | 'online' | 'reconnecting' | 'offline';
+
+interface CustomerServiceChatOptions {
+  origin?: string;
+  onConnectionState?: (state: CustomerServiceConnectionState) => void;
+}
+
+export function resolveCustomerServiceEndpoints(session: CustomerServiceSession, origin: string) {
+  const pageOrigin = new URL(origin);
+  const sameOriginURL = (value: string, fallback: string) => {
+    const configured = new URL(value || fallback, pageOrigin);
+    const resolved = new URL(`${configured.pathname}${configured.search}`, pageOrigin);
+    return resolved.toString().replace(/\/$/, '');
+  };
+  const websocket = new URL(sameOriginURL(session.websocket_url, '/v0/channels'));
+  websocket.protocol = pageOrigin.protocol === 'https:' ? 'wss:' : 'ws:';
+  return {
+    apiBaseURL: sameOriginURL(session.api_base_url, '/v1/im'),
+    fileURL: sameOriginURL(session.file_url, '/v0/file'),
+    websocketURL: websocket.toString().replace(/\/$/, ''),
+  };
+}
+
 export class CustomerServiceChat {
+  private static readonly reconnectPageSize = 50;
+  private static readonly maxReconnectPages = 100;
   private tinode: any;
   private topic: any;
   private currentUserID: string;
   private onMessages: (messages: ChatMessage[]) => void;
   private session: CustomerServiceSession;
+  private endpoints: ReturnType<typeof resolveCustomerServiceEndpoints>;
+  private token = '';
+  private sessionActive = false;
+  private intentionalDisconnect = false;
+  private recovery: Promise<void> | null = null;
+  private onConnectionState: (state: CustomerServiceConnectionState) => void;
 
-  constructor(session: CustomerServiceSession, onMessages: (messages: ChatMessage[]) => void) {
+  constructor(
-    const endpoint = new URL(session.websocket_url);
+    session: CustomerServiceSession,
+    onMessages: (messages: ChatMessage[]) => void,
+    options: CustomerServiceChatOptions = {},
+  ) {
+    const origin = options.origin || window.location.origin;
+    this.endpoints = resolveCustomerServiceEndpoints(session, origin);
+    const endpoint = new URL(this.endpoints.websocketURL);
     this.session = session;
+    this.token = session.token;
     this.currentUserID = session.current_user_id;
     this.onMessages = onMessages;
+    this.onConnectionState = options.onConnectionState || (() => undefined);
     this.tinode = new Tinode({
       appName: '悦选',
       host: endpoint.host,
@@ -48,15 +87,35 @@ export class CustomerServiceChat {
     this.installTenantPatch(session.tenant_code);
     this.topic = this.tinode.getTopic(session.topic);
     this.topic.onData = () => this.refreshMessages();
+    this.tinode.onDisconnect = () => {
+      if (!this.intentionalDisconnect && this.sessionActive) {
+        this.onConnectionState('reconnecting');
+      }
+    };
+    this.tinode.onAutoreconnectIteration = (timeoutMs: number) => {
+      if (!this.intentionalDisconnect && this.sessionActive) {
+        this.onConnectionState(timeoutMs >= 0 ? 'reconnecting' : 'offline');
+      }
+    };
+    this.tinode.onConnect = () => {
+      if (!this.intentionalDisconnect && this.sessionActive) {
+        return this.restoreAfterReconnect();
+      }
+    };
   }
 
   async connect(token: string) {
+    this.intentionalDisconnect = false;
+    this.token = token;
+    this.onConnectionState('connecting');
     await this.tinode.connect();
-    const login = await this.tinode.loginToken(token);
+    const login = await this.tinode.loginToken(this.token);
     if (login?.code >= 300) throw new Error('客服会话登录失败');
+    this.acceptRotatedToken(login);
     const query = this.topic.startMetaQuery().withData(undefined, undefined, 50).build();
-    const subscribed = await this.topic.subscribe(query);
+    await this.requestMessagePage(() => this.topic.subscribe(query), '客服会话订阅失败');
-    if (subscribed?.code >= 300) throw new Error('客服会话订阅失败');
+    this.sessionActive = true;
+    this.onConnectionState('online');
     this.refreshMessages();
   }
 
@@ -101,6 +160,9 @@ export class CustomerServiceChat {
   }
 
   disconnect() {
+    this.intentionalDisconnect = true;
+    this.sessionActive = false;
+    this.onConnectionState('offline');
     try {
       this.topic?.leave?.(false);
     } finally {
@@ -108,6 +170,85 @@ export class CustomerServiceChat {
     }
   }
 
+  private restoreAfterReconnect() {
+    if (this.recovery) return this.recovery;
+    this.recovery = (async () => {
+      this.onConnectionState('reconnecting');
+      const login = await this.tinode.loginToken(this.token);
+      if (login?.code >= 300) throw new Error('客服会话重新登录失败');
+      this.acceptRotatedToken(login);
+      await this.restoreSubscriptionAndMessages();
+      this.refreshMessages();
+      this.onConnectionState('online');
+    })()
+      .catch(() => {
+        this.onConnectionState('offline');
+      })
+      .finally(() => {
+        this.recovery = null;
+      });
+    return this.recovery;
+  }
+
+  private acceptRotatedToken(login: any) {
+    const rotated = String(login?.params?.token || '');
+    if (!rotated) return;
+    this.token = rotated;
+    this.session.token = rotated;
+  }
+
+  private async restoreSubscriptionAndMessages() {
+    const pageSize = CustomerServiceChat.reconnectPageSize;
+    const firstQuery = this.topic.startMetaQuery().withLaterData(pageSize).build();
+    let count = await this.requestMessagePage(() => this.topic.subscribe(firstQuery), '客服会话重新订阅失败');
+
+    for (let page = 1; count >= pageSize; page += 1) {
+      if (page >= CustomerServiceChat.maxReconnectPages) {
+        throw new Error('客服消息积压过多，请重新进入客服会话');
+      }
+      const previousMax = Number(this.topic.maxMsgSeq?.() || 0);
+      const query = this.topic.startMetaQuery().withLaterData(pageSize).build();
+      count = await this.requestMessagePage(() => this.topic.getMeta(query), '客服历史消息补拉失败');
+      const currentMax = Number(this.topic.maxMsgSeq?.() || 0);
+      if (count > 0 && currentMax <= previousMax) {
+        throw new Error('客服历史消息补拉未推进');
+      }
+    }
+  }
+
+  private async requestMessagePage(request: () => Promise<any>, errorMessage: string) {
+    let observedCount: number | undefined;
+    let resolveObserved: ((count: number) => void) | undefined;
+    const observed = new Promise<number>((resolve) => {
+      resolveObserved = resolve;
+    });
+    const previousHandler = this.topic.onAllMessagesReceived;
+    this.topic.onAllMessagesReceived = (count: number) => {
+      previousHandler?.(count);
+      observedCount = Number(count || 0);
+      resolveObserved?.(observedCount);
+    };
+
+    let timeout: ReturnType<typeof setTimeout> | undefined;
+    try {
+      const response = await request();
+      if (response?.code >= 300) throw new Error(errorMessage);
+      if (observedCount !== undefined) return observedCount;
+      return await Promise.race([
+        observed,
+        new Promise<number>((_, reject) => {
+          // A Tinode request promise resolves before the SDK finishes routing
+          // its data packets. Only this completion callback guarantees that
+          // maxMsgSeq and the local message cache belong to the finished page.
+          timeout = setTimeout(() => reject(new Error(errorMessage)), 5_000);
+        }),
+      ]);
+    } finally {
+      if (timeout) clearTimeout(timeout);
+      this.topic.onAllMessagesReceived = previousHandler;
+    }
+  }
+
   private installTenantPatch(tenantCode: string) {
     const connection = this.tinode._connection;
     if (!connection || connection.__olonsTenantPatched) return;
@@ -152,21 +293,24 @@ export class CustomerServiceChat {
   }
 
   private async upload(file: File, onProgress?: (progress: number) => void) {
-    const uploadURL = new URL(this.session.file_url || '/v0/file', this.session.api_base_url);
+    const uploadURL = new URL(this.endpoints.fileURL);
     uploadURL.pathname = `${uploadURL.pathname.replace(/\/$/, '').replace(/\/u$/, '')}/u/`;
-    uploadURL.searchParams.set('apikey', this.session.api_key);
-    uploadURL.searchParams.set('auth', 'token');
-    uploadURL.searchParams.set('secret', this.session.token);
     const form = new FormData();
     form.set('id', clientMID());
     form.set('file', file, file.name);
     onProgress?.(0.1);
     let response: Response;
     try {
-      // Do not attach XMLHttpRequest upload progress listeners here. For a
+      // Keep uploads on fetch so API and token credentials stay in headers and
-      // cross-origin IM endpoint they trigger a CORS preflight which the file
+      // never leak into the URL, browser history, or proxy access logs.
-      // service does not expose, while multipart/form-data itself is accepted.
+      response = await fetch(uploadURL.toString(), {
-      response = await fetch(uploadURL.toString(), { method: 'POST', body: form });
+        method: 'POST',
+        headers: {
+          'X-MeetingIM-APIKey': this.session.api_key,
+          Authorization: `Token ${this.token}`,
+        },
+        body: form,
+      });
     } catch {
       throw new Error('媒体上传失败，请检查网络后重试');
     }
@@ -186,15 +330,15 @@ export class CustomerServiceChat {
 
   private mediaURL(ref?: string) {
     if (!ref) return '';
-    const apiBase = new URL(this.session.api_base_url);
+    const apiBase = new URL(this.endpoints.apiBaseURL);
     const resolved = new URL(ref, apiBase);
-    // The SDK signs relative file URLs. Also tolerate historical absolute IM
+    // Historical messages may contain the old absolute IM host. Route only
-    // references by converting same-origin URLs back to a signable path.
+    // known IM file paths through the current frontend origin; leave unrelated
-    const signable = resolved.origin === apiBase.origin
+    // external media untouched.
-      ? `${resolved.pathname}${resolved.search}`
+    if (!resolved.pathname.startsWith('/v0/file/') && resolved.origin !== apiBase.origin) return ref;
-      : ref;
+    const signable = `${resolved.pathname}${resolved.search}`;
     const authorized = this.tinode.authorizeURL(signable);
-    return new URL(authorized, this.session.api_base_url).toString();
+    return new URL(authorized, this.endpoints.apiBaseURL).toString();
   }
 }
 
@@ -205,10 +349,14 @@ function messageContent(content: unknown, mediaURL: (ref?: string) => string) {
     const media = drafty.ent?.find((entity) => entity?.tp === 'IM' || entity?.tp === 'VD');
     if (media?.data) {
       const type = media.tp === 'VD' ? 'video' : 'image';
+      const inline = typeof media.data.val === 'string' ? media.data.val : '';
+      const mime = typeof media.data.mime === 'string' && media.data.mime.startsWith(`${type}/`)
+        ? media.data.mime
+        : type === 'video' ? 'video/webm' : 'image/jpeg';
       return {
         text: '',
         type,
-        media_url: mediaURL(String(media.data.ref || '')),
+        media_url: inline ? `data:${mime};base64,${inline}` : mediaURL(String(media.data.ref || '')),
         preview_url: mediaURL(String(media.data.preref || '')),
         file_name: String(media.data.name || ''),
       } as const;

web/src/mobile/styles.css

@@ -524,19 +524,57 @@ body {
   font-weight: 500;
 }
 .m-notice {
+  width: 100%;
   margin-top: 12px;
   padding: 12px 16px;
+  border: 0;
   display: flex;
   align-items: center;
   gap: 9px;
   color: #6c5a45;
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
 }
 .m-notice p {
+  flex: 1;
+  min-width: 0;
   margin: 0;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.m-notice-tag {
+  flex: none;
+  padding: 2px 6px;
+  border-radius: 4px;
+  color: #8d5b17;
+  background: #fff2d8;
+  font-size: 12px;
+  line-height: 18px;
+}
+.m-notice-tag.is-activity {
+  color: #24704b;
+  background: #e9f7ef;
+}
+.m-notice-copy {
+  animation: m-notice-enter 0.32s ease-out;
+}
+.m-notice-arrow {
+  flex: none;
+  color: #b4a590;
+  font-size: 17px;
+}
+@keyframes m-notice-enter {
+  from {
+    opacity: 0;
+    transform: translateY(5px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
 .m-section {
   margin-top: 12px;
   padding: 17px 16px;
@@ -1455,6 +1493,48 @@ body {
   padding: 9px 16px;
   font-size: 13px;
 }
+
+.m-chat-connection {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  min-height: 36px;
+  padding: 8px 14px;
+  color: #8a5a00;
+  background: #fff3cd;
+  font-size: 13px;
+}
+
+.m-chat-connection.is-offline {
+  color: #9f2d2d;
+  background: #fde7e7;
+}
+
+.m-chat-connection button,
+.m-chat-media-error button {
+  border: 0;
+  padding: 0;
+  color: currentColor;
+  background: transparent;
+  font: inherit;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.m-chat-media-error {
+  display: flex;
+  min-width: 160px;
+  min-height: 96px;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  color: #8b3a3a;
+  background: #f8eaea;
+  border-radius: 12px;
+  font-size: 13px;
+}
 .m-chat-empty {
   min-height: 530px;
   padding: 100px 30px 20px;

web/src/mobile/views/FormView.vue

@@ -52,15 +52,10 @@
 
     <AsyncState v-else-if="formType === 'bank'" :loading="bankLoading" :error="bankLoadError" @retry="loadPaymentAccounts">
     <form class="m-plain-form m-bank-form" @submit.prevent="saveBank">
-      <p v-if="existingAccount?.masked" class="m-bound-account-hint">历史资料无法完整读取，请重新填写姓名、身份证号和银行卡号后保存</p>
+      <p v-if="existingAccount?.masked" class="m-bound-account-hint">历史资料无法完整读取，请重新填写姓名和银行卡号后保存</p>
       <label
         ><span>姓名</span><input v-model.trim="bank.holder_name" placeholder="请输入姓名"
       /></label>
-      <label
-        ><span>身份证号</span
-        ><input v-model.trim="bank.identity_no" maxlength="18" placeholder="请输入你的身份证号"
-      /></label>
-      <div class="m-bank-form__divider"></div>
       <label
         ><span>银行卡号</span
         ><input v-model.trim="bank.account_no" inputmode="numeric" placeholder="请输入你的银行卡号"
@@ -266,7 +261,6 @@
     id: number;
     bank_name: string;
     holder_name: string;
-    identity_no: string;
     account_no: string;
     digital_rmb_code: string;
     wechat_qr_url: string;
@@ -282,7 +276,6 @@
   const bank = reactive({
     bank_name: '',
     holder_name: '',
-    identity_no: '',
     account_no: '',
     digital_rmb_code: '',
     wechat_qr_attachment_id: 0,
@@ -344,7 +337,7 @@
     bankLoadError.value = '';
     error.value = '';
     existingAccount.value = null;
-    Object.assign(bank, { bank_name: '', holder_name: '', identity_no: '', account_no: '', digital_rmb_code: '',
+    Object.assign(bank, { bank_name: '', holder_name: '', account_no: '', digital_rmb_code: '',
       wechat_qr_attachment_id: 0, alipay_qr_attachment_id: 0 });
     qr.wechat.url = '';
     qr.alipay.url = '';
@@ -359,7 +352,6 @@
       bank.alipay_qr_attachment_id = account.alipay_qr_attachment_id;
       if (!account.masked) {
         bank.holder_name = account.holder_name;
-        bank.identity_no = account.identity_no;
         bank.account_no = account.account_no;
         bank.digital_rmb_code = account.digital_rmb_code;
       }
@@ -371,14 +363,11 @@
   }
   async function saveBank() {
     error.value = '';
-    const identityNo = bank.identity_no.replace(/[ -]/g, '');
     const accountNo = bank.account_no.replace(/[ -]/g, '');
     const digitalRMBCode = bank.digital_rmb_code.replace(/[ -]/g, '');
     const validationError =
       bank.holder_name.length < 2
         ? '请输入至少 2 个字符的姓名'
-        : !/^[1-9]\d{14}(?:\d{2}[\dXx])?$/.test(identityNo)
-        ? '请输入正确的 15 位或 18 位身份证号'
         : !/^\d{8,32}$/.test(accountNo)
         ? '请输入 8 至 32 位银行卡号'
         : bank.bank_name.length < 2

web/src/mobile/views/HomeView.vue

@@ -1,8 +1,8 @@
 <template>
   <section class="m-home">
     <AnnouncementPopup
-      :show="Boolean(popupNotice)"
+      :show="popupVisible"
-      :notice="popupNotice"
+      :notice="loginPopupNotice"
       @read="markPopupRead"
     />
     <div class="m-home-hero" :style="bannerStyle">
@@ -53,10 +53,22 @@
           </button>
         </div>
 
-        <div v-if="home?.notices?.length" class="m-notice m-card">
+        <button
+          v-if="displayNotice"
+          class="m-notice m-card"
+          type="button"
+          :aria-label="`查看公告：${displayNotice.title || '最新公告'}`"
+          @click="openNotice"
+        >
           <n-icon :component="MegaphoneOutline" />
-          <p>{{ home.notices[0].title || home.notices[0].content }}</p>
+          <span :class="['m-notice-tag', { 'is-activity': displayNotice.source_type === 'operational_simulation' }]">
-        </div>
+            {{ displayNotice.source_type === 'operational_simulation' ? '活动' : '公告' }}
+          </span>
+          <p :key="displayNotice.id" class="m-notice-copy">
+            {{ displayNotice.title || displayNotice.content || '查看最新通知' }}
+          </p>
+          <n-icon class="m-notice-arrow" :component="ChevronForwardOutline" />
+        </button>
 
         <section class="m-section m-card m-home-ranking">
           <div class="m-section-title"
@@ -101,7 +113,7 @@
 <script setup lang="ts">
   import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
   import { useRouter } from 'vue-router';
-  import { SearchOutline, MegaphoneOutline } from '@vicons/ionicons5';
+  import { ChevronForwardOutline, MegaphoneOutline, SearchOutline } from '@vicons/ionicons5';
   import AsyncState from '../components/AsyncState.vue';
   import AnnouncementPopup, {
     type AnnouncementNotice,
@@ -121,7 +133,7 @@
     wallet: { available_amount: number; frozen_amount: number; currency: string };
     features: Record<string, boolean>;
     banners: BannerData[];
-    notices: Array<{ title?: string; content?: string }>;
+    notices: NoticeData[];
     task_summary: {
       today_count: number;
       today_commission_amount: number;
@@ -135,6 +147,12 @@
     target_type: 'none' | 'internal_route' | 'external_url';
     target_value?: string;
   }
+  interface NoticeData {
+    id: number;
+    title?: string;
+    content?: string;
+    source_type?: string;
+  }
   interface LeaderboardEntry {
     rank: number;
     username: string;
@@ -147,14 +165,20 @@
   const loading = ref(true);
   const error = ref('');
   const leaderboard = ref<LeaderboardEntry[]>([]);
-  const popupNotice = ref<AnnouncementNotice | null>(null);
+  const loginPopupNotice = ref<AnnouncementNotice | null>(null);
+  const popupVisible = ref(false);
+  const homeAnnouncement = ref<AnnouncementNotice | null>(null);
   const activeBannerIndex = ref(0);
+  const activeNoticeIndex = ref(0);
   let bannerTimer: number | undefined;
+  let noticeTimer: number | undefined;
   const formatPoints = (value: number) =>
     new Intl.NumberFormat('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(
       (value || 0) / 100
     );
   const currentBanner = computed(() => home.value?.banners?.[activeBannerIndex.value]);
+  const currentNotice = computed(() => home.value?.notices?.[activeNoticeIndex.value]);
+  const displayNotice = computed(() => homeAnnouncement.value || currentNotice.value);
   const bannerStyle = computed(() => {
     const url = safeImage(currentBanner.value?.image_url);
     return {
@@ -234,13 +258,23 @@
       }, 4500);
     }
   }
+
+  function restartNoticeTimer() {
+    if (noticeTimer) window.clearInterval(noticeTimer);
+    noticeTimer = undefined;
+    const count = home.value?.notices?.length || 0;
+    if (count > 1) {
+      noticeTimer = window.setInterval(() => {
+        activeNoticeIndex.value = (activeNoticeIndex.value + 1) % count;
+      }, 4000);
+    }
+  }
+
   async function load() {
     loading.value = true;
     error.value = '';
     try {
-      const noticeRequest = shouldShowLoginNotice()
+      const noticeRequest = request<AnnouncementNotice | null>({ url: '/v1/notices/popup' }).catch(() => null);
-        ? request<AnnouncementNotice | null>({ url: '/v1/notices/popup' }).catch(() => null)
-        : Promise.resolve(null);
       const [homeData, rankData, noticeData] = await Promise.all([
         request<HomeData>({ url: '/v1/home' }),
         request<LeaderboardEntry[]>({ url: '/v1/leaderboard' }).catch(() => []),
@@ -248,7 +282,9 @@
       ]);
       home.value = homeData;
       leaderboard.value = rankData || [];
-      popupNotice.value = noticeData;
+      homeAnnouncement.value = noticeData;
+      loginPopupNotice.value = shouldShowLoginNotice() ? noticeData : null;
+      popupVisible.value = Boolean(loginPopupNotice.value);
     } catch (err) {
       error.value = errorText(err);
     } finally {
@@ -257,20 +293,35 @@
   }
 
   function markPopupRead() {
-    if (!popupNotice.value) return;
+    if (!loginPopupNotice.value) return;
-    const noticeId = popupNotice.value.id;
+    const noticeId = loginPopupNotice.value.id;
-    popupNotice.value = null;
+    popupVisible.value = false;
+    loginPopupNotice.value = null;
     completeLoginNotice();
     if (noticeId > 0) {
       request<void>({ url: `/v1/notices/${noticeId}/read`, method: 'POST' }).catch(() => undefined);
     }
   }
+
+  function openNotice() {
+    if (homeAnnouncement.value) {
+      loginPopupNotice.value = homeAnnouncement.value;
+      popupVisible.value = true;
+      return;
+    }
+    void router.push('/app/content/notices');
+  }
   watch(() => home.value?.banners?.length, () => {
     activeBannerIndex.value = 0;
     restartBannerTimer();
   });
+  watch(() => home.value?.notices?.length, () => {
+    activeNoticeIndex.value = 0;
+    restartNoticeTimer();
+  });
   onMounted(load);
   onBeforeUnmount(() => {
     if (bannerTimer) window.clearInterval(bannerTimer);
+    if (noticeTimer) window.clearInterval(noticeTimer);
   });
 </script>

web/src/mobile/views/SupportView.vue

@@ -38,18 +38,11 @@
   <section v-else class="m-chat">
     <PageHeader :title="current?.name || '在线客服'" />
     <div class="m-chat-time">会话内容已安全加密，请勿发送密码或验证码</div>
-    <div v-if="chatLoading" class="m-chat-empty">
+    <div v-if="connectionState !== 'online' || chatError" :class="['m-chat-connection', `is-${connectionState}`]" role="status" aria-live="polite">
-      <n-icon :component="ChatbubbleEllipsesOutline" />
+      <span>{{ chatError || connectionStatusText }}</span>
-      <h2>正在连接客服</h2>
+      <button v-if="connectionState === 'offline'" type="button" @click="connectChat">重新连接</button>
-      <p>首次连接会自动建立好友关系</p>
     </div>
-    <div v-else-if="chatError" class="m-chat-empty">
+    <div ref="messageList" class="m-chat-messages">
-      <n-icon :component="ChatbubbleEllipsesOutline" />
-      <h2>连接失败</h2>
-      <p class="m-form-error">{{ chatError }}</p>
-      <button class="m-primary-btn" @click="connectChat">重新连接</button>
-    </div>
-    <div v-else ref="messageList" class="m-chat-messages">
       <div v-for="message in historicalMessages" :key="`history-${message.seq}-${message.from}`" :class="['m-chat-row', { 'is-mine': message.mine }]">
         <div class="m-chat-avatar" aria-hidden="true">
           <img v-if="!message.mine && safeImage(current?.avatar_url)" :src="safeImage(current?.avatar_url)" alt="" />
@@ -59,8 +52,11 @@
         </div>
         <div class="m-chat-message">
           <div :class="['m-chat-bubble', { 'is-media': message.type !== 'text' }]">
-            <img v-if="message.type === 'image' && message.media_url" class="m-chat-media" :src="message.media_url" :alt="message.file_name || '聊天照片'" />
+            <div v-if="message.type !== 'text' && mediaFailed(message)" class="m-chat-media-error">
-            <video v-else-if="message.type === 'video' && message.media_url" class="m-chat-media" :src="message.media_url" :poster="message.preview_url" controls playsinline></video>
+              <span>媒体加载失败</span><button type="button" @click="retryMedia(message)">重新加载</button>
+            </div>
+            <img v-else-if="message.type === 'image' && message.media_url" :key="mediaRenderKey(message)" class="m-chat-media" :src="message.media_url" :alt="message.file_name || '聊天照片'" @error="markMediaFailed(message)" />
+            <video v-else-if="message.type === 'video' && message.media_url" :key="mediaRenderKey(message)" class="m-chat-media" :src="message.media_url" :poster="message.preview_url" controls playsinline @error="markMediaFailed(message)"></video>
             <p v-if="message.text">{{ message.text }}</p>
           </div>
           <small>
@@ -70,7 +66,7 @@
         </div>
       </div>
       <div v-if="historicalMessages.length" class="m-chat-history-divider"><span>以上是历史会话</span></div>
-      <div class="m-chat-session-tip">[ {{ current?.name || '在线客服' }} ] 与您建立了会话</div>
+      <div class="m-chat-session-tip">[ {{ current?.name || '在线客服' }} ] 客服会话已打开</div>
       <div class="m-chat-system-row">
         <div class="m-chat-avatar m-chat-avatar--agent" aria-hidden="true">
           <img v-if="safeImage(current?.avatar_url)" :src="safeImage(current?.avatar_url)" alt="" />
@@ -78,7 +74,7 @@
         </div>
         <div class="m-chat-system-message">
           <small>{{ current?.name || '在线客服' }} · {{ messageDateTime(sessionStartedAt) }}</small>
-          <p><b>【系统消息】</b>尊敬的用户您好，我是{{ current?.name || '在线客服' }}，当前已为您接通在线客服，请问有什么可以帮您？</p>
+          <p><b>【系统消息】</b>您好，我是{{ current?.name || '在线客服' }}。您可以先输入要咨询的问题，正在为您连接客服。</p>
         </div>
       </div>
       <div v-for="message in liveMessages" :key="`live-${message.seq}-${message.from}`" :class="['m-chat-row', { 'is-mine': message.mine }]">
@@ -90,8 +86,11 @@
         </div>
         <div class="m-chat-message">
           <div :class="['m-chat-bubble', { 'is-media': message.type !== 'text' }]">
-            <img v-if="message.type === 'image' && message.media_url" class="m-chat-media" :src="message.media_url" :alt="message.file_name || '聊天照片'" />
+            <div v-if="message.type !== 'text' && mediaFailed(message)" class="m-chat-media-error">
-            <video v-else-if="message.type === 'video' && message.media_url" class="m-chat-media" :src="message.media_url" :poster="message.preview_url" controls playsinline></video>
+              <span>媒体加载失败</span><button type="button" @click="retryMedia(message)">重新加载</button>
+            </div>
+            <img v-else-if="message.type === 'image' && message.media_url" :key="mediaRenderKey(message)" class="m-chat-media" :src="message.media_url" :alt="message.file_name || '聊天照片'" @error="markMediaFailed(message)" />
+            <video v-else-if="message.type === 'video' && message.media_url" :key="mediaRenderKey(message)" class="m-chat-media" :src="message.media_url" :poster="message.preview_url" controls playsinline @error="markMediaFailed(message)"></video>
             <p v-if="message.text">{{ message.text }}</p>
           </div>
           <small>
@@ -103,12 +102,12 @@
     </div>
     <div class="m-chat-composer" :class="{ 'is-expanded': toolsOpen }">
       <form class="m-chat-input" @submit.prevent="sendMessage">
-        <input v-model="draft" :disabled="chatLoading || Boolean(chatError) || sending || mediaSending" maxlength="1000" placeholder="请输入消息" />
+        <input v-model="draft" :disabled="sending || mediaSending" maxlength="1000" placeholder="请输入消息" />
         <button
           v-if="draft.trim()"
           class="m-chat-send"
           type="submit"
-          :disabled="chatLoading || Boolean(chatError) || sending || mediaSending"
+          :disabled="!chat || connectionState !== 'online' || sending || mediaSending"
         >{{ sending ? '发送中' : '发送' }}</button>
         <button v-else class="m-chat-tool" type="button" aria-label="更多" @click="toggleTools">
           <img :src="mobileAssets.chatMore" alt="" />
@@ -117,8 +116,8 @@
       <div v-if="mediaSending" class="m-chat-uploading"><progress max="100" :value="uploadProgress"></progress><b>正在上传 {{ uploadProgress }}%</b></div>
       <div v-if="toolsOpen && !emojiOpen" class="m-chat-tools">
         <button type="button" @click="emojiOpen = true"><n-icon :component="HappyOutline" /><span>表情</span></button>
-        <button type="button" :disabled="mediaSending" @click="photoInput?.click()"><n-icon :component="ImageOutline" /><span>照片</span></button>
+        <button type="button" :disabled="!chat || connectionState !== 'online' || mediaSending" @click="photoInput?.click()"><n-icon :component="ImageOutline" /><span>照片</span></button>
-        <button type="button" :disabled="mediaSending" @click="videoInput?.click()"><n-icon :component="VideocamOutline" /><span>视频</span></button>
+        <button type="button" :disabled="!chat || connectionState !== 'online' || mediaSending" @click="videoInput?.click()"><n-icon :component="VideocamOutline" /><span>视频</span></button>
         <input ref="photoInput" class="m-chat-file-input" type="file" accept="image/jpeg,image/png,image/webp,image/gif" @change="sendMedia('image', $event)" />
         <input ref="videoInput" class="m-chat-file-input" type="file" accept="video/mp4,video/webm,video/quicktime" @change="sendMedia('video', $event)" />
       </div>
@@ -147,7 +146,6 @@
   import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
   import { useRoute } from 'vue-router';
   import {
-    ChatbubbleEllipsesOutline,
     HappyOutline,
     HeadsetOutline,
     ImageOutline,
@@ -157,7 +155,12 @@
   import AsyncState from '../components/AsyncState.vue';
   import { deviceID, errorText, request, safeImage } from '../api';
   import { mobileAssets } from '../assets';
-  import { CustomerServiceChat, type ChatMessage, type CustomerServiceSession } from '../im';
+  import {
+    CustomerServiceChat,
+    type ChatMessage,
+    type CustomerServiceConnectionState,
+    type CustomerServiceSession,
+  } from '../im';
   const route = useRoute();
   const isChat = computed(() => Boolean(route.params.id));
   const loading = ref(true);
@@ -169,8 +172,13 @@
       services.value.find((item) => String(item.id) === String(route.params.id)) ||
       services.value[0]
   );
-  const chatLoading = ref(false);
   const chatError = ref('');
+  const connectionState = ref<CustomerServiceConnectionState>('offline');
+  const connectionStatusText = computed(() => {
+    if (connectionState.value === 'connecting') return '正在连接客服…';
+    if (connectionState.value === 'reconnecting') return '连接已断开，正在重新连接并同步消息…';
+    return '连接已断开，请重新连接';
+  });
   const messages = ref<ChatMessage[]>([]);
   const historyBoundarySeq = ref(0);
   const historicalMessages = computed(() => messages.value.filter((message) => message.seq <= historyBoundarySeq.value));
@@ -179,6 +187,8 @@
   const sending = ref(false);
   const mediaSending = ref(false);
   const uploadProgress = ref(0);
+  const failedMediaKeys = ref(new Set<string>());
+  const mediaRetries = ref<Record<string, number>>({});
   const photoInput = ref<HTMLInputElement | null>(null);
   const videoInput = ref<HTMLInputElement | null>(null);
   const toolsOpen = ref(false);
@@ -245,8 +255,8 @@
     chat = null;
     messages.value = [];
     historyBoundarySeq.value = 0;
-    chatLoading.value = false;
     chatError.value = '';
+    connectionState.value = 'offline';
     draft.value = '';
     sending.value = false;
     mediaSending.value = false;
@@ -259,7 +269,9 @@
     disconnectChat();
     if (!serviceID) return;
     const version = connectionVersion;
-    chatLoading.value = true;
+    connectionState.value = 'connecting';
+    chatError.value = '';
+    sessionStartedAt.value = new Date().toISOString();
     try {
       const session = await request<CustomerServiceSession>({
         url: `/v1/customer-services/${serviceID}/session`,
@@ -267,11 +279,19 @@
         data: { device_id: deviceID(), platform: 'web', app_version: '1.0.0' },
       });
       if (version !== connectionVersion) return;
-      const nextChat = new CustomerServiceChat(session, (rows) => {
+      const nextChat = new CustomerServiceChat(
-        if (version !== connectionVersion) return;
+        session,
-        messages.value = rows;
+        (rows) => {
-        void scrollToBottom();
+          if (version !== connectionVersion) return;
-      });
+          messages.value = rows;
+          void scrollToBottom();
+        },
+        {
+          onConnectionState: (state) => {
+            if (version === connectionVersion) connectionState.value = state;
+          },
+        },
+      );
       chat = nextChat;
       await nextChat.connect(session.token);
       if (version !== connectionVersion) {
@@ -289,12 +309,11 @@
       chat?.disconnect();
       chat = null;
       chatError.value = errorText(err);
-    } finally {
+      connectionState.value = 'offline';
-      if (version === connectionVersion) chatLoading.value = false;
     }
   }
   async function sendMessage() {
-    if (!chat || sending.value || !draft.value.trim()) return;
+    if (!chat || connectionState.value !== 'online' || sending.value || !draft.value.trim()) return;
     const activeChat = chat;
     const version = connectionVersion;
     const value = draft.value;
@@ -318,7 +337,7 @@
     const input = event.target as HTMLInputElement;
     const file = input.files?.[0];
     input.value = '';
-    if (!file || !chat || mediaSending.value) return;
+    if (!file || !chat || connectionState.value !== 'online' || mediaSending.value) return;
     const activeChat = chat;
     const version = connectionVersion;
     const maxSize = type === 'image' ? 10 * 1024 * 1024 : 50 * 1024 * 1024;
@@ -360,6 +379,26 @@
     draft.value += emoji;
     recentEmojis.value = [emoji, ...recentEmojis.value.filter((item) => item !== emoji)].slice(0, 24);
   }
+  function mediaIdentity(message: ChatMessage) {
+    return `${message.from}:${message.seq}:${message.media_url || ''}`;
+  }
+  function mediaFailed(message: ChatMessage) {
+    return failedMediaKeys.value.has(mediaIdentity(message));
+  }
+  function mediaRenderKey(message: ChatMessage) {
+    const key = mediaIdentity(message);
+    return `${key}:${mediaRetries.value[key] || 0}`;
+  }
+  function markMediaFailed(message: ChatMessage) {
+    failedMediaKeys.value = new Set([...failedMediaKeys.value, mediaIdentity(message)]);
+  }
+  function retryMedia(message: ChatMessage) {
+    const key = mediaIdentity(message);
+    const nextFailures = new Set(failedMediaKeys.value);
+    nextFailures.delete(key);
+    failedMediaKeys.value = nextFailures;
+    mediaRetries.value = { ...mediaRetries.value, [key]: (mediaRetries.value[key] || 0) + 1 };
+  }
   async function scrollToBottom() {
     await nextTick();
     if (messageList.value) messageList.value.scrollTop = messageList.value.scrollHeight;