refactor：subscription

Author: fun90

src/main/java/com/fun90/airopscat/controller/AccountController.java

@@ -6,10 +6,7 @@
 import com.fun90.airopscat.model.entity.Account;
 import com.fun90.airopscat.model.entity.User;
 import com.fun90.airopscat.model.enums.PeriodType;
-import com.fun90.airopscat.service.AccountOnlineIpService;
-import com.fun90.airopscat.service.AccountService;
-import com.fun90.airopscat.service.TagService;
-import com.fun90.airopscat.service.UserService;
+import com.fun90.airopscat.service.*;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.panache.common.Page;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -40,7 +37,9 @@ public class AccountController {
 
     @Inject
     SecurityIdentity securityIdentity;
-    
+    @Inject
+    SubscriptionService subscriptionService;
+
     @Inject
     public AccountController(AccountService accountService, UserService userService, TagService tagService, AccountOnlineIpService accountOnlineIpService) {
         this.accountService = accountService;
@@ -306,7 +305,7 @@ public Response getConfigUrl(@PathParam("id") Long id, @QueryParam("osName") Str
         Account account = accountService.getAccountById(id);
         if (account != null) {
             Map<String, String> response = new HashMap<>();
-            response.put("configUrl", accountService.getConfigUrl(account, osName, appName));
+            response.put("configUrl", subscriptionService.getConfigUrl(account, osName, appName));
             return Response.ok(response).build();
         }
         return Response.status(Response.Status.NOT_FOUND).build();

src/main/java/com/fun90/airopscat/controller/OpenController.java

@@ -4,6 +4,7 @@
 import com.fun90.airopscat.model.entity.Account;
 import com.fun90.airopscat.repository.AccountRepository;
 import com.fun90.airopscat.service.AccountOnlineIpService;
+import com.fun90.airopscat.service.SubscriptionService;
 import com.fun90.airopscat.util.JsonUtil;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
@@ -13,8 +14,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -32,15 +31,15 @@ public class OpenController {
     @Inject
     AccountRepository accountRepository;
 
+    @Inject
+    SubscriptionService subscriptionService;
+
     @ConfigProperty(name = "airopscat.apple.id")
     String appleId;
 
     @ConfigProperty(name = "airopscat.apple.pwd")
     String applePwd;
 
-    @ConfigProperty(name = "airopscat.subscription.url")
-    String subscriptionUrl;
-
     @ConfigProperty(name = "airopscat.api.token")
     String apiToken;
 
@@ -64,14 +63,14 @@ public Response getDocsInfo(@PathParam("authCode") String authCode) {
         if (accountOpt.isEmpty()) {
             return Response.status(Response.Status.BAD_REQUEST).entity(Map.of("error", "无效的认证码，账户不存在")).build();
         }
+        Account account = accountOpt.get();
         // 组装subscriptionUrl
-        String base = subscriptionUrl + "/config/" + authCode;
         Map<String, String> subscriptionUrls = Map.of(
-            "windows", base + "/windows/clash-verge/",
-            "linux", base + "/linux/clash-verge/",
-            "ios", base + "/ios/shadowrocket/" + URLEncoder.encode(accountOpt.get().getRemark(), StandardCharsets.UTF_8) + "/",
-            "macos", base + "/macos/clash-verge/",
-            "android", base + "/android/clash-meta/"
+            "windows", subscriptionService.getConfigUrl(account, "windows", "clash-verge"),
+            "linux", subscriptionService.getConfigUrl(account, "linux", "clash-verge"),
+            "ios", subscriptionService.getConfigUrl(account, "ios", "shadowrocket"),
+            "macos", subscriptionService.getConfigUrl(account, "macos", "clash-verge"),
+            "android", subscriptionService.getConfigUrl(account, "android", "clash-meta")
         );
         Map<String, Object> result = new HashMap<>();
         result.put("subscriptionUrl", subscriptionUrls);

src/main/java/com/fun90/airopscat/controller/SubscriptionController.java

@@ -29,7 +29,6 @@ public class SubscriptionController {
     @Inject
     SubscriptionService subscriptionService;
 
-    @Deprecated
     @GET
     @Path("/config/{authCode}/{osName}/{appName}")
     @Produces(MediaType.TEXT_PLAIN)

src/main/java/com/fun90/airopscat/registry/AbstractStrategyRegistry.java

@@ -8,7 +8,6 @@
 import java.lang.annotation.Annotation;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 /**
  * 策略注册表抽象基类

src/main/java/com/fun90/airopscat/service/AccountService.java

@@ -22,13 +22,9 @@
 @ApplicationScoped
 public class AccountService {
 
-    @ConfigProperty(name = "airopscat.subscription.url", defaultValue = "https://example.com")
-    String subscriptionUrl;
-
     @ConfigProperty(name = "airopscat.account.multiplier", defaultValue = "1")
     Integer accountMultiplier;
 
-
     @Inject
     AccountRepository accountRepository;
 
@@ -292,12 +288,4 @@ private String generateAccountNo() {
         return UUID.randomUUID().toString().replaceAll("-", "").substring(0, 12);
     }
 
-    // 获取配置URL
-    public String getConfigUrl(Account account, String osName, String appName) {
-        if (account == null || account.getUuid() == null) {
-            return null;
-        }
-        return subscriptionUrl + "/config/" + account.getAuthCode() + "/" + osName + "/" + appName;
-    }
-
 }

src/main/java/com/fun90/airopscat/service/DomainService.java

@@ -12,7 +12,10 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @ApplicationScoped
 public class DomainService {

src/main/java/com/fun90/airopscat/service/NodeService.java

@@ -1,6 +1,5 @@
 package com.fun90.airopscat.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fun90.airopscat.model.dto.xray.InboundConfig;
 import com.fun90.airopscat.model.dto.xray.setting.StreamSetting;

src/main/java/com/fun90/airopscat/service/SubscriptionService.java

@@ -15,6 +15,8 @@
 import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -216,6 +218,18 @@ private String generateConfigByApp(Account account, List<NodeDto> nodes, String
         return thymeleafUtil.processStringTemplate(templateContent, templateData);
     }
 
+    // 获取配置URL
+    public String getConfigUrl(Account account, String osName, String appName) {
+        if (account == null || account.getUuid() == null) {
+            return null;
+        }
+        String url = subscriptionUrl + "/config/" + account.getAuthCode() + "/" + osName + "/" + appName + "/";
+        if ("shadowrocket".equalsIgnoreCase(appName)) {
+            url += URLEncoder.encode(account.getRemark(), StandardCharsets.UTF_8) + "/";
+        }
+        return url;
+    }
+
     /**
      * 获取模板名称
      */

src/main/java/com/fun90/airopscat/service/ssh/SshConnectionService.java

@@ -6,8 +6,6 @@
 import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.IOException;
-
 @Slf4j
 @ApplicationScoped
 public class SshConnectionService {