Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨昕
media-resource
Commits
a5d2752d
Commit
a5d2752d
authored
Aug 25, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code format
parent
b84d4533
Pipeline
#10837
passed with stages
in 45 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
7 deletions
+48
-7
IndexController.php
app/Http/Controllers/Web/IndexController.php
+2
-0
Kernel.php
app/Http/Kernel.php
+2
-2
AdminLogin.php
app/Http/Middleware/AdminLogin.php
+5
-3
ApiMiddleware.php
app/Http/Middleware/ApiMiddleware.php
+39
-0
MediaCategoryModel.php
app/Model/MediaCategoryModel.php
+0
-2
No files found.
app/Http/Controllers/Web/IndexController.php
View file @
a5d2752d
...
...
@@ -23,6 +23,7 @@ class IndexController extends Controller
$data
[
'catgs'
]
=
$mediaCatgs
;
return
view
(
'admin.index'
,
$data
);
}
}
\ No newline at end of file
app/Http/Kernel.php
View file @
a5d2752d
...
...
@@ -35,12 +35,13 @@ class Kernel extends HttpKernel
\Illuminate\View\Middleware\ShareErrorsFromSession
::
class
,
\App\Http\Middleware\VerifyCsrfToken
::
class
,
\Illuminate\Routing\Middleware\SubstituteBindings
::
class
,
\App\Http\Middleware\A
piMiddleware
::
class
,
\App\Http\Middleware\A
dminLogin
::
class
],
'auth'
=>
[
\App\Http\Middleware\Apprialisal
::
class
],
'api'
=>
[
'throttle:60,1'
,
'bindings'
,
\App\Http\Middleware\ApiMiddleware
::
class
,
],
];
...
...
@@ -62,7 +63,6 @@ class Kernel extends HttpKernel
'throttle'
=>
\Illuminate\Routing\Middleware\ThrottleRequests
::
class
,
'verified'
=>
\Illuminate\Auth\Middleware\EnsureEmailIsVerified
::
class
,
// 'admin.login' => \App\Http\Middleware\AdminLogin::class
];
/**
...
...
app/Http/Middleware/AdminLogin.php
View file @
a5d2752d
...
...
@@ -18,10 +18,12 @@ class AdminLogin
*/
public
function
handle
(
$request
,
Closure
$next
)
{
if
(
!
Auth
::
guard
(
'web'
)
->
check
())
{
return
redirect
(
'/web/login'
);
}
// if (!Auth::guard('web')->check()) {
// return redirect('/web/login');
// }
$user
=
Auth
::
user
();
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'mis_uid'
=>
$user
->
mis_uid
]));
//
// if (request()->isMethod('DELETE') || request()->isMethod('PUT')) {
// self::getPutValueHandle($request);
...
...
app/Http/Middleware/ApiMiddleware.php
View file @
a5d2752d
...
...
@@ -19,6 +19,45 @@ class ApiMiddleware
*/
public
function
handle
(
$request
,
Closure
$next
)
{
try
{
$response
=
$next
(
$request
);
}
catch
(
\App\Exceptions\FormException
$e
)
{
list
(
$code
,
$message
)
=
[
Response
::
HTTP_BAD_REQUEST
,
json_decode
(
$e
->
getMessage
(),
true
)];
}
catch
(
\App\Exceptions\DatabaseException
$e
)
{
list
(
$code
,
$message
)
=
[
Response
::
HTTP_INTERNAL_SERVER_ERROR
,
json_decode
(
$e
->
getMessage
(),
true
)];
}
catch
(
\App\Exceptions\ControllerException
$e
)
{
list
(
$code
,
$message
)
=
[
Response
::
HTTP_INTERNAL_SERVER_ERROR
,
json_decode
(
$e
->
getMessage
(),
true
)];
}
if
(
isset
(
$code
))
{
if
(
count
(
$message
)
==
1
)
{
$message
=
$message
[
0
];
}
else
if
(
count
(
$message
)
==
2
)
{
list
(
$code
,
$message
)
=
$message
;
}
else
if
(
count
(
$message
)
==
3
)
{
list
(
$client_info
,
$code
,
$message
)
=
$message
;
}
// Log::error('\\' . implode(CustomLog::getRoute()), $client_info, $code, $message, $request->all());
// Log::flush();
return
error
(
$message
,
$code
);
}
return
$response
;
$url
=
$request
->
path
();
$except_url
=
[
...
...
app/Model/MediaCategoryModel.php
View file @
a5d2752d
...
...
@@ -49,8 +49,6 @@ class MediaCategoryModel extends Eloquent
throw
new
\Exception
(
"获取商店列表失败"
);
}
$catgList
=
MediaCategoryModel
::
get
()
->
toArray
();
$appids
=
array_column
(
$catgs
[
'data'
],
"appid"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment