修复配置获取

lib/Cloak/FCheckHandler.php

@@ -48,7 +48,12 @@ class FCheckHandler
         if (!class_exists('ConfigLoader', false)) {
             require_once dirname(__DIR__, 2) . '/config/ConfigLoader.php';
         }
-        $config_name = ConfigLoader::loadByHost($fp_host);
+        $explicitConfig = trim((string) ($fingerprint_info['config_name'] ?? ''));
+        $config_name = ConfigLoader::loadForFingerprint(
+            (string) ($fingerprint_info['domain'] ?? ''),
+            $fp_host,
+            $explicitConfig !== '' ? $explicitConfig : null
+        );
         $log_id      = (int) ($fingerprint_info['log_id'] ?? 0);
         if ($log_id <= 0) {
             $log_id = VisitorVisitContext::currentLogId();
@@ -191,9 +196,10 @@ class FCheckHandler
         RiskSecondaryCache::applyToSession($cached);
         $response = RiskSecondaryCache::toApiResponse($cached);
 
+        $resultStr = $response['result'] ? 'true' : 'false';
         $update_log = [
-            'result' => $response['result'] ? 'true' : 'false',
-            'reason' => cloak_cache_hit_log_reason($update_log['result']),
+            'result' => $resultStr,
+            'reason' => cloak_cache_hit_log_reason($resultStr),
             'fp_url' => trim((string) ($response['link'] ?? '')),
         ];
         if ($update_log['fp_url'] === '') {

lib/Cloak/FpRiskExplain.php

@@ -154,7 +154,14 @@ class FpRiskExplain
         if (!class_exists('DomainRepository', false)) {
             require_once __DIR__ . '/DomainRepository.php';
         }
-        $configName = DomainRepository::resolveConfigNameForHost((string) $host, $baseDir);
+        if (!class_exists('ConfigLoader', false)) {
+            require_once dirname(__DIR__, 2) . '/config/ConfigLoader.php';
+        }
+
+        $configName = ConfigLoader::resolveConfigNameFromUrl((string) $domain, $baseDir);
+        if ($configName === null) {
+            $configName = DomainRepository::resolveConfigNameForHost((string) $host, $baseDir);
+        }
         $file       = $baseDir . '/check_config/' . $configName . '_config.php';
         if (!is_file($file)) {
             $configName = 'index';

lib/Cloak/Page/FpPageRenderer.php

@@ -1,5 +1,6 @@
 <?php
 require_once __DIR__ . '/../FpUrlHelper.php';
+require_once dirname(__DIR__, 3) . '/config/ConfigLoader.php';
 
 /**
  * 真实页输出（原 page_6.php）
@@ -15,7 +16,9 @@ class FpPageRenderer
 
         $my_url       = $_SERVER['PHP_SELF'];
         $my_file_name = substr($my_url, strrpos($my_url, '/') + 1);
-        $cong_name    = str_replace('.php', '', $my_file_name);
+        $cong_name    = !empty($ctx['config_name'])
+            ? ConfigLoader::sanitizeConfigName($ctx['config_name'])
+            : str_replace('.php', '', $my_file_name);
 
         $resolved       = FpUrlHelper::resolve($cong_name, true);
         $fp_url         = $resolved['url'];

lib/Cloak/Pipeline/RouteResolver.php

@@ -119,9 +119,10 @@ class RouteResolver
             $log_id = write_log_db($logs);
             RiskSecondarySession::markWaitLog($log_id);
             $riskCtx = [
-                'logs'   => $logs,
-                'v_info' => $v_info,
-                'log_id' => $log_id,
+                'logs'        => $logs,
+                'v_info'      => $v_info,
+                'log_id'      => $log_id,
+                'config_name' => $config_name,
             ];
             if (CLOAK_REDIRECT_METHOD == 'curl') {
                 self::renderRiskCurlInject($riskCtx);