更新路由

app/common/middleware/SupplyAuthMiddleware.php

@@ -0,0 +1,95 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+
+namespace app\common\middleware;
+
+
+use app\common\repositories\system\auth\MenuRepository;
+use app\common\repositories\system\auth\RoleRepository;
+use app\Request;
+use think\exception\ValidateException;
+use think\Response;
+
+class SupplyAuthMiddleware extends BaseMiddleware
+{
+
+    public function before(Request $request)
+    {
+        $admin = $request->adminInfo();
+
+        $merchant = $request->merchant();
+
+        /** @var RoleRepository $role */
+        $role = app()->make(RoleRepository::class);
+
+        /** @var MenuRepository $menu */
+        $menu = app()->make(MenuRepository::class);
+
+        if ($admin->level) {
+            $rules = $role->idsByRules($request->merId(), $admin->roles);
+            $menus = count($rules) ? ($merchant->type_id ? $menu->typesByRoutes($merchant->type_id, $rules) : $menu->idsByRoutes($rules)) : [];
+            $msg = '没有权限访问';
+        } else {
+            $rules = [];
+            $menus = $merchant->type_id ? $menu->merchantTypeByRoutes($merchant->type_id) : [];
+            $msg = '请前往平台后台-商户 - 店铺管理 - 店铺类型-编辑店铺权限';
+        }
+
+        $request->macro('adminAuth', function () use (&$menus) {
+            return $menus;
+        });
+
+        $request->macro('adminRule', function () use (&$rules) {
+            return $rules;
+        });
+
+        $request->macro('checkAuth', function ($name, $vars) use (&$merchant, &$admin, &$menus, &$menu) {
+            if (!$name || (!$admin->level && !$merchant->type_id)) return true;
+            $isset = false;
+            foreach ($menus as $_menu) {
+                $keys = $menu->tidyParams($_menu['params']);
+                if ($_menu['route'] != $name) continue;
+                $isset = true;
+                if (!count($keys)) return true;
+                if ($menu->checkParams($keys, $vars))
+                    return true;
+            }
+            if ($isset || $menu->routeExists($name, 1))
+                return false;
+            return true;
+        });
+
+        $rule = $request->rule();
+        if (!$rule) {
+            return true;
+        }
+        $options = $rule->getOption();
+        if (!($options['_auth'] ?? true) && !isset($options['_form'])) {
+            return true;
+        }
+        if (isset($options['_form'])) {
+            $name = $options['_form'];
+            $var = $options['_form_val'] ?? [];
+        } else {
+            $name = $rule->getName();
+            $var = $rule->getVars();
+        }
+        if (!$request->checkAuth($name, $var))
+            throw new ValidateException($msg);
+    }
+
+    public function after(Response $response)
+    {
+        // TODO: Implement after() method.
+    }
+}

app/common/middleware/SupplyCheckBaseInfoMiddleware.php

@@ -0,0 +1,56 @@
+<?php
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+
+namespace app\common\middleware;
+
+
+use app\Request;
+use think\exception\ValidateException;
+use think\facade\Cache;
+use think\Response;
+
+class SupplyCheckBaseInfoMiddleware extends BaseMiddleware
+{
+
+    protected $rules = [
+        'merchantAttachmentCategoryCreate',
+        'merchantUpdate',
+        'merchantUploadImage',
+        'merchant.Common/uploadCertificate',
+        'merchantAttachmentCategoryUpdate',
+        'merchantAttachmentCategoryDelete',
+        'merchantAttachmentUpdate',
+        'merchantAttachmentDelete'
+    ];
+
+    public function before(Request $request)
+    {
+        $name = $this->request->rule()->getName();
+        if ($this->request->method() == 'GET' || in_array($name, $this->rules)) return;
+        $cache = Cache::store('file');
+        $merchant = $request->merchant();
+
+        $key = 'mer_valid_' . $merchant->mer_id;
+        if ($cache->has($key)) return;
+
+
+        if (!$merchant->mer_avatar || !$merchant->mer_banner || !$merchant->mer_info ||  !$merchant->mer_address) {
+            throw new ValidateException('您好，请前往左侧菜单【设置】-【商户基本信息】完善商户基本信息。');
+        }
+        Cache::store('file')->set('mer_valid_' . $merchant->mer_id, 1, 3600 * 8);
+    }
+
+    public function after(Response $response)
+    {
+        // TODO: Implement after() method.
+    }
+}

app/common/middleware/SupplyServerMiddleware.php

