降低订阅快照测试耦合并统一缓存路径

src/main/java/com/lion/lionwebsite/Service/SubscriptionRefreshService.java

@@ -41,6 +41,9 @@ public class SubscriptionRefreshService {
     @Value("${subscription.upstream.high-multiplier-threshold:2.0}")
     double highMultiplierThreshold;
 
+    @Value("${subscription.cache-root:sub/accounts}")
+    String cacheRoot;
+
     public boolean refreshAll() {
         boolean success = true;
         for (SubscriptionAccount account : subMapper.selectAllSubscriptionAccounts()) {
@@ -60,7 +63,7 @@ public class SubscriptionRefreshService {
         try {
             String v2 = processV2(firstLine(download(v2Url(account))), account.isFilterHighMultiplier(), highMultiplierThreshold);
             List<String> clash = processClash(download(clashUrl(account)), account.isFilterHighMultiplier(), highMultiplierThreshold);
-            Path dir = Paths.get("sub", "accounts", String.valueOf(accountId));
+            Path dir = Paths.get(cacheRoot, String.valueOf(accountId));
             Files.createDirectories(dir);
             atomicWrite(dir.resolve("v2ray.txt"), v2.getBytes(StandardCharsets.UTF_8));
             atomicWrite(dir.resolve("clash.yaml"), String.join("\n", clash).concat("\n").getBytes(StandardCharsets.UTF_8));
@@ -205,7 +208,7 @@ public class SubscriptionRefreshService {
     }
 
     public Path cachedPath(Integer accountId, String client) {
-        return Paths.get("sub", "accounts", String.valueOf(accountId), client.equals("v2") ? "v2ray.txt" : "clash.yaml");
+        return Paths.get(cacheRoot, String.valueOf(accountId), client.equals("v2") ? "v2ray.txt" : "clash.yaml");
     }
 
     public boolean hasCompleteCache(Integer accountId) {

src/main/java/com/lion/lionwebsite/Service/SubscriptionStandbySnapshotService.java

@@ -27,7 +27,6 @@ import java.util.concurrent.locks.Lock;
 @RequiredArgsConstructor
 public class SubscriptionStandbySnapshotService {
     private final SubMapper subMapper;
-    private final SubscriptionRefreshService refreshService;
     private final SubscriptionStateCoordinator stateCoordinator;
     private final ObjectMapper objectMapper = CustomUtil.objectMapper;
 
@@ -37,6 +36,9 @@ public class SubscriptionStandbySnapshotService {
     @Value("${subscription.standby.sync-enabled:false}")
     boolean syncEnabled;
 
+    @Value("${subscription.cache-root:sub/accounts}")
+    String cacheRoot;
+
     @PostConstruct
     void validateConfiguration() {
         if (syncEnabled && (syncSecret == null || syncSecret.isBlank()))
@@ -49,10 +51,10 @@ public class SubscriptionStandbySnapshotService {
         try {
         Map<Integer, SubscriptionAccountSnapshot> accountMap = new HashMap<>();
         for (SubscriptionAccount account : subMapper.selectAllSubscriptionAccounts()) {
-            if (!account.isEnabled() || !refreshService.hasCompleteCache(account.getId()))
+            Path v2Path = cachedPath(account.getId(), "v2");
+            Path clashPath = cachedPath(account.getId(), "cat");
+            if (!account.isEnabled() || !Files.isRegularFile(v2Path) || !Files.isRegularFile(clashPath))
                 continue;
-            Path v2Path = refreshService.cachedPath(account.getId(), "v2");
-            Path clashPath = refreshService.cachedPath(account.getId(), "cat");
             byte[] v2 = Files.readAllBytes(v2Path);
             byte[] clash = Files.readAllBytes(clashPath);
             SubscriptionAccountSnapshot snapshot = new SubscriptionAccountSnapshot();
@@ -129,4 +131,8 @@ public class SubscriptionStandbySnapshotService {
     }
 
     private static String hex(byte[] input) { return HexFormat.of().formatHex(input); }
+
+    private Path cachedPath(Integer accountId, String client) {
+        return Path.of(cacheRoot, String.valueOf(accountId), "v2".equals(client) ? "v2ray.txt" : "clash.yaml");
+    }
 }

src/main/resources/application.yaml

@@ -37,6 +37,7 @@ local:
   dou-nai-v2ray: "https://aaaa.gay/link/{key}?client=v2"
 
 subscription:
+  cache-root: sub/accounts
   upstream:
     # Use environment variables or an external config file in production.
     v2-url-template: "https://aaaa.gay/link/{key}?client=v2"