牟新芬 3 years ago
parent
commit
893ecd85ad

+ 0 - 48
app/admin/middleware/SeretKeyMiddleware.php

@@ -1,48 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | Author: TABLE ME
-// +----------------------------------------------------------------------
-// | Date: 2020-08-30 14:59
-// +----------------------------------------------------------------------
-namespace app\admin\middleware;
-
-use app\model\admin\Site;
-use app\Request;
-use library\exceptions\AuthException;
-use library\interfaces\MiddlewareInterface;
-
-class SeretKeyMiddleware implements MiddlewareInterface
-{
-    public function handle(Request $request, \Closure $next)
-    {
-        $secret_key =$request->header('SECRET-KEY');
-        $request->site = $this->checkSecret($secret_key);
-        return $next($request);
-    }
-
-
-    /**
-     * 检查数据是否正常
-     * @param $secret_key
-     */
-    private function checkSecret($secret_key) {
-        if(empty($secret_key)) {
-            throw new AuthException('当前站点已经不存在,暂无法登陆', -100);
-        }
-       $siteData = (new Site)->where('secret_key',$secret_key)->find();
-       if(empty($siteData)) {
-           throw new AuthException('当前站点已经不存在,暂无法登陆', -100);
-       }
-       //站点停用
-       if(empty($siteData['status'])) {
-           throw new AuthException('抱歉,前站点已经停用。', -100);
-       }
-       return $siteData->toArray();
-    }
-
-
-}

+ 3 - 5
app/admin/route/admin.php

