yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-10-31 09:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
root
2019-12-15 22:03:17 +08:00
parent 175372b9cd
commit 9066119fb5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Admin/ServerController.php
View File

@@ -14,8 +14,7 @@ use App\Models\User;
class ServerController extends Controller class ServerController extends Controller
{ {
public function index (Request $request) { public function index (Request $request) {
$server = Server::orderBy('name') $server = Server::get();
->get();
for ($i = 0; $i < count($server); $i++) { for ($i = 0; $i < count($server); $i++) {
if (!empty($server[$i]['tags'])) { if (!empty($server[$i]['tags'])) {
$server[$i]['tags'] = json_decode($server[$i]['tags']); $server[$i]['tags'] = json_decode($server[$i]['tags']);

4
app/Http/Controllers/UserController.php
View File

@@ -98,7 +98,9 @@ class UserController extends Controller
abort(500, '订阅计划不存在'); abort(500, '订阅计划不存在');
} }
if ($user->expired_at > time()) { if ($user->expired_at > time()) {
$servers = Server::where('show', 1)->get(); $servers = Server::where('show', 1)
->orderBy('name')
->get();
foreach ($servers as $item) { foreach ($servers as $item) {
$groupId = json_decode($item['group_id']); $groupId = json_decode($item['group_id']);
if (in_array($user->group_id, $groupId)) { if (in_array($user->group_id, $groupId)) {