@@ -0,0 +1,57 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+
+namespace app\common\middleware;
+
+use app\common\repositories\store\service\StoreServiceRepository;
+use think\exception\HttpResponseException;
+use app\Request;
+use think\Response;
+use Throwable;
+
+class SupplyServerMiddleware extends BaseMiddleware
+{
+
+    public function before(Request $request)
+    {
+        $this->merId = $this->request->route('merId');
+
+        $type = $this->getArg(0);
+        $field = 'customer';
+        switch ($type) {
+            case 0:
+                $field = 'customer';
+                break;
+            case 1:
+                $field = 'is_goods';
+                break;
+        }
+        $userInfo = $this->request->userInfo();
+        $service = app()->make(StoreServiceRepository::class)->getService($userInfo->uid, $this->merId);
+        if (!$service && $userInfo->main_uid) {
+            $service = app()->make(StoreServiceRepository::class)->getService($userInfo->main_uid, $this->merId);
+        }
+
+        if (!$service || !$service->{$field}) {
+            throw new HttpResponseException(app('json')->fail('您没有权限操作'));
+        }
+        $request->macro('serviceInfo', function () use (&$service) {
+            return $service;
+        });
+    }
+
+    public function after(Response $response)
+    {
+        // TODO: Implement after() method.
+    }
+}

app/common/middleware/SupplyTokenMiddleware.php

@@ -0,0 +1,121 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+
+namespace app\common\middleware;
+
+use app\common\repositories\system\supply\SupplyAdminRepository;
+use app\common\repositories\system\supply\SupplyRepository;
+use app\Request;
+use crmeb\exceptions\AuthException;
+use crmeb\services\JwtTokenService;
+use Firebase\JWT\ExpiredException;
+use think\exception\ValidateException;
+use think\Response;
+use Throwable;
+
+class SupplyTokenMiddleware extends BaseMiddleware
+{
+
+    /**
+     * @param Request $request
+     * @throws Throwable
+     * @author xaboy
+     * @day 2020-04-10
+     */
+    public function before(Request $request)
+    {
+        $force = $this->getArg(0, true);
+        try {
+            $token = trim($request->header('X-Token'));
+            if(!$token) $token = trim($request->param('token',''));
+            if (strpos($token, 'Bearer') === 0)
+                $token = trim(substr($token, 6));
+            if (!$token)
+                throw new ValidateException('请登录');
+
+            /**
+             * @var SupplydminRepository $repository
+             */
+            $repository = app()->make(SupplyAdminRepository::class);
+            $service = new JwtTokenService();
+            try {
+                $payload = $service->parseToken($token);
+            } catch (ExpiredException $e) {
+                $repository->checkToken($token);
+                $payload = $service->decode($token);
+            } catch (Throwable $e) {//Token 过期
+                throw new AuthException('token 已过期');
+            }
+            if ('mer' != $payload->jti[1])
+                throw new AuthException('无效的 token');
+
+            $admin = $repository->get($payload->jti[0]);
+            if (!$admin)
+                throw new AuthException('账号不存在');
+            if (!$admin['status'])
+                throw new AuthException('账号已被禁用');
+
+            /**
+             * @var SupplyRepository $SupplyRepository
+             */
+            $merchantRepository = app()->make(SupplyRepository::class);
+
+            $merchant = $merchantRepository->get($admin->mer_id);
+
+            if (!$merchant || !$merchant['status'])
+                throw new AuthException('商户已被锁定');
+
+        } catch (Throwable $e) {
+            if ($force)
+                throw  $e;
+            $request->macro('isLogin', function () {
+                return false;
+            });
+            $request->macros(['tokenInfo', 'adminId', 'adminInfo', 'token', 'merchant', 'merchantId'], function () {
+                throw new AuthException('请登录');
+            });
+            return;
+        }
+        $repository->updateToken($token);
+
+        $request->macro('isLogin', function () {
+            return true;
+        });
+        $request->macro('tokenInfo', function () use (&$payload) {
+            return $payload;
+        });
+        $request->macro('token', function () use (&$token) {
+            return $token;
+        });
+        $request->macro('adminId', function () use (&$admin) {
+            return $admin->merchant_admin_id;
+        });
+        $request->macro('adminInfo', function () use (&$admin) {
+            return $admin;
+        });
+        $request->macro('merchantId', function () use (&$admin) {
+            return $admin->mer_id;
+        });
+        $request->macro('merchant', function () use (&$merchant) {
+            return $merchant;
+        });
+        $request->macro('userType', function () use (&$merchant) {
+            return 3;
+        });
+    }
+
+    public function after(Response $response)
+    {
+        // TODO: Implement after() method.
+    }
+}

