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

app/Http/Controllers/Admin/UserController.php

@@ -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)

app/Http/Controllers/Server/ShadowsocksTidalabController.php

@@ -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();