Browse Source

update: new feature

tokumeikoi 3 years ago
parent
commit
ebf98d42a8

+ 1 - 1
app/Http/Controllers/Admin/UserController.php

@@ -68,7 +68,7 @@ class UserController extends Controller
                     $res[$i]['plan_name'] = $plan[$k]['name'];
                 }
             }
-            $res[$i]['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $res[$i]['token'];
+            $res[$i]['subscribe_url'] = Helper::getSubscribeHost() . '/api/v1/client/subscribe?token=' . $res[$i]['token'];
         }
         return response([
             'data' => $res,

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

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

+ 10 - 0
app/Utils/Helper.php

@@ -95,4 +95,14 @@ class Helper
             return round($byte, 2) . ' B';
         }
     }
+
+    public static function getSubscribeHost()
+    {
+        $subscribeUrl = config('v2board.app_url');
+        $subscribeUrls = explode(',', config('v2board.subscribe_url'));
+        if ($subscribeUrls && $subscribeUrls[0]) {
+            $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
+        }
+        return $subscribeUrl;
+    }
 }

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


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