yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-06-14 13:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/v2board/v2board into dev

Browse Source
This commit is contained in:
Tokumeikoi
2020-11-02 22:22:48 +08:00
parent ebce59a0d1 e6f1bae7e9
commit 6d9ab7dfe2
6 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/UserController.php
View File

@ -135,7 +135,7 @@ class UserController extends Controller
$subscribeUrl = $baseUrl . '/api/v1/client/subscribe?token=' . $user['token'];
$data .= "{$user['email']},{$balance},{$commissionBalance},{$transferEnable},{$notUseFlow},{$expireDate},{$planName},{$subscribeUrl}\r\n";
}
echo $data;
echo "\xEF\xBB\xBF" . $data;
}
public function generate(UserGenerate $request)

3
app/Http/Controllers/Server/ShadowsocksTidalabController.php
View File

@ -9,7 +9,6 @@ use App\Utils\CacheKey;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Models\User;
use App\Models\ServerTrojan;
use App\Models\ServerLog;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@ -91,7 +90,7 @@ class ShadowsocksTidalabController extends Controller
$item['u'],
$item['d'],
$server->rate,
'trojan'
'shadowsocks'
);
}
DB::commit();