yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-09-20 21:04:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Tokumeikoi 2020-11-19 21:21:39 +08:00
commit baf719fcff
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/Server/PoseidonController.php
View File

@ -45,12 +45,11 @@ class PoseidonController extends Controller
$user->v2ray_user = [ $user->v2ray_user = [
"uuid" => $user->uuid, "uuid" => $user->uuid,
"email" => sprintf("%s@v2board.user", $user->uuid), "email" => sprintf("%s@v2board.user", $user->uuid),
"alter_id" => $user->v2ray_alter_id, "alter_id" => $server->alter_id,
"level" => $user->v2ray_level, "level" => 0,
]; ];
unset($user['uuid']); unset($user['uuid']);
unset($user['v2ray_alter_id']); unset($user['email']);
unset($user['v2ray_level']);
array_push($result, $user); array_push($result, $user);
} }
@ -136,9 +135,23 @@ class PoseidonController extends Controller
} }
protected function success($data) { protected function success($data) {
$req = request();
// Only for "GET" method
if (!$req->isMethod('GET') || !$data) {
return response([ return response([
'msg' => 'ok', 'msg' => 'ok',
'data' => $data, 'data' => $data,
]); ]);
} }
$etag = sha1(json_encode($data));
if ($etag == $req->header("IF-NONE-MATCH")) {
return response(null, 304);
}
return response([
'msg' => 'ok',
'data' => $data,
])->header('ETAG', $etag);
}
} }

2
app/Http/Requests/Admin/OrderAssign.php
View File

@ -17,7 +17,7 @@ class OrderAssign extends FormRequest
'plan_id' => 'required', 'plan_id' => 'required',
'email' => 'required', 'email' => 'required',
'total_amount' => 'required', 'total_amount' => 'required',
'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,onetime_price,reset_price' 'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,two_year_price,three_year_price,onetime_price,reset_price'
]; ];
} }