Browse Source

update: subscribe url random

tokumeikoi 3 years ago
parent
commit
04615688f7

+ 5 - 1
app/Http/Controllers/User/KnowledgeController.php

@@ -28,7 +28,11 @@ class KnowledgeController extends Controller
                 $appleIdPassword = __('No active subscription. Unable to use our provided Apple ID');
                 $this->formatAccessData($knowledge['body']);
             }
-            $subscribeUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+            $subscribeUrl = config('v2board.app_url', env('APP_URL'));
+            $subscribeUrls = explode(',', config('v2board.subscribe_url'));
+            if ($subscribeUrls) {
+                $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
+            }
             $knowledge['body'] = str_replace('{{siteName}}', config('v2board.app_name', 'V2Board'), $knowledge['body']);
             $knowledge['body'] = str_replace('{{appleId}}', $appleId, $knowledge['body']);
             $knowledge['body'] = str_replace('{{appleIdPassword}}', $appleIdPassword, $knowledge['body']);

+ 6 - 1
app/Http/Controllers/User/UserController.php

@@ -118,7 +118,12 @@ class UserController extends Controller
                 abort(500, __('Subscription plan does not exist'));
             }
         }
-        $user['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+        $subscribeUrl = config('v2board.app_url', env('APP_URL'));
+        $subscribeUrls = explode(',', config('v2board.subscribe_url'));
+        if ($subscribeUrls) {
+            $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
+        }
+        $user['subscribe_url'] = "{$subscribeUrl}/api/v1/client/subscribe?token={$user['token']}";
         $user['reset_day'] = $this->getResetDay($user);
         return response([
             'data' => $user

+ 1 - 1
app/Http/Requests/Admin/ConfigSave.php

@@ -31,7 +31,7 @@ class ConfigSave extends FormRequest
             'app_name' => '',
             'app_description' => '',
             'app_url' => 'nullable|url',
-            'subscribe_url' => 'nullable|url',
+            'subscribe_url' => 'nullable',
             'try_out_enable' => 'in:0,1',
             'try_out_plan_id' => 'integer',
             'try_out_hour' => 'numeric',

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


Some files were not shown because too many files changed in this diff