BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-11 15:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2.1 版本

Browse Source 
1. 框架更新至5.8，并且其涉及代码进行修改；
2.  对支付的alipay组件针对php7.2/3进行修改；
3. 重构了节点信息获取逻辑；现在为实时请求；
4. 代码小细节和命名规范
This commit is contained in:
Bretton
2020-01-30 06:54:50 +08:00
committed by 兔姬桑
parent 1891d9ff06
commit 7fa56ada16
149 changed files with 5677 additions and 5704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Exceptions/Handler.php
View File

@@ -58,8 +58,8 @@ class Handler extends ExceptionHandler
/**
* Render an exception into an HTTP response.
*
* @param Request $request
* @param Exception $exception
* @param Request $request
* @param Exception $exception
*
* @return Response
*/
@@ -75,7 +75,7 @@ class Handler extends ExceptionHandler
Log::info("异常请求：".$request->fullUrl()."，IP：".getClientIp());
if($request->ajax()){
return response()->json(['status' => 'fail', 'data' => '', 'message' => 'Page Not Found']);
return response()->json(['status' => 'fail', 'data' => '', 'message' => trans('error.MissingPage')]);
}else{
return response()->view('auth.error', ['message' => trans('error.MissingPage')]);
}
@@ -84,7 +84,7 @@ class Handler extends ExceptionHandler
// 捕获身份校验异常
if($exception instanceof AuthenticationException){
if($request->ajax()){
return response()->json(['status' => 'fail', 'data' => '', 'message' => 'Unauthorized']);
return response()->json(['status' => 'fail', 'data' => '', 'message' => trans('error.Unauthorized')]);
}else{
return response()->view('auth.error', ['message' => trans('error.Unauthorized')]);
}
@@ -93,16 +93,16 @@ class Handler extends ExceptionHandler
// 捕获CSRF异常
if($exception instanceof TokenMismatchException){
if($request->ajax()){
return response()->json(['status' => 'fail', 'data' => '', 'message' => 'System Error, Please Refresh Page, Try One More Time']);
return response()->json(['status' => 'fail', 'data' => '', 'message' => trans('error.RefreshPage').'<a href="/login" target="_blank">'.trans('error.Refresh').'</a>']);
}else{
return response()->view('auth.error', ['message' => trans('error.RefreshPage')]);
return response()->view('auth.error', ['message' => trans('error.RefreshPage').'<a href="/login" target="_blank">'.trans('error.Refresh').'</a>']);
}
}
// 捕获反射异常
if($exception instanceof ReflectionException){
if($request->ajax()){
return response()->json(['status' => 'fail', 'data' => '', 'message' => 'System Error']);
return response()->json(['status' => 'fail', 'data' => '', 'message' => trans('error.SystemError')]);
}else{
return response()->view('auth.error', ['message' => trans('error.SystemError')]);
}
@@ -111,7 +111,7 @@ class Handler extends ExceptionHandler
// 捕获系统错误异常
if($exception instanceof ErrorException){
if($request->ajax()){
return response()->json(['status' => 'fail', 'data' => '', 'message' => 'System Error']);
return response()->json(['status' => 'fail', 'data' => '', 'message' => trans('error.SystemError').', '.trans('error.Visit').'<a href="/logs" target="_blank">'.trans('error.log').'</a>']);
}else{
return response()->view('auth.error', ['message' => trans('error.SystemError').', '.trans('error.Visit').'<a href="/logs" target="_blank">'.trans('error.log').'</a>']);
}