app/controller/admin/system/auth/Menu.php

@@ -49,7 +49,7 @@ class Menu extends BaseController
     {
         parent::__construct($app);
         $this->repository = $repository;
-        $this->merchant = $this->request->param('merchant', 0) == 0 ? 0 : 1;
+        $this->merchant = $this->request->param('merchant', 2) == 0 ? 0 : 2;
     }
 
     /**
@@ -216,7 +216,7 @@ class Menu extends BaseController
      */
     public function supplyMenus()
     {
-        $pre = '/' . config('admin.merchant_prefix');
+        $pre = '/' . config('admin.supply_prefix');
         $merchant = $this->request->merchant();
         if ($this->request->adminInfo()->level) {
             $menus = $this->repository->ruleByMenuList($this->request->adminRule(), $this->merchant);

route/supply/accounts.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -237,7 +237,7 @@ Route::group(function () {
 
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/attachment.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -90,7 +90,7 @@ Route::group(function () {
     ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/config.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -30,7 +30,7 @@ Route::group(function () {
     ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/coupon.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -103,7 +103,7 @@ Route::group(function () {
         ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/delivery.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -185,7 +185,7 @@ Route::group(function () {
     ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/diy.php

@@ -12,9 +12,9 @@
 use think\facade\Route;
 use app\common\middleware\LogMiddleware;
 use app\common\middleware\AllowOriginMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -103,7 +103,7 @@ Route::group(function () {
     ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/form.php

@@ -48,7 +48,7 @@ Route::group(function () {
     ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(\app\common\middleware\MerchantTokenMiddleware::class, true)
+    ->middleware(\app\common\middleware\SupplyTokenMiddleware::class, true)
-    ->middleware(\app\common\middleware\MerchantAuthMiddleware::class)
+    ->middleware(\app\common\middleware\SupplyAuthMiddleware::class)
-    ->middleware(\app\common\middleware\MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(\app\common\middleware\SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/group.php

@@ -11,9 +11,9 @@
 
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
 
 Route::group(function () {
@@ -68,7 +68,7 @@ Route::group(function () {
     ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/marketing.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -490,7 +490,7 @@ Route::group(function () {
         ]
     ]);
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/openapi.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
     Route::group('openapi/',function(){
@@ -54,7 +54,7 @@ Route::group(function () {
     ]);
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/order.php

@@ -11,10 +11,10 @@
 
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -243,7 +243,7 @@ Route::group(function () {
 
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/product.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -452,7 +452,7 @@ Route::group(function () {
 
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/role.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
     //身份规则
@@ -123,7 +123,7 @@ Route::group(function () {
 
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/service.php

@@ -10,9 +10,9 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
 
 Route::group(function () {
@@ -87,7 +87,7 @@ Route::group(function () {
 
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/system.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -164,7 +164,7 @@ Route::group(function () {
         '_auth'  => true,
     ]);
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/users.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
     //搜索记录
@@ -103,7 +103,7 @@ Route::group(function () {
 
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);

route/supply/yihaotong.php

@@ -10,10 +10,10 @@
 // +----------------------------------------------------------------------
 use app\common\middleware\AllowOriginMiddleware;
 use app\common\middleware\LogMiddleware;
-use app\common\middleware\MerchantAuthMiddleware;
+use app\common\middleware\SupplyAuthMiddleware;
-use app\common\middleware\MerchantTokenMiddleware;
+use app\common\middleware\SupplyTokenMiddleware;
 use think\facade\Route;
-use app\common\middleware\MerchantCheckBaseInfoMiddleware;
+use app\common\middleware\SupplyCheckBaseInfoMiddleware;
 
 Route::group(function () {
 
@@ -60,7 +60,7 @@ Route::group(function () {
 
 
 })->middleware(AllowOriginMiddleware::class)
-    ->middleware(MerchantTokenMiddleware::class, true)
+    ->middleware(SupplyTokenMiddleware::class, true)
-    ->middleware(MerchantAuthMiddleware::class)
+    ->middleware(SupplyAuthMiddleware::class)
-    ->middleware(MerchantCheckBaseInfoMiddleware::class)
+    ->middleware(SupplyCheckBaseInfoMiddleware::class)
     ->middleware(LogMiddleware::class);