diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/UserApiSecretController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/UserApiSecretController.java index 57bb296af..3d65978e3 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/UserApiSecretController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/UserApiSecretController.java @@ -13,6 +13,7 @@ import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretCheckResultVo; import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretItemVo; import com.nanri.aiimage.modules.usersecret.model.vo.UserProxyPlanVo; import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; +import com.nanri.aiimage.modules.usersecret.service.UserProxyBalanceService; import com.nanri.aiimage.modules.usersecret.service.UserProxyPlanService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -43,6 +44,7 @@ public class UserApiSecretController { private final UserApiSecretService userApiSecretService; private final UserProxyPlanService userProxyPlanService; + private final UserProxyBalanceService userProxyBalanceService; private final AdminAuthSupport adminAuthSupport; @GetMapping @@ -100,7 +102,7 @@ public class UserApiSecretController { @Operation(summary = "查询代理套餐余量", description = "转发 jikip find-balance;当前用户填了自己的套餐 ID/用户 ID 时查自己的,否则查平台套餐。") public ApiResponse proxyBalance(HttpServletRequest request) { Long userId = currentUserId(request); - return ApiResponse.success(userApiSecretService.proxyBalance(userId)); + return ApiResponse.success(userProxyBalanceService.balance(userId)); } @GetMapping("/proxy-plan") @@ -117,7 +119,7 @@ public class UserApiSecretController { @Valid @RequestBody UserProxyPlanSaveRequest body) { Long userId = currentUserId(request); UserProxyPlanVo vo = userProxyPlanService.save(userId, body.getPlanId(), body.getJikipUserId()); - userApiSecretService.invalidateProxyBalance(userId); + userProxyBalanceService.invalidate(userId); return ApiResponse.success("保存成功", vo); } @@ -126,7 +128,7 @@ public class UserApiSecretController { public ApiResponse clearProxyPlan(HttpServletRequest request) { Long userId = currentUserId(request); userProxyPlanService.clear(userId); - userApiSecretService.invalidateProxyBalance(userId); + userProxyBalanceService.invalidate(userId); return ApiResponse.success("已清除", null); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckScheduler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckScheduler.java index 57feaf7b1..644af7aed 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckScheduler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckScheduler.java @@ -26,6 +26,7 @@ public class UserApiSecretCheckScheduler { private static final int MIN_LOCK_MINUTES = 30; private final UserApiSecretService userApiSecretService; + private final UserProxyBalanceService userProxyBalanceService; private final DistributedJobLockService distributedJobLockService; private final UserSecretProperties properties; @@ -50,10 +51,9 @@ public class UserApiSecretCheckScheduler { log.info("[user-secret] 每日巡检完成 checked={} probed={} passed={} failed={} errors={} skipped={}", summary.checked(), summary.probed(), summary.passed(), summary.failed(), summary.errors(), summary.skipped()); - UserApiSecretService.ProxyBalanceCheckSummary proxySummary = - userApiSecretService.checkUserProxyBalancesForScheduler( - properties.getProxyBalanceCheckMaxRows(), - properties.getProxyBalanceCheckBudgetMinutes()); + UserProxyBalanceService.Summary proxySummary = userProxyBalanceService.checkAll( + properties.getProxyBalanceCheckMaxRows(), + properties.getProxyBalanceCheckBudgetMinutes()); log.info("[user-secret] 用户代理套餐余量巡检完成 users={} checked={} warned={} failed={}", proxySummary.users(), proxySummary.checked(), proxySummary.warned(), proxySummary.failed()); } catch (Exception ex) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretService.java index e1bd491ea..0d64ca625 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretService.java @@ -17,15 +17,13 @@ import com.nanri.aiimage.modules.permission.support.UserDataScopeSupport; import com.nanri.aiimage.common.mapper.ShopManageGroupMapper; import com.nanri.aiimage.modules.shopkey.model.dto.UserGroupRef; import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity; -import com.nanri.aiimage.modules.usersecret.client.JikipProxyClient;import com.nanri.aiimage.modules.usersecret.mapper.UserApiSecretMapper; +import com.nanri.aiimage.modules.usersecret.mapper.UserApiSecretMapper; import com.nanri.aiimage.modules.usersecret.model.dto.AdminUserSecretQuery; import com.nanri.aiimage.modules.usersecret.model.dto.UserApiSecretMigrateRequest; import com.nanri.aiimage.modules.usersecret.model.entity.UserApiSecretEntity; -import com.nanri.aiimage.modules.usersecret.model.entity.UserProxyPlanEntity; import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretModuleVo; import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretPageVo; import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretRowVo; -import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBalanceVo; import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBundleVo; import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretCheckResultVo; import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretItemVo; @@ -53,7 +51,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; /** * 用户 API 密钥服务端存储:按登录用户绑定、AES 加密落库, @@ -92,17 +89,9 @@ public class UserApiSecretService implements UserSecretCleanupPort { private static final String PROXY_FORMAT_HINT = "代理地址格式不正确,请填写 http://host:port 形式的代理地址,或代理服务商的提取链接(https://...)"; - /** 客户端右上角余量警告会周期性拉取;同一用户 5 分钟内复用结果,避免每个客户端轮询都打供应商。 */ - private static final long PROXY_BALANCE_CACHE_MILLIS = 5 * 60 * 1000L; - - /** 用户级余量查询缓存(key=userId);改套餐配置时主动失效。 */ - private final Map proxyBalanceCache = new ConcurrentHashMap<>(); - private final UserApiSecretMapper userApiSecretMapper; - private final UserProxyPlanService userProxyPlanService; private final ShopCredentialCryptoService cryptoService; private final UserApiSecretCheckService checkService; - private final JikipProxyClient jikipProxyClient; private final AdminUserMapper adminUserMapper; private final AdminAuthSupport adminAuthSupport; private final ShopManageGroupMapper adminGroupMapper; @@ -315,132 +304,6 @@ public class UserApiSecretService implements UserSecretCleanupPort { return vo; } - /** jikip 代理余量(客户端设置弹窗展示):用户填了自己的套餐 ID/用户 ID 时查自己的,否则查平台套餐。 */ - public UserApiSecretBalanceVo proxyBalance(Long userId) { - requireUserId(userId); - long now = System.currentTimeMillis(); - CachedProxyBalance cached = proxyBalanceCache.get(userId); - if (cached != null && now - cached.cachedAt() < PROXY_BALANCE_CACHE_MILLIS) { - return cached.balance(); - } - UserProxyPlanEntity plan = userProxyPlanService.getEntity(userId); - UserApiSecretBalanceVo vo; - if (plan != null) { - vo = jikipProxyClient.fetchBalance( - new JikipProxyClient.PlanRef(plan.getPlanId(), plan.getJikipUserId())); - vo.setScope("user"); - String reason = Boolean.TRUE.equals(vo.getAvailable()) ? proxyPlanLowReason(vo) : null; - vo.setLow(reason != null); - vo.setLowReason(reason); - } else { - vo = jikipProxyClient.fetchBalance(); - vo.setScope("platform"); - vo.setLow(false); - } - proxyBalanceCache.put(userId, new CachedProxyBalance(vo, now)); - return vo; - } - - /** 用户改了套餐配置后清缓存,下一次查询立即按新配置走。 */ - public void invalidateProxyBalance(Long userId) { - if (userId != null) { - proxyBalanceCache.remove(userId); - } - } - - /** - * 用户级 jikip 余量巡检:跟随密钥巡检一起跑;find-balance 免费,单条失败只记日志不中断。 - * 低于阈值时推该用户站内通知(每人每天一条),与平台套餐的管理员告警互不影响。 - */ - public ProxyBalanceCheckSummary checkUserProxyBalancesForScheduler(int maxRows, int budgetMinutes) { - if (!userSecretProperties.isNotifyEnabled()) { - log.info("[user-secret][proxy-plan] 站内通知已关闭,余量巡检跳过"); - return new ProxyBalanceCheckSummary(0, 0, 0, 0); - } - List plans = userProxyPlanService.listAll(maxRows); - long deadline = System.currentTimeMillis() + Math.max(1, budgetMinutes) * 60_000L; - int checked = 0; - int warned = 0; - int failed = 0; - for (int i = 0; i < plans.size(); i++) { - if (System.currentTimeMillis() > deadline) { - log.warn("[user-secret][proxy-plan] 余量巡检超出时间预算,已处理 {}/{} 户,剩余顺延下一轮", - i, plans.size()); - break; - } - UserProxyPlanEntity plan = plans.get(i); - UserApiSecretBalanceVo balance = jikipProxyClient.fetchBalance( - new JikipProxyClient.PlanRef(plan.getPlanId(), plan.getJikipUserId())); - if (!Boolean.TRUE.equals(balance.getAvailable())) { - failed++; - continue; - } - checked++; - if (notifyProxyPlanLow(plan, balance)) { - warned++; - } - } - return new ProxyBalanceCheckSummary(plans.size(), checked, warned, failed); - } - - private boolean notifyProxyPlanLow(UserProxyPlanEntity plan, UserApiSecretBalanceVo balance) { - String reason = proxyPlanLowReason(balance); - if (reason == null) { - return false; - } - String day = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); - boolean pushed = notificationDispatchService.pushToUser(plan.getUserId(), - NotificationService.SCENE_SECRET_BALANCE, NotificationService.LEVEL_WARNING, - "代理套餐余量不足", - "您的 jikip 套餐(套餐 ID " + plan.getPlanId() + ")" + reason - + ",耗尽后相关任务将无法购买代理,请尽快充值。", - "proxy_plan_low:" + plan.getUserId() + ":" + day); - log.warn("[user-secret][proxy-plan] 余量不足 userId={} planId={} {} pushed={}", - plan.getUserId(), plan.getPlanId(), reason, pushed); - return pushed; - } - - private String proxyPlanLowReason(UserApiSecretBalanceVo balance) { - Long surplus = firstNumber(balance.getSurplus()); - long surplusThreshold = userSecretProperties.getProxyBalanceLowSurplusThreshold(); - if (surplus != null && surplus <= 0) { - return "套餐 IP 余量已耗尽"; - } - if (surplusThreshold > 0 && surplus != null && surplus <= surplusThreshold) { - return "套餐剩余 IP 余量仅 " + surplus + "(预警阈值 " + surplusThreshold + ")"; - } - Long amount = firstNumber(balance.getBalance()); - long balanceThreshold = userSecretProperties.getProxyBalanceLowBalanceThreshold(); - // 余额耗尽必须报,即使管理员把预警阈值配成 0(默认关闭):这正是用户说的「欠费了要一直警告」 - if (amount != null && amount <= 0) { - return "账户余额已耗尽"; - } - if (balanceThreshold > 0 && amount != null && amount <= balanceThreshold) { - return "账户余额仅 " + amount + "(预警阈值 " + balanceThreshold + ")"; - } - return null; - } - - /** 供应商字段可能是 "123" 或 "123次":取首个整数;非数字返回 null(不误报)。 */ - private static Long firstNumber(String raw) { - if (raw == null) { - return null; - } - java.util.regex.Matcher matcher = java.util.regex.Pattern.compile("\\d+").matcher(raw); - if (!matcher.find()) { - return null; - } - String digits = matcher.group(); - return digits.length() <= 18 ? Long.parseLong(digits) : null; - } - - /** 用户级余量巡检摘要。 */ - public record ProxyBalanceCheckSummary(int users, int checked, int warned, int failed) { - } - - private record CachedProxyBalance(UserApiSecretBalanceVo balance, long cachedAt) { - } - /** * 后台分页:一行一用户,聚合货源查询密钥/外观专利密钥/代理设置三个字段列,并计算行级状态。 * 先按关键字圈定用户,再全量聚合、行级状态筛选、按最近更新时间倒序后内存分页 diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserProxyBalanceService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserProxyBalanceService.java new file mode 100644 index 000000000..07f05f4f6 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserProxyBalanceService.java @@ -0,0 +1,171 @@ +package com.nanri.aiimage.modules.usersecret.service; + +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.config.UserSecretProperties; +import com.nanri.aiimage.modules.notification.service.NotificationDispatchService; +import com.nanri.aiimage.modules.notification.service.NotificationService; +import com.nanri.aiimage.modules.usersecret.client.JikipProxyClient; +import com.nanri.aiimage.modules.usersecret.model.entity.UserProxyPlanEntity; +import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBalanceVo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 用户级 jikip 余量:客户端展示、5 分钟缓存、跟随密钥巡检的批量检查与低余量通知。 + * 单独成类是因为 UserApiSecretService 已接近可读性棘轮上限,且这一块与密钥存取无耦合。 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class UserProxyBalanceService { + + /** 客户端右上角余量警告会周期性拉取;同一用户 5 分钟内复用结果,避免每个客户端轮询都打供应商。 */ + private static final long CACHE_MILLIS = 5 * 60 * 1000L; + + /** key=userId;改/清套餐配置时主动失效。 */ + private final Map cache = new ConcurrentHashMap<>(); + + private final UserProxyPlanService userProxyPlanService; + private final JikipProxyClient jikipProxyClient; + private final NotificationDispatchService notificationDispatchService; + private final UserSecretProperties userSecretProperties; + + /** 客户端设置弹窗展示:用户填了自己的套餐 ID/用户 ID 时查自己的,否则查平台套餐。 */ + public UserApiSecretBalanceVo balance(Long userId) { + requireUserId(userId); + long now = System.currentTimeMillis(); + CachedProxyBalance cached = cache.get(userId); + if (cached != null && now - cached.cachedAt() < CACHE_MILLIS) { + return cached.balance(); + } + UserProxyPlanEntity plan = userProxyPlanService.getEntity(userId); + UserApiSecretBalanceVo vo; + if (plan != null) { + vo = jikipProxyClient.fetchBalance( + new JikipProxyClient.PlanRef(plan.getPlanId(), plan.getJikipUserId())); + vo.setScope("user"); + String reason = Boolean.TRUE.equals(vo.getAvailable()) ? lowReason(vo) : null; + vo.setLow(reason != null); + vo.setLowReason(reason); + } else { + vo = jikipProxyClient.fetchBalance(); + vo.setScope("platform"); + vo.setLow(false); + } + cache.put(userId, new CachedProxyBalance(vo, now)); + return vo; + } + + /** 用户改了套餐配置后清缓存,下一次查询立即按新配置走。 */ + public void invalidate(Long userId) { + if (userId != null) { + cache.remove(userId); + } + } + + /** + * 用户级 jikip 余量巡检:跟随密钥巡检一起跑;find-balance 免费,单条失败只记日志不中断。 + * 低于阈值时推该用户站内通知(每人每天一条),与平台套餐的管理员告警互不影响。 + */ + public Summary checkAll(int maxRows, int budgetMinutes) { + if (!userSecretProperties.isNotifyEnabled()) { + log.info("[user-secret][proxy-plan] 站内通知已关闭,余量巡检跳过"); + return new Summary(0, 0, 0, 0); + } + List plans = userProxyPlanService.listAll(maxRows); + long deadline = System.currentTimeMillis() + Math.max(1, budgetMinutes) * 60_000L; + int checked = 0; + int warned = 0; + int failed = 0; + for (int i = 0; i < plans.size(); i++) { + if (System.currentTimeMillis() > deadline) { + log.warn("[user-secret][proxy-plan] 余量巡检超出时间预算,已处理 {}/{} 户,剩余顺延下一轮", + i, plans.size()); + break; + } + UserProxyPlanEntity plan = plans.get(i); + UserApiSecretBalanceVo balance = jikipProxyClient.fetchBalance( + new JikipProxyClient.PlanRef(plan.getPlanId(), plan.getJikipUserId())); + if (!Boolean.TRUE.equals(balance.getAvailable())) { + failed++; + continue; + } + checked++; + if (notifyLow(plan, balance)) { + warned++; + } + } + return new Summary(plans.size(), checked, warned, failed); + } + + private boolean notifyLow(UserProxyPlanEntity plan, UserApiSecretBalanceVo balance) { + String reason = lowReason(balance); + if (reason == null) { + return false; + } + String day = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); + boolean pushed = notificationDispatchService.pushToUser(plan.getUserId(), + NotificationService.SCENE_SECRET_BALANCE, NotificationService.LEVEL_WARNING, + "代理套餐余量不足", + "您的 jikip 套餐(套餐 ID " + plan.getPlanId() + ")" + reason + + ",耗尽后相关任务将无法购买代理,请尽快充值。", + "proxy_plan_low:" + plan.getUserId() + ":" + day); + log.warn("[user-secret][proxy-plan] 余量不足 userId={} planId={} {} pushed={}", + plan.getUserId(), plan.getPlanId(), reason, pushed); + return pushed; + } + + private String lowReason(UserApiSecretBalanceVo balance) { + Long surplus = firstNumber(balance.getSurplus()); + long surplusThreshold = userSecretProperties.getProxyBalanceLowSurplusThreshold(); + if (surplus != null && surplus <= 0) { + return "套餐 IP 余量已耗尽"; + } + if (surplusThreshold > 0 && surplus != null && surplus <= surplusThreshold) { + return "套餐剩余 IP 余量仅 " + surplus + "(预警阈值 " + surplusThreshold + ")"; + } + Long amount = firstNumber(balance.getBalance()); + long balanceThreshold = userSecretProperties.getProxyBalanceLowBalanceThreshold(); + // 余额耗尽必须报,即使管理员把预警阈值配成 0(默认关闭):这正是用户说的「欠费了要一直警告」 + if (amount != null && amount <= 0) { + return "账户余额已耗尽"; + } + if (balanceThreshold > 0 && amount != null && amount <= balanceThreshold) { + return "账户余额仅 " + amount + "(预警阈值 " + balanceThreshold + ")"; + } + return null; + } + + /** 供应商字段可能是 "123" 或 "123次":取首个整数;非数字返回 null(不误报)。 */ + private static Long firstNumber(String raw) { + if (raw == null) { + return null; + } + java.util.regex.Matcher matcher = java.util.regex.Pattern.compile("\\d+").matcher(raw); + if (!matcher.find()) { + return null; + } + String digits = matcher.group(); + return digits.length() <= 18 ? Long.parseLong(digits) : null; + } + + private void requireUserId(Long userId) { + if (userId == null || userId <= 0) { + throw new BusinessException("用户 ID 不合法"); + } + } + + /** 用户级余量巡检摘要。 */ + public record Summary(int users, int checked, int warned, int failed) { + } + + private record CachedProxyBalance(UserApiSecretBalanceVo balance, long cachedAt) { + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java index 8f904fd36..281bdb072 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java @@ -97,7 +97,7 @@ class UserApiSecretServiceTest { valueOps = mockValueOps(); when(stringRedisTemplate.opsForValue()).thenReturn(valueOps); return new UserApiSecretService( - mapper, userProxyPlanService, crypto, checkService, jikipProxyClient, adminUserMapper, adminAuthSupport, + mapper, crypto, checkService, adminUserMapper, adminAuthSupport, adminGroupMapper, userDataScopeSupport, notificationDispatchService, userSecretProperties, stringRedisTemplate, objectMapper); } @@ -1103,13 +1103,13 @@ class UserApiSecretServiceTest { /** 用户填了自己的套餐后,余量必须查自己的 planId/userId,不能回落到平台套餐。 */ @Test void proxyBalanceUsesUserPlanAndFlagsLowSurplus() { - UserApiSecretService service = newService(); + UserProxyBalanceService service = newBalanceService(); UserProxyPlanEntity plan = proxyPlan(7L, "20261010593613392231", "626710989815"); when(userProxyPlanService.getEntity(7L)).thenReturn(plan); JikipProxyClient.PlanRef ref = new JikipProxyClient.PlanRef(plan.getPlanId(), plan.getJikipUserId()); when(jikipProxyClient.fetchBalance(ref)).thenReturn(proxyBalance("80", "10")); - UserApiSecretBalanceVo result = service.proxyBalance(7L); + UserApiSecretBalanceVo result = service.balance(7L); assertThat(result.getScope()).isEqualTo("user"); assertThat(result.getLow()).isTrue(); @@ -1120,11 +1120,11 @@ class UserApiSecretServiceTest { /** 没配套餐的用户看平台余量,但不参与用户级报警(平台告警归管理员巡检)。 */ @Test void proxyBalanceFallsBackToPlatformWithoutUserPlan() { - UserApiSecretService service = newService(); + UserProxyBalanceService service = newBalanceService(); when(userProxyPlanService.getEntity(7L)).thenReturn(null); when(jikipProxyClient.fetchBalance()).thenReturn(proxyBalance("5000", "500")); - UserApiSecretBalanceVo result = service.proxyBalance(7L); + UserApiSecretBalanceVo result = service.balance(7L); assertThat(result.getScope()).isEqualTo("platform"); assertThat(result.getLow()).isFalse(); @@ -1134,14 +1134,14 @@ class UserApiSecretServiceTest { /** 余额耗尽必须报警,哪怕管理员把余额预警阈值配成 0(默认关闭)——「欠费了要一直警告」是需求原话。 */ @Test void proxyBalanceFlagsExhaustedBalanceEvenWhenThresholdDisabled() { - UserApiSecretService service = newService(); + UserProxyBalanceService service = newBalanceService(); userSecretProperties.setProxyBalanceLowBalanceThreshold(0); UserProxyPlanEntity plan = proxyPlan(7L, "p-1", "u-1"); when(userProxyPlanService.getEntity(7L)).thenReturn(plan); when(jikipProxyClient.fetchBalance(new JikipProxyClient.PlanRef("p-1", "u-1"))) .thenReturn(proxyBalance(null, "0")); - UserApiSecretBalanceVo result = service.proxyBalance(7L); + UserApiSecretBalanceVo result = service.balance(7L); assertThat(result.getLow()).isTrue(); assertThat(result.getLowReason()).contains("已耗尽"); @@ -1150,29 +1150,29 @@ class UserApiSecretServiceTest { /** 客户端会周期性轮询:5 分钟内复用缓存;改/清套餐后主动失效,下一次立即按新配置查。 */ @Test void proxyBalanceCachesPerUserAndInvalidatesOnPlanChange() { - UserApiSecretService service = newService(); + UserProxyBalanceService service = newBalanceService(); UserProxyPlanEntity plan = proxyPlan(7L, "p-1", "u-1"); when(userProxyPlanService.getEntity(7L)).thenReturn(plan); JikipProxyClient.PlanRef ref = new JikipProxyClient.PlanRef("p-1", "u-1"); when(jikipProxyClient.fetchBalance(ref)).thenReturn(proxyBalance("5000", "500")); - service.proxyBalance(7L); - service.proxyBalance(7L); + service.balance(7L); + service.balance(7L); verify(jikipProxyClient, times(1)).fetchBalance(ref); - service.invalidateProxyBalance(7L); - service.proxyBalance(7L); + service.invalidate(7L); + service.balance(7L); verify(jikipProxyClient, times(2)).fetchBalance(ref); } /** 站内通知总开关关闭时连查都不查:余量巡检的唯一产出就是通知,查了也没处送。 */ @Test void scheduledProxyBalanceSkipsWhenNotificationsDisabled() { - UserApiSecretService service = newService(); + UserProxyBalanceService service = newBalanceService(); userSecretProperties.setNotifyEnabled(false); - UserApiSecretService.ProxyBalanceCheckSummary summary = - service.checkUserProxyBalancesForScheduler(2000, 10); + UserProxyBalanceService.Summary summary = + service.checkAll(2000, 10); assertThat(summary.users()).isZero(); assertThat(summary.checked()).isZero(); @@ -1182,7 +1182,7 @@ class UserApiSecretServiceTest { /** 巡检按用户逐个查:只给低余量用户推通知,正常用户不打扰,去重键按用户+自然日。 */ @Test void scheduledProxyBalanceNotifiesOnlyLowUsers() { - UserApiSecretService service = newService(); + UserProxyBalanceService service = newBalanceService(); when(userProxyPlanService.listAll(2000)).thenReturn(List.of( proxyPlan(7L, "p-low", "u-low"), proxyPlan(8L, "p-ok", "u-ok"))); when(jikipProxyClient.fetchBalance(new JikipProxyClient.PlanRef("p-low", "u-low"))) @@ -1192,8 +1192,8 @@ class UserApiSecretServiceTest { when(notificationDispatchService.pushToUser(anyLong(), anyString(), anyString(), anyString(), anyString(), anyString())).thenReturn(true); - UserApiSecretService.ProxyBalanceCheckSummary summary = - service.checkUserProxyBalancesForScheduler(2000, 10); + UserProxyBalanceService.Summary summary = + service.checkAll(2000, 10); assertThat(summary.users()).isEqualTo(2); assertThat(summary.checked()).isEqualTo(2); @@ -1207,6 +1207,11 @@ class UserApiSecretServiceTest { anyString(), anyString(), anyString()); } + private UserProxyBalanceService newBalanceService() { + return new UserProxyBalanceService(userProxyPlanService, jikipProxyClient, + notificationDispatchService, userSecretProperties); + } + private UserProxyPlanEntity proxyPlan(long userId, String planId, String jikipUserId) { UserProxyPlanEntity plan = new UserProxyPlanEntity(); plan.setUserId(userId); diff --git a/frontend-vue/src/shared/components/ApiSecretSettingsPanel.vue b/frontend-vue/src/shared/components/ApiSecretSettingsPanel.vue index 7018d0798..92a4784f3 100644 --- a/frontend-vue/src/shared/components/ApiSecretSettingsPanel.vue +++ b/frontend-vue/src/shared/components/ApiSecretSettingsPanel.vue @@ -680,200 +680,4 @@ onUnmounted(() => { defineExpose({ saveAll, reload }) - + diff --git a/frontend-vue/src/shared/components/NotificationBell.vue b/frontend-vue/src/shared/components/NotificationBell.vue index ebcadb848..34e4f553b 100644 --- a/frontend-vue/src/shared/components/NotificationBell.vue +++ b/frontend-vue/src/shared/components/NotificationBell.vue @@ -462,843 +462,6 @@ onUnmounted(() => { }) - -.bell-trigger { - position: relative; - display: inline-flex; - align-items: center; - justify-content: center; - width: 34px; - height: 34px; - padding: 0; - border: none; - border-radius: 9px; - background: transparent; - color: #c8d2e2; - cursor: pointer; - transition: background 0.15s ease, color 0.15s ease; -} - -.bell-trigger:hover, -.bell-trigger--active { - background: rgba(255, 255, 255, 0.08); - color: #f5f8fc; -} - -.bell-icon { - width: 19px; - height: 19px; -} - -.bell-badge { - position: absolute; - top: 1px; - right: 0; - min-width: 17px; - height: 17px; - padding: 0 4px; - box-sizing: border-box; - border-radius: 999px; - background: #e5484d; - color: #fff; - font-size: 10px; - font-weight: 700; - line-height: 17px; - text-align: center; - box-shadow: 0 1px 4px rgba(229, 72, 77, 0.45); - pointer-events: none; -} - -/* ---------------- 面板 ---------------- */ - -.bell-panel { - --bell-bg: #151a26; - --bell-bg-elev: #1a2130; - --bell-border: #2b3548; - --bell-text: #ecf2fa; - --bell-text-dim: #9fabc0; - --bell-text-mute: #6f7d92; - --bell-accent: #6ea8ff; - --bell-accent-soft: rgba(110, 168, 255, 0.14); - --bell-hover: rgba(255, 255, 255, 0.045); - --bell-unread-bg: rgba(110, 168, 255, 0.07); - --bell-input-bg: #10151f; - --bell-shadow: 0 20px 48px rgba(0, 0, 0, 0.52), 0 2px 8px rgba(0, 0, 0, 0.32); - --bell-error: #ff7b7b; - --bell-error-bg: rgba(255, 123, 123, 0.14); - --bell-warning: #f0bb61; - --bell-warning-bg: rgba(240, 187, 97, 0.14); - --bell-info: #6ea8ff; - --bell-info-bg: rgba(110, 168, 255, 0.14); - --bell-skeleton: rgba(255, 255, 255, 0.07); - --bell-skeleton-shine: rgba(255, 255, 255, 0.13); - - position: fixed; - z-index: 3200; - display: flex; - flex-direction: column; - width: 376px; - max-width: calc(100vw - 24px); - max-height: min(560px, calc(100vh - 96px)); - border: 1px solid var(--bell-border); - border-radius: 14px; - background: var(--bell-bg); - box-shadow: var(--bell-shadow); - overflow: hidden; - font-family: "PingFang SC", "Microsoft YaHei UI", "Microsoft YaHei", "微软雅黑", sans-serif; -} - -.bell-panel--light { - --bell-bg: #ffffff; - --bell-bg-elev: #f7f9fc; - --bell-border: #e6ecf3; - --bell-text: #1e2a3a; - --bell-text-dim: #5d6b7e; - --bell-text-mute: #93a1b3; - --bell-accent: #4c5bd4; - --bell-accent-soft: rgba(76, 91, 212, 0.1); - --bell-hover: #f2f6fb; - --bell-unread-bg: rgba(76, 91, 212, 0.055); - --bell-input-bg: #ffffff; - --bell-shadow: 0 20px 44px rgba(23, 43, 77, 0.16), 0 2px 8px rgba(23, 43, 77, 0.08); - --bell-error: #d64545; - --bell-error-bg: rgba(214, 69, 69, 0.1); - --bell-warning: #b57b23; - --bell-warning-bg: rgba(181, 123, 35, 0.12); - --bell-info: #4c5bd4; - --bell-info-bg: rgba(76, 91, 212, 0.1); - --bell-skeleton: #eef2f7; - --bell-skeleton-shine: #f8fafd; -} - -/* 头部 */ -.bell-head { - display: flex; - flex: 0 0 auto; - align-items: center; - justify-content: space-between; - gap: 8px; - padding: 13px 16px 11px; -} - -.bell-head-title { - display: flex; - align-items: center; - gap: 8px; - min-width: 0; -} - -.bell-title-text { - color: var(--bell-text); - font-size: 15px; - font-weight: 700; - letter-spacing: 0.01em; -} - -.bell-unread-chip { - padding: 2px 8px; - border-radius: 999px; - background: var(--bell-accent-soft); - color: var(--bell-accent); - font-size: 11px; - font-weight: 600; - white-space: nowrap; -} - -.bell-read-all { - display: inline-flex; - flex-shrink: 0; - align-items: center; - gap: 4px; - padding: 5px 10px; - border: 1px solid var(--bell-border); - border-radius: 8px; - background: transparent; - color: var(--bell-text-dim); - font-size: 12px; - cursor: pointer; - transition: color 0.15s ease, border-color 0.15s ease, background 0.15s ease; -} - -.bell-read-all svg { - width: 12px; - height: 12px; -} - -.bell-read-all:hover:not(:disabled) { - border-color: var(--bell-accent); - background: var(--bell-hover); - color: var(--bell-accent); -} - -.bell-read-all:disabled { - opacity: 0.55; - cursor: not-allowed; -} - -/* 筛选区 */ -.bell-filters { - display: flex; - flex: 0 0 auto; - flex-direction: column; - gap: 8px; - padding: 10px 12px 12px; - border-bottom: 1px solid var(--bell-border); - background: var(--bell-bg-elev); -} - -.bell-search-box { - position: relative; - display: flex; - align-items: center; -} - -.bell-search-icon { - position: absolute; - left: 10px; - width: 14px; - height: 14px; - color: var(--bell-text-mute); - pointer-events: none; -} - -.bell-search-input { - width: 100%; - height: 32px; - padding: 0 30px 0 32px; - box-sizing: border-box; - border: 1px solid var(--bell-border); - border-radius: 9px; - background: var(--bell-input-bg); - color: var(--bell-text); - font-size: 12px; - outline: none; - transition: border-color 0.15s ease, box-shadow 0.15s ease; -} - -.bell-search-input::placeholder { - color: var(--bell-text-mute); -} - -.bell-search-input:focus { - border-color: var(--bell-accent); - box-shadow: 0 0 0 3px var(--bell-accent-soft); -} - -.bell-search-clear { - position: absolute; - right: 8px; - display: inline-flex; - align-items: center; - justify-content: center; - width: 16px; - height: 16px; - padding: 0; - border: none; - border-radius: 50%; - background: var(--bell-border); - color: var(--bell-bg); - cursor: pointer; -} - -.bell-search-clear svg { - width: 10px; - height: 10px; -} - -.bell-search-clear:hover { - background: var(--bell-text-mute); -} - -/* 类型筛选 chip 行:比下拉更省纵向空间,与深色控制台风格一致 */ -.bell-category-chips { - display: flex; - flex-wrap: wrap; - gap: 6px; -} - -.bell-chip { - height: 24px; - padding: 0 10px; - border: 1px solid var(--bell-border); - border-radius: 12px; - background: var(--bell-input-bg); - color: var(--bell-text-mute); - font-size: 12px; - line-height: 1; - cursor: pointer; - transition: color 0.15s ease, border-color 0.15s ease, background 0.15s ease; -} - -.bell-chip:hover { - color: var(--bell-text); - border-color: var(--bell-accent); -} - -.bell-chip.is-active { - border-color: var(--bell-accent); - background: var(--bell-accent-soft); - color: var(--bell-accent); - font-weight: 500; -} - -.bell-sort-chips { - display: flex; - align-items: center; - gap: 6px; -} - -.bell-sort-label { - margin-right: 2px; - color: var(--bell-text-mute); - font-size: 11px; -} - -.bell-search-days { - display: flex; - align-items: center; - gap: 8px; -} - -.bell-date-picker { - flex: 1; - min-width: 0; - width: 100%; -} - -.bell-panel :deep(.bell-date-picker.el-date-editor) { - --el-fill-color-blank: var(--bell-input-bg); - --el-text-color-regular: var(--bell-text); - --el-text-color-placeholder: var(--bell-text-mute); - --el-text-color-secondary: var(--bell-text-mute); - --el-border-color: var(--bell-border); - --el-border-color-hover: var(--bell-accent); - --el-color-primary: var(--bell-accent); - height: 32px; - border-radius: 9px; -} - -.bell-panel :deep(.bell-date-picker .el-range-input) { - font-size: 12px; -} - -.bell-panel :deep(.bell-date-picker .el-range-separator) { - font-size: 12px; - color: var(--bell-text-mute); -} - -.bell-search-reset { - flex-shrink: 0; - height: 32px; - padding: 0 12px; - border: 1px solid var(--bell-border); - border-radius: 9px; - background: var(--bell-input-bg); - color: var(--bell-text-dim); - font-size: 12px; - cursor: pointer; - transition: color 0.15s ease, border-color 0.15s ease; -} - -.bell-search-reset:hover { - border-color: var(--bell-accent); - color: var(--bell-accent); -} - -/* 列表 */ -.bell-list { - flex: 1; - margin: 0; - padding: 0 0 4px; - list-style: none; - overflow-y: auto; - scrollbar-width: thin; - scrollbar-color: var(--bell-border) transparent; -} - -.bell-list::-webkit-scrollbar { - width: 8px; -} - -.bell-list::-webkit-scrollbar-track { - background: transparent; -} - -.bell-list::-webkit-scrollbar-thumb { - border: 2px solid transparent; - border-radius: 999px; - background: var(--bell-border); - background-clip: content-box; -} - -.bell-list::-webkit-scrollbar-thumb:hover { - background: var(--bell-text-mute); - background-clip: content-box; -} - -.bell-day-head { - position: sticky; - top: 0; - z-index: 1; - padding: 9px 16px 6px; - background: var(--bell-bg); - color: var(--bell-text-mute); - font-size: 11px; - font-weight: 600; - letter-spacing: 0.04em; -} - -.bell-item { - position: relative; - display: flex; - gap: 10px; - padding: 11px 16px; - border-top: 1px solid transparent; - cursor: pointer; - transition: background 0.12s ease; -} - -.bell-item:hover { - background: var(--bell-hover); -} - -.bell-item--unread { - background: var(--bell-unread-bg); -} - -/* ---- 聚合行(一级)与明细行(二级)---- */ -.bell-group--open { - background: var(--bell-hover); -} - -.bell-group-foot { - display: flex; - align-items: center; - justify-content: space-between; - gap: 10px; - margin-top: 5px; -} - -.bell-group-count { - color: var(--bell-text-mute); - font-size: 11px; -} - -.bell-group-toggle { - flex: 0 0 auto; - color: var(--bell-accent); - font-size: 11px; - font-weight: 600; -} - -/* 明细缩进 + 左侧一道竖线:看得出"这是上面那一组里的东西",而不是又一批同级通知 */ -.bell-item--detail { - padding-left: 30px; -} - -.bell-item--detail::before { - content: ''; - position: absolute; - top: 0; - bottom: 0; - left: 18px; - width: 2px; - border-radius: 2px; - background: var(--bell-border); -} - -.bell-detail-state { - padding: 12px 16px; - color: var(--bell-text-mute); - font-size: 12px; - text-align: center; -} - -.bell-item-icon { - display: inline-flex; - flex: 0 0 auto; - align-items: center; - justify-content: center; - width: 26px; - height: 26px; - margin-top: 1px; - border-radius: 50%; - background: var(--bell-bg-elev); - color: var(--bell-text-mute); -} - -.bell-item-icon svg { - width: 14px; - height: 14px; -} - -.bell-item--unread.bell-item--error .bell-item-icon { - background: var(--bell-error-bg); - color: var(--bell-error); -} - -.bell-item--unread.bell-item--warning .bell-item-icon { - background: var(--bell-warning-bg); - color: var(--bell-warning); -} - -.bell-item--unread.bell-item--info .bell-item-icon { - background: var(--bell-info-bg); - color: var(--bell-info); -} - -.bell-item-main { - flex: 1; - min-width: 0; -} - -.bell-item-head { - display: flex; - align-items: baseline; - gap: 8px; -} - -.bell-item-title { - flex: 1; - min-width: 0; - overflow: hidden; - color: var(--bell-text-dim); - font-size: 13px; - font-weight: 500; - text-overflow: ellipsis; - white-space: nowrap; -} - -.bell-severity-tag { - flex: 0 0 auto; - padding: 1px 6px; - border: 1px solid currentColor; - border-radius: 999px; - font-size: 10.5px; - font-weight: 600; - line-height: 1.5; -} - -.bell-severity-tag--urgent { - background: rgba(255, 123, 123, 0.12); - color: #ff7b7b; -} - -.bell-severity-tag--high { - background: rgba(240, 187, 97, 0.12); - color: #f0bb61; -} - -.bell-severity-tag--medium { - background: rgba(110, 168, 255, 0.12); - color: #6ea8ff; -} - -.bell-severity-tag--low { - background: rgba(147, 161, 179, 0.12); - color: #93a1b3; -} - -.bell-panel--light .bell-severity-tag--urgent { - background: #fdecec; - color: #c92a2a; -} - -.bell-panel--light .bell-severity-tag--high { - background: #fdf3e2; - color: #b26a12; -} - -.bell-panel--light .bell-severity-tag--medium { - background: #eaf2fb; - color: #2f6fb3; -} - -.bell-panel--light .bell-severity-tag--low { - background: #f1f4f7; - color: #6b7c8e; -} - -.bell-item--unread .bell-item-title { - color: var(--bell-text); - font-weight: 700; -} - -.bell-item--unread.bell-item--error .bell-item-title { - color: var(--bell-error); -} - -.bell-item--unread.bell-item--warning .bell-item-title { - color: var(--bell-warning); -} - -.bell-item-dot { - flex: 0 0 auto; - align-self: center; - width: 6px; - height: 6px; - border-radius: 50%; - background: transparent; -} - -.bell-item-dot--on { - background: var(--bell-error); -} - -.bell-item-time { - flex: 0 0 auto; - color: var(--bell-text-mute); - font-size: 11px; - font-variant-numeric: tabular-nums; -} - -.bell-item-content { - display: -webkit-box; - margin: 3px 0 0; - overflow: hidden; - color: var(--bell-text-mute); - font-size: 12px; - line-height: 1.6; - overflow-wrap: anywhere; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; -} - -.bell-item--unread .bell-item-content { - color: var(--bell-text-dim); -} - -/* 空态 / 加载态 */ -.bell-state { - display: flex; - flex: 1; - flex-direction: column; - align-items: center; - justify-content: center; - gap: 8px; - padding: 40px 20px; - text-align: center; -} - -.bell-state-icon { - display: inline-flex; - align-items: center; - justify-content: center; - width: 46px; - height: 46px; - border-radius: 50%; - background: var(--bell-bg-elev); - color: var(--bell-text-mute); -} - -.bell-state-icon svg { - width: 22px; - height: 22px; -} - -.bell-state-icon--error { - background: var(--bell-error-bg); - color: var(--bell-error); -} - -.bell-state-text { - margin: 0; - color: var(--bell-text-dim); - font-size: 13px; -} - -.bell-state-sub { - margin: 0; - color: var(--bell-text-mute); - font-size: 12px; -} - -.bell-state-action { - margin-top: 4px; - padding: 5px 14px; - border: 1px solid var(--bell-border); - border-radius: 8px; - background: transparent; - color: var(--bell-accent); - font-size: 12px; - cursor: pointer; -} - -.bell-state-action:hover { - border-color: var(--bell-accent); - background: var(--bell-hover); -} - -.bell-skeleton { - flex: 1; - padding: 8px 16px; -} - -.bell-skeleton-row { - display: flex; - gap: 10px; - padding: 10px 0; -} - -.bell-skeleton-icon { - flex: 0 0 auto; - width: 26px; - height: 26px; - border-radius: 50%; - background: var(--bell-skeleton); - animation: bell-pulse 1.4s ease-in-out infinite; -} - -.bell-skeleton-lines { - display: flex; - flex: 1; - flex-direction: column; - gap: 8px; - padding-top: 2px; -} - -.bell-skeleton-bar { - height: 10px; - border-radius: 5px; - background: var(--bell-skeleton); - animation: bell-pulse 1.4s ease-in-out infinite; -} - -.bell-skeleton-bar--title { - width: 62%; -} - -.bell-skeleton-bar--text { - width: 88%; - background: var(--bell-skeleton-shine); -} - -@keyframes bell-pulse { - 0%, - 100% { - opacity: 1; - } - - 50% { - opacity: 0.45; - } -} - -/* 底部:结构对齐后台列表分页(共 N 条 + 每页条数下拉 + 上一页 / 第 x / y 页 / 下一页) */ -.bell-foot { - display: flex; - flex: 0 0 auto; - flex-wrap: wrap; - align-items: center; - justify-content: space-between; - gap: 8px; - padding: 9px 12px 9px 16px; - border-top: 1px solid var(--bell-border); - background: var(--bell-bg-elev); -} - -.bell-foot-meta { - display: flex; - align-items: center; - gap: 8px; -} - -.bell-foot-total { - color: var(--bell-text-mute); - font-size: 12px; - font-variant-numeric: tabular-nums; -} - -.bell-size-select { - height: 26px; - padding: 0 4px; - border: 1px solid var(--bell-border); - border-radius: 7px; - background: var(--bell-bg); - color: var(--bell-text-dim); - font-family: inherit; - font-size: 12px; - cursor: pointer; - outline: none; - color-scheme: dark; -} - -.bell-panel--light .bell-size-select { - color-scheme: light; -} - -.bell-size-select:hover, -.bell-size-select:focus { - border-color: var(--bell-accent); - color: var(--bell-accent); -} - -.bell-size-select option { - background: var(--bell-bg); - color: var(--bell-text); -} - -.bell-pager { - display: flex; - align-items: center; - gap: 8px; -} - -.bell-page-btn { - min-height: 26px; - padding: 0 10px; - border: 1px solid var(--bell-border); - border-radius: 8px; - background: var(--bell-bg); - color: var(--bell-text-dim); - font-family: inherit; - font-size: 12px; - cursor: pointer; - transition: color 0.15s ease, border-color 0.15s ease, background 0.15s ease; -} - -.bell-page-btn:hover:not(:disabled) { - border-color: var(--bell-accent); - background: var(--bell-hover); - color: var(--bell-accent); -} - -.bell-page-btn:disabled { - background: var(--bell-bg-elev); - color: var(--bell-text-mute); - opacity: 0.6; - cursor: not-allowed; -} - -.bell-page-info { - min-width: 58px; - color: var(--bell-text-dim); - font-size: 12px; - font-variant-numeric: tabular-nums; - text-align: center; -} - -/* ---- 浅色主题(桌面入口首页顶栏) ---- */ -.notification-bell--light .bell-trigger { - color: #55627a; -} - -.notification-bell--light .bell-trigger:hover, -.notification-bell--light .bell-trigger--active { - background: rgba(76, 91, 212, 0.1); - color: #4c5bd4; -} - - - + diff --git a/frontend-vue/src/shared/components/api-secret-settings-panel.css b/frontend-vue/src/shared/components/api-secret-settings-panel.css new file mode 100644 index 000000000..574ed71ba --- /dev/null +++ b/frontend-vue/src/shared/components/api-secret-settings-panel.css @@ -0,0 +1,195 @@ +.secret-settings-body { + display: flex; + flex-direction: column; + gap: 14px; + max-height: 62vh; + overflow-y: auto; + padding-right: 4px; +} + +.secret-card { + padding: 18px; + border: 1px solid #313b46; + border-radius: 10px; + background: #20252b; +} + +.secret-card-head { + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: 12px; + margin-bottom: 12px; +} + +.secret-card-title { + color: #eef4fb; + font-size: 15px; + font-weight: 700; +} + +.lock-tag { + display: inline-flex; + align-items: center; + margin-left: 8px; + padding: 1px 8px; + border: 1px solid #6b5a2e; + border-radius: 999px; + background: #2e2a1c; + color: #e6c76a; + font-size: 11px; + font-weight: 600; + vertical-align: middle; +} + +.secret-card-desc { + margin-top: 4px; + color: #909ba8; + font-size: 12px; + line-height: 1.5; +} + +.secret-input { + width: 100%; + height: 42px; + padding: 0 12px; + box-sizing: border-box; + border: 1px solid #3b4652; + border-radius: 10px; + background: #1b2026; + color: #dce6f0; + font-size: 13px; + outline: none; +} + +.secret-input:focus { + border-color: #5b96d6; +} + +.secret-input:disabled { + color: #707b86; + cursor: not-allowed; + opacity: .72; +} + +.secret-actions { + display: flex; + align-items: center; + gap: 10px; + margin-top: 10px; +} + +.check-btn { + height: 32px; + padding: 0 14px; + border: 1px solid #3c4a58; + border-radius: 8px; + background: #262e37; + color: #dbe5f0; + font-size: 12px; + font-weight: 700; + cursor: pointer; + white-space: nowrap; + flex-shrink: 0; +} + +.check-btn:hover:not(:disabled) { + border-color: #4c647d; +} + +.check-btn:disabled { + cursor: not-allowed; + opacity: .6; +} + +.check-result { + color: #7f8a96; + font-size: 12px; + line-height: 1.5; +} + +.check-result--ok { + color: #7fd6a4; +} + +.check-result--fail { + color: #ff9b9b; +} + +.check-result--warn { + color: #f0c674; +} + +.proxy-field .field-label { + display: block; +} + +.proxy-plan-row { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 8px; +} + +.proxy-plan-hint { + margin-top: 8px; + color: #7f8a96; + font-size: 12px; + line-height: 1.5; +} + +.retention-block { + margin-top: 12px; +} + +.field-label { + margin-bottom: 8px; + color: #a3afbb; + font-size: 12px; +} + +.retention-options { + display: flex; + flex-wrap: wrap; + gap: 8px; +} + +.retention-option { + display: inline-flex; + align-items: center; + gap: 6px; + padding: 6px 10px; + border-radius: 999px; + background: #1b2026; + color: #dce4ec; + font-size: 12px; + cursor: pointer; +} + +.retention-option input { + margin: 0; +} + +.retention-option--disabled { + cursor: not-allowed; + opacity: .6; +} + +.secret-meta { + margin-top: 10px; + color: #7f8a96; + font-size: 12px; +} + +.link-danger { + border: none; + background: transparent; + color: #ff9b9b; + font-size: 12px; + cursor: pointer; + padding: 0; +} + +.link-danger:disabled { + cursor: not-allowed; + opacity: .55; +} diff --git a/frontend-vue/src/shared/components/notification-bell-popover.css b/frontend-vue/src/shared/components/notification-bell-popover.css new file mode 100644 index 000000000..124de094e --- /dev/null +++ b/frontend-vue/src/shared/components/notification-bell-popover.css @@ -0,0 +1,4 @@ +/* 日期选择面板与通知面板同为 body 级浮层,须压在通知面板(3200)之上 */ +.bell-date-popper { + z-index: 3300 !important; +} diff --git a/frontend-vue/src/shared/components/notification-bell.css b/frontend-vue/src/shared/components/notification-bell.css new file mode 100644 index 000000000..caef0e944 --- /dev/null +++ b/frontend-vue/src/shared/components/notification-bell.css @@ -0,0 +1,831 @@ +.notification-bell { + position: relative; + display: inline-flex; + align-items: center; +} + +.bell-trigger { + position: relative; + display: inline-flex; + align-items: center; + justify-content: center; + width: 34px; + height: 34px; + padding: 0; + border: none; + border-radius: 9px; + background: transparent; + color: #c8d2e2; + cursor: pointer; + transition: background 0.15s ease, color 0.15s ease; +} + +.bell-trigger:hover, +.bell-trigger--active { + background: rgba(255, 255, 255, 0.08); + color: #f5f8fc; +} + +.bell-icon { + width: 19px; + height: 19px; +} + +.bell-badge { + position: absolute; + top: 1px; + right: 0; + min-width: 17px; + height: 17px; + padding: 0 4px; + box-sizing: border-box; + border-radius: 999px; + background: #e5484d; + color: #fff; + font-size: 10px; + font-weight: 700; + line-height: 17px; + text-align: center; + box-shadow: 0 1px 4px rgba(229, 72, 77, 0.45); + pointer-events: none; +} + +/* ---------------- 面板 ---------------- */ + +.bell-panel { + --bell-bg: #151a26; + --bell-bg-elev: #1a2130; + --bell-border: #2b3548; + --bell-text: #ecf2fa; + --bell-text-dim: #9fabc0; + --bell-text-mute: #6f7d92; + --bell-accent: #6ea8ff; + --bell-accent-soft: rgba(110, 168, 255, 0.14); + --bell-hover: rgba(255, 255, 255, 0.045); + --bell-unread-bg: rgba(110, 168, 255, 0.07); + --bell-input-bg: #10151f; + --bell-shadow: 0 20px 48px rgba(0, 0, 0, 0.52), 0 2px 8px rgba(0, 0, 0, 0.32); + --bell-error: #ff7b7b; + --bell-error-bg: rgba(255, 123, 123, 0.14); + --bell-warning: #f0bb61; + --bell-warning-bg: rgba(240, 187, 97, 0.14); + --bell-info: #6ea8ff; + --bell-info-bg: rgba(110, 168, 255, 0.14); + --bell-skeleton: rgba(255, 255, 255, 0.07); + --bell-skeleton-shine: rgba(255, 255, 255, 0.13); + + position: fixed; + z-index: 3200; + display: flex; + flex-direction: column; + width: 376px; + max-width: calc(100vw - 24px); + max-height: min(560px, calc(100vh - 96px)); + border: 1px solid var(--bell-border); + border-radius: 14px; + background: var(--bell-bg); + box-shadow: var(--bell-shadow); + overflow: hidden; + font-family: "PingFang SC", "Microsoft YaHei UI", "Microsoft YaHei", "微软雅黑", sans-serif; +} + +.bell-panel--light { + --bell-bg: #ffffff; + --bell-bg-elev: #f7f9fc; + --bell-border: #e6ecf3; + --bell-text: #1e2a3a; + --bell-text-dim: #5d6b7e; + --bell-text-mute: #93a1b3; + --bell-accent: #4c5bd4; + --bell-accent-soft: rgba(76, 91, 212, 0.1); + --bell-hover: #f2f6fb; + --bell-unread-bg: rgba(76, 91, 212, 0.055); + --bell-input-bg: #ffffff; + --bell-shadow: 0 20px 44px rgba(23, 43, 77, 0.16), 0 2px 8px rgba(23, 43, 77, 0.08); + --bell-error: #d64545; + --bell-error-bg: rgba(214, 69, 69, 0.1); + --bell-warning: #b57b23; + --bell-warning-bg: rgba(181, 123, 35, 0.12); + --bell-info: #4c5bd4; + --bell-info-bg: rgba(76, 91, 212, 0.1); + --bell-skeleton: #eef2f7; + --bell-skeleton-shine: #f8fafd; +} + +/* 头部 */ +.bell-head { + display: flex; + flex: 0 0 auto; + align-items: center; + justify-content: space-between; + gap: 8px; + padding: 13px 16px 11px; +} + +.bell-head-title { + display: flex; + align-items: center; + gap: 8px; + min-width: 0; +} + +.bell-title-text { + color: var(--bell-text); + font-size: 15px; + font-weight: 700; + letter-spacing: 0.01em; +} + +.bell-unread-chip { + padding: 2px 8px; + border-radius: 999px; + background: var(--bell-accent-soft); + color: var(--bell-accent); + font-size: 11px; + font-weight: 600; + white-space: nowrap; +} + +.bell-read-all { + display: inline-flex; + flex-shrink: 0; + align-items: center; + gap: 4px; + padding: 5px 10px; + border: 1px solid var(--bell-border); + border-radius: 8px; + background: transparent; + color: var(--bell-text-dim); + font-size: 12px; + cursor: pointer; + transition: color 0.15s ease, border-color 0.15s ease, background 0.15s ease; +} + +.bell-read-all svg { + width: 12px; + height: 12px; +} + +.bell-read-all:hover:not(:disabled) { + border-color: var(--bell-accent); + background: var(--bell-hover); + color: var(--bell-accent); +} + +.bell-read-all:disabled { + opacity: 0.55; + cursor: not-allowed; +} + +/* 筛选区 */ +.bell-filters { + display: flex; + flex: 0 0 auto; + flex-direction: column; + gap: 8px; + padding: 10px 12px 12px; + border-bottom: 1px solid var(--bell-border); + background: var(--bell-bg-elev); +} + +.bell-search-box { + position: relative; + display: flex; + align-items: center; +} + +.bell-search-icon { + position: absolute; + left: 10px; + width: 14px; + height: 14px; + color: var(--bell-text-mute); + pointer-events: none; +} + +.bell-search-input { + width: 100%; + height: 32px; + padding: 0 30px 0 32px; + box-sizing: border-box; + border: 1px solid var(--bell-border); + border-radius: 9px; + background: var(--bell-input-bg); + color: var(--bell-text); + font-size: 12px; + outline: none; + transition: border-color 0.15s ease, box-shadow 0.15s ease; +} + +.bell-search-input::placeholder { + color: var(--bell-text-mute); +} + +.bell-search-input:focus { + border-color: var(--bell-accent); + box-shadow: 0 0 0 3px var(--bell-accent-soft); +} + +.bell-search-clear { + position: absolute; + right: 8px; + display: inline-flex; + align-items: center; + justify-content: center; + width: 16px; + height: 16px; + padding: 0; + border: none; + border-radius: 50%; + background: var(--bell-border); + color: var(--bell-bg); + cursor: pointer; +} + +.bell-search-clear svg { + width: 10px; + height: 10px; +} + +.bell-search-clear:hover { + background: var(--bell-text-mute); +} + +/* 类型筛选 chip 行:比下拉更省纵向空间,与深色控制台风格一致 */ +.bell-category-chips { + display: flex; + flex-wrap: wrap; + gap: 6px; +} + +.bell-chip { + height: 24px; + padding: 0 10px; + border: 1px solid var(--bell-border); + border-radius: 12px; + background: var(--bell-input-bg); + color: var(--bell-text-mute); + font-size: 12px; + line-height: 1; + cursor: pointer; + transition: color 0.15s ease, border-color 0.15s ease, background 0.15s ease; +} + +.bell-chip:hover { + color: var(--bell-text); + border-color: var(--bell-accent); +} + +.bell-chip.is-active { + border-color: var(--bell-accent); + background: var(--bell-accent-soft); + color: var(--bell-accent); + font-weight: 500; +} + +.bell-sort-chips { + display: flex; + align-items: center; + gap: 6px; +} + +.bell-sort-label { + margin-right: 2px; + color: var(--bell-text-mute); + font-size: 11px; +} + +.bell-search-days { + display: flex; + align-items: center; + gap: 8px; +} + +.bell-date-picker { + flex: 1; + min-width: 0; + width: 100%; +} + +.bell-panel :deep(.bell-date-picker.el-date-editor) { + --el-fill-color-blank: var(--bell-input-bg); + --el-text-color-regular: var(--bell-text); + --el-text-color-placeholder: var(--bell-text-mute); + --el-text-color-secondary: var(--bell-text-mute); + --el-border-color: var(--bell-border); + --el-border-color-hover: var(--bell-accent); + --el-color-primary: var(--bell-accent); + height: 32px; + border-radius: 9px; +} + +.bell-panel :deep(.bell-date-picker .el-range-input) { + font-size: 12px; +} + +.bell-panel :deep(.bell-date-picker .el-range-separator) { + font-size: 12px; + color: var(--bell-text-mute); +} + +.bell-search-reset { + flex-shrink: 0; + height: 32px; + padding: 0 12px; + border: 1px solid var(--bell-border); + border-radius: 9px; + background: var(--bell-input-bg); + color: var(--bell-text-dim); + font-size: 12px; + cursor: pointer; + transition: color 0.15s ease, border-color 0.15s ease; +} + +.bell-search-reset:hover { + border-color: var(--bell-accent); + color: var(--bell-accent); +} + +/* 列表 */ +.bell-list { + flex: 1; + margin: 0; + padding: 0 0 4px; + list-style: none; + overflow-y: auto; + scrollbar-width: thin; + scrollbar-color: var(--bell-border) transparent; +} + +.bell-list::-webkit-scrollbar { + width: 8px; +} + +.bell-list::-webkit-scrollbar-track { + background: transparent; +} + +.bell-list::-webkit-scrollbar-thumb { + border: 2px solid transparent; + border-radius: 999px; + background: var(--bell-border); + background-clip: content-box; +} + +.bell-list::-webkit-scrollbar-thumb:hover { + background: var(--bell-text-mute); + background-clip: content-box; +} + +.bell-day-head { + position: sticky; + top: 0; + z-index: 1; + padding: 9px 16px 6px; + background: var(--bell-bg); + color: var(--bell-text-mute); + font-size: 11px; + font-weight: 600; + letter-spacing: 0.04em; +} + +.bell-item { + position: relative; + display: flex; + gap: 10px; + padding: 11px 16px; + border-top: 1px solid transparent; + cursor: pointer; + transition: background 0.12s ease; +} + +.bell-item:hover { + background: var(--bell-hover); +} + +.bell-item--unread { + background: var(--bell-unread-bg); +} + +/* ---- 聚合行(一级)与明细行(二级)---- */ +.bell-group--open { + background: var(--bell-hover); +} + +.bell-group-foot { + display: flex; + align-items: center; + justify-content: space-between; + gap: 10px; + margin-top: 5px; +} + +.bell-group-count { + color: var(--bell-text-mute); + font-size: 11px; +} + +.bell-group-toggle { + flex: 0 0 auto; + color: var(--bell-accent); + font-size: 11px; + font-weight: 600; +} + +/* 明细缩进 + 左侧一道竖线:看得出"这是上面那一组里的东西",而不是又一批同级通知 */ +.bell-item--detail { + padding-left: 30px; +} + +.bell-item--detail::before { + content: ''; + position: absolute; + top: 0; + bottom: 0; + left: 18px; + width: 2px; + border-radius: 2px; + background: var(--bell-border); +} + +.bell-detail-state { + padding: 12px 16px; + color: var(--bell-text-mute); + font-size: 12px; + text-align: center; +} + +.bell-item-icon { + display: inline-flex; + flex: 0 0 auto; + align-items: center; + justify-content: center; + width: 26px; + height: 26px; + margin-top: 1px; + border-radius: 50%; + background: var(--bell-bg-elev); + color: var(--bell-text-mute); +} + +.bell-item-icon svg { + width: 14px; + height: 14px; +} + +.bell-item--unread.bell-item--error .bell-item-icon { + background: var(--bell-error-bg); + color: var(--bell-error); +} + +.bell-item--unread.bell-item--warning .bell-item-icon { + background: var(--bell-warning-bg); + color: var(--bell-warning); +} + +.bell-item--unread.bell-item--info .bell-item-icon { + background: var(--bell-info-bg); + color: var(--bell-info); +} + +.bell-item-main { + flex: 1; + min-width: 0; +} + +.bell-item-head { + display: flex; + align-items: baseline; + gap: 8px; +} + +.bell-item-title { + flex: 1; + min-width: 0; + overflow: hidden; + color: var(--bell-text-dim); + font-size: 13px; + font-weight: 500; + text-overflow: ellipsis; + white-space: nowrap; +} + +.bell-severity-tag { + flex: 0 0 auto; + padding: 1px 6px; + border: 1px solid currentColor; + border-radius: 999px; + font-size: 10.5px; + font-weight: 600; + line-height: 1.5; +} + +.bell-severity-tag--urgent { + background: rgba(255, 123, 123, 0.12); + color: #ff7b7b; +} + +.bell-severity-tag--high { + background: rgba(240, 187, 97, 0.12); + color: #f0bb61; +} + +.bell-severity-tag--medium { + background: rgba(110, 168, 255, 0.12); + color: #6ea8ff; +} + +.bell-severity-tag--low { + background: rgba(147, 161, 179, 0.12); + color: #93a1b3; +} + +.bell-panel--light .bell-severity-tag--urgent { + background: #fdecec; + color: #c92a2a; +} + +.bell-panel--light .bell-severity-tag--high { + background: #fdf3e2; + color: #b26a12; +} + +.bell-panel--light .bell-severity-tag--medium { + background: #eaf2fb; + color: #2f6fb3; +} + +.bell-panel--light .bell-severity-tag--low { + background: #f1f4f7; + color: #6b7c8e; +} + +.bell-item--unread .bell-item-title { + color: var(--bell-text); + font-weight: 700; +} + +.bell-item--unread.bell-item--error .bell-item-title { + color: var(--bell-error); +} + +.bell-item--unread.bell-item--warning .bell-item-title { + color: var(--bell-warning); +} + +.bell-item-dot { + flex: 0 0 auto; + align-self: center; + width: 6px; + height: 6px; + border-radius: 50%; + background: transparent; +} + +.bell-item-dot--on { + background: var(--bell-error); +} + +.bell-item-time { + flex: 0 0 auto; + color: var(--bell-text-mute); + font-size: 11px; + font-variant-numeric: tabular-nums; +} + +.bell-item-content { + display: -webkit-box; + margin: 3px 0 0; + overflow: hidden; + color: var(--bell-text-mute); + font-size: 12px; + line-height: 1.6; + overflow-wrap: anywhere; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; +} + +.bell-item--unread .bell-item-content { + color: var(--bell-text-dim); +} + +/* 空态 / 加载态 */ +.bell-state { + display: flex; + flex: 1; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 8px; + padding: 40px 20px; + text-align: center; +} + +.bell-state-icon { + display: inline-flex; + align-items: center; + justify-content: center; + width: 46px; + height: 46px; + border-radius: 50%; + background: var(--bell-bg-elev); + color: var(--bell-text-mute); +} + +.bell-state-icon svg { + width: 22px; + height: 22px; +} + +.bell-state-icon--error { + background: var(--bell-error-bg); + color: var(--bell-error); +} + +.bell-state-text { + margin: 0; + color: var(--bell-text-dim); + font-size: 13px; +} + +.bell-state-sub { + margin: 0; + color: var(--bell-text-mute); + font-size: 12px; +} + +.bell-state-action { + margin-top: 4px; + padding: 5px 14px; + border: 1px solid var(--bell-border); + border-radius: 8px; + background: transparent; + color: var(--bell-accent); + font-size: 12px; + cursor: pointer; +} + +.bell-state-action:hover { + border-color: var(--bell-accent); + background: var(--bell-hover); +} + +.bell-skeleton { + flex: 1; + padding: 8px 16px; +} + +.bell-skeleton-row { + display: flex; + gap: 10px; + padding: 10px 0; +} + +.bell-skeleton-icon { + flex: 0 0 auto; + width: 26px; + height: 26px; + border-radius: 50%; + background: var(--bell-skeleton); + animation: bell-pulse 1.4s ease-in-out infinite; +} + +.bell-skeleton-lines { + display: flex; + flex: 1; + flex-direction: column; + gap: 8px; + padding-top: 2px; +} + +.bell-skeleton-bar { + height: 10px; + border-radius: 5px; + background: var(--bell-skeleton); + animation: bell-pulse 1.4s ease-in-out infinite; +} + +.bell-skeleton-bar--title { + width: 62%; +} + +.bell-skeleton-bar--text { + width: 88%; + background: var(--bell-skeleton-shine); +} + +@keyframes bell-pulse { + 0%, + 100% { + opacity: 1; + } + + 50% { + opacity: 0.45; + } +} + +/* 底部:结构对齐后台列表分页(共 N 条 + 每页条数下拉 + 上一页 / 第 x / y 页 / 下一页) */ +.bell-foot { + display: flex; + flex: 0 0 auto; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 8px; + padding: 9px 12px 9px 16px; + border-top: 1px solid var(--bell-border); + background: var(--bell-bg-elev); +} + +.bell-foot-meta { + display: flex; + align-items: center; + gap: 8px; +} + +.bell-foot-total { + color: var(--bell-text-mute); + font-size: 12px; + font-variant-numeric: tabular-nums; +} + +.bell-size-select { + height: 26px; + padding: 0 4px; + border: 1px solid var(--bell-border); + border-radius: 7px; + background: var(--bell-bg); + color: var(--bell-text-dim); + font-family: inherit; + font-size: 12px; + cursor: pointer; + outline: none; + color-scheme: dark; +} + +.bell-panel--light .bell-size-select { + color-scheme: light; +} + +.bell-size-select:hover, +.bell-size-select:focus { + border-color: var(--bell-accent); + color: var(--bell-accent); +} + +.bell-size-select option { + background: var(--bell-bg); + color: var(--bell-text); +} + +.bell-pager { + display: flex; + align-items: center; + gap: 8px; +} + +.bell-page-btn { + min-height: 26px; + padding: 0 10px; + border: 1px solid var(--bell-border); + border-radius: 8px; + background: var(--bell-bg); + color: var(--bell-text-dim); + font-family: inherit; + font-size: 12px; + cursor: pointer; + transition: color 0.15s ease, border-color 0.15s ease, background 0.15s ease; +} + +.bell-page-btn:hover:not(:disabled) { + border-color: var(--bell-accent); + background: var(--bell-hover); + color: var(--bell-accent); +} + +.bell-page-btn:disabled { + background: var(--bell-bg-elev); + color: var(--bell-text-mute); + opacity: 0.6; + cursor: not-allowed; +} + +.bell-page-info { + min-width: 58px; + color: var(--bell-text-dim); + font-size: 12px; + font-variant-numeric: tabular-nums; + text-align: center; +} + +/* ---- 浅色主题(桌面入口首页顶栏) ---- */ +.notification-bell--light .bell-trigger { + color: #55627a; +} + +.notification-bell--light .bell-trigger:hover, +.notification-bell--light .bell-trigger--active { + background: rgba(76, 91, 212, 0.1); + color: #4c5bd4; +}