From 1111c6f13df1f17df2370c8ccb7dbf6474aba472 Mon Sep 17 00:00:00 2001
From: tokumeikoi <tokumeikoi@protonmail.com>
Date: Tue, 15 Mar 2022 22:40:30 +0800
Subject: [PATCH] update: support cf etag

---
 app/Http/Controllers/Server/DeepbworkController.php          | 4 ++--
 app/Http/Controllers/Server/ShadowsocksTidalabController.php | 4 ++--
 app/Http/Controllers/Server/TrojanTidalabController.php      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Server/DeepbworkController.php b/app/Http/Controllers/Server/DeepbworkController.php
index cdfe3d4f..d154b073 100644
--- a/app/Http/Controllers/Server/DeepbworkController.php
+++ b/app/Http/Controllers/Server/DeepbworkController.php
@@ -56,13 +56,13 @@ class DeepbworkController extends Controller
             array_push($result, $user);
         }
         $eTag = sha1(json_encode($result));
-        if ($eTag === $request->header("IF-NONE-MATCH")) {
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
             abort(304);
         }
         return response([
             'msg' => 'ok',
             'data' => $result,
-        ])->header('ETag', $eTag);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据
diff --git a/app/Http/Controllers/Server/ShadowsocksTidalabController.php b/app/Http/Controllers/Server/ShadowsocksTidalabController.php
index ad8f5c3e..1183be8b 100644
--- a/app/Http/Controllers/Server/ShadowsocksTidalabController.php
+++ b/app/Http/Controllers/Server/ShadowsocksTidalabController.php
@@ -49,12 +49,12 @@ class ShadowsocksTidalabController extends Controller
             ]);
         }
         $eTag = sha1(json_encode($result));
-        if ($eTag === $request->header("IF-NONE-MATCH")) {
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
             abort(304);
         }
         return response([
             'data' => $result
-        ])->header('ETag', $eTag);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据
diff --git a/app/Http/Controllers/Server/TrojanTidalabController.php b/app/Http/Controllers/Server/TrojanTidalabController.php
index bb6b3811..fb60606e 100644
--- a/app/Http/Controllers/Server/TrojanTidalabController.php
+++ b/app/Http/Controllers/Server/TrojanTidalabController.php
@@ -53,13 +53,13 @@ class TrojanTidalabController extends Controller
             array_push($result, $user);
         }
         $eTag = sha1(json_encode($result));
-        if ($eTag === $request->header("IF-NONE-MATCH")) {
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
             abort(304);
         }
         return response([
             'msg' => 'ok',
             'data' => $result,
-        ])->header('ETag', $eTag);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据