@@ -30,11 +30,9 @@ Route::group('admin', function () {
     Route::post('save','v1.admin/save');
     //删除管理员信息
     Route::post('del','v1.admin/del');
-    
+
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-   // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/adver.php

@@ -27,7 +27,5 @@ Route::group('adver', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 3
app/admin/route/bind.php

@@ -22,6 +22,5 @@ Route::group('bind', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/category.php

@@ -18,7 +18,5 @@ Route::group('category', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 3
app/admin/route/commission.php

@@ -21,6 +21,5 @@ Route::group('commission', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 3
app/admin/route/index.php

@@ -25,6 +25,5 @@ Route::group('index', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/log.php

@@ -21,7 +21,5 @@ Route::group('log', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-   // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/member.php

@@ -31,7 +31,5 @@ Route::group('member', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-   // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/news.php

@@ -19,7 +19,5 @@ Route::group('news', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-   // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 3 - 5
app/admin/route/order.php

@@ -23,10 +23,8 @@ Route::group('order', function () {
 
     //售后订单
     Route::rule('orderMonoList','v1.Order/orderMonoList');
-    
+
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/platform.php

@@ -23,7 +23,5 @@ Route::group('platform', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/product.php

@@ -21,7 +21,5 @@ Route::group('product', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 3
app/admin/route/recharge.php

@@ -17,6 +17,5 @@ Route::group('recharge', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 4 - 6
app/admin/route/role.php

@@ -1,6 +1,6 @@
 <?php
 
-/* 
+/*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
@@ -14,10 +14,8 @@ Route::group('role',function(){
     Route::post('save','v1.role/save');
     //删除管理员信息
     Route::post('del','v1.role/del');
-    
+
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-   // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 3 - 4
app/admin/route/route.php

@@ -15,11 +15,10 @@ Route::group(function () {
     //后台管理员登录
     Route::rule('login/login', 'Login/index');
     //验证码
-    
+
     Route::rule('index', 'Index/index');
 })->middleware([
-    \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
+    \app\admin\middleware\AllowOriginMiddleware::class
 ]);
 
 
@@ -38,4 +37,4 @@ Route::miss(function () {
         return Response::create('ok')->code(200)->header($header);
     } else
         return Response::create()->code(404);
-});
+});

+ 2 - 4
app/admin/route/site.php

@@ -16,7 +16,5 @@ Route::group('site', function () {
     Route::rule('list', 'v1.site/list');
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/sys.php

@@ -18,7 +18,5 @@ Route::group('sys', function () {
     Route::rule('save','v1.sys/save');
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-   // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/sysmenu.php

@@ -26,7 +26,5 @@ Route::group('sysmenu', function () {
 //    Route::rule('del','v1.sysMenu/del');
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 5
app/admin/route/upload.php

@@ -17,8 +17,5 @@ Route::group('upload', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-//    \app\admin\middleware\SeretKeyMiddleware::class
-   // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 2 - 4
app/admin/route/warehouse.php

@@ -31,7 +31,5 @@ Route::group('warehouse', function () {
 
 })->middleware([
     \app\admin\middleware\AllowOriginMiddleware::class,
-    \app\admin\middleware\AdminAuthTokenMiddleware::class,
-    \app\admin\middleware\SeretKeyMiddleware::class
-    // \app\adminapi\middleware\AdminCkeckRole::class
-]);
+    \app\admin\middleware\AdminAuthTokenMiddleware::class
+]);

+ 0 - 48
app/api/middleware/SeretKeyMiddleware.php

@@ -1,48 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | [ WE CAN DO IT MORE SIMPLE  ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2018-2020 rights reserved.
-// +----------------------------------------------------------------------
-// | Author: TABLE ME
-// +----------------------------------------------------------------------
-// | Date: 2020-08-30 14:59
-// +----------------------------------------------------------------------
-namespace app\api\middleware;
-
-use app\model\api\Site;
-use app\Request;
-use library\exceptions\AuthException;
-use library\interfaces\MiddlewareInterface;
-
-class SeretKeyMiddleware implements MiddlewareInterface
-{
-    public function handle(Request $request, \Closure $next)
-    {
-        $secret_key =$request->header('SECRET-KEY');
-        $request->site = $this->checkSecret($secret_key);
-        return $next($request);
-    }
-
-
-    /**
-     * 检查数据是否正常
-     * @param $secret_key
-     */
-    private function checkSecret($secret_key) {
-        if(empty($secret_key)) {
-            throw new AuthException('当前站点已经不存在,暂无法登陆', -100);
-        }
-       $siteData = (new Site)->where('secret_key',$secret_key)->find();
-       if(empty($siteData)) {
-           throw new AuthException('当前站点已经不存在,暂无法登陆', -100);
-       }
-       //站点停用
-       if(empty($siteData['status'])) {
-           throw new AuthException('抱歉,前站点已经停用。', -100);
-       }
-       return $siteData->toArray();
-    }
-
-
-}

+ 1 - 2
app/api/route/bind.php

@@ -19,6 +19,5 @@ Route::group('bind', function () {
     //绑定成功
     Route::rule('bindsuccess','v1.bind/bindsuccess');
 
-
 })->middleware([
-]);
+]);

+ 1 - 2
app/api/route/index.php

@@ -26,6 +26,5 @@ Route::group('index',function () {
 
 
 })->middleware([
-    AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class
+    AllowOriginMiddleware::class
 ]);

+ 1 - 9
app/api/route/login.php

@@ -25,17 +25,9 @@ Route::group('login',function () {
     Route::rule('forget1','v1.login/forget1');
     //忘记密码第二步
     Route::rule('forget2','v1.login/forget2');
-
     //忘记密码第二步
     Route::rule('mreg','v1.login/mreg');
 
-
-
-
-
-
-
 })->middleware([
-    AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class
+    AllowOriginMiddleware::class
 ]);

+ 2 - 3
app/api/route/news.php

@@ -16,6 +16,5 @@ Route::group('news',function () {
     Route::rule('about','v1.news/about');
 
 })->middleware([
-    AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class
-]);
+    AllowOriginMiddleware::class
+]);

+ 1 - 2
app/api/route/platform.php

@@ -14,6 +14,5 @@ Route::group('platform',function () {
     //平台信息
     Route::rule('list', 'v1.platform/list');
 })->middleware([
-    AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class
+    AllowOriginMiddleware::class
 ]);

+ 1 - 2
app/api/route/pub.php

@@ -18,6 +18,5 @@ Route::group('pub',function () {
 
 
 })->middleware([
-    AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class
+    AllowOriginMiddleware::class
 ]);

+ 2 - 3
app/api/route/route.php

@@ -14,8 +14,7 @@ Route::group(function () {
     Route::rule('index', 'Index/index');
 
 })->middleware([
-    AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class
+    AllowOriginMiddleware::class
 ]);
 
 
@@ -29,4 +28,4 @@ Route::miss(function () {
         return Response::create('ok')->code(200)->header($header);
     } else
         return Response::create()->code(404);
-});
+});

+ 1 - 2
app/api/route/upload.php

@@ -19,6 +19,5 @@ Route::group('upload',function () {
 
 
 })->middleware([
-    AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class
+    AllowOriginMiddleware::class
 ]);

+ 1 - 2
app/api/route/user.php

@@ -85,6 +85,5 @@ Route::group('user',function () {
 
 })->middleware([
     AllowOriginMiddleware::class,
-    SeretKeyMiddleware::class,
     UserMiddleware::class
-]);
+]);