两个模块中间件优化

app/admin/middleware/adminMiddleware.php

@@ -3,6 +3,7 @@
 namespace app\admin\middleware;
 
 use app\admin\logic\BaseLogic;
+use app\model\CommonModel;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Cache;
@@ -33,16 +34,22 @@ class adminMiddleware
 
         //判断白名单
         if (!in_array(request()->pathinfo(), $this->white_list)) {
-            $val = Validate::rule(['token'=>'require']);
 
-            if(!$val->check($param)) throw new ValidateException($val->getError());
+            try {
 
-            //获取用户信息
-            $user = verifyToken($param['token']);
-            BaseLogic::setUserInfo($user);
-            $request->uid = $user['uid'];
-            $request->uname = $user['uname'];
-            $request->roleid = $user['roleid'];
+                $val = Validate::rule(['token' => 'require']);
+
+                if (!$val->check($param)) throw new ValidateException($val->getError());
+
+                //获取用户信息
+                $user = verifyToken($param['token']);
+                BaseLogic::setUserInfo($user);
+                $request->uid = $user['uid'];
+                $request->uname = $user['uname'];
+                $request->roleid = $user['roleid'];
+            } catch (ValidateException $validateException) {
+                return json_show(CommonModel::$error_token, $validateException->getError());
+            }
         }
 
         return $next($request);
@@ -62,6 +69,4 @@ class adminMiddleware
     }
 
 
-
-
 }

app/mobile/logic/AccountLogic.php

@@ -117,10 +117,9 @@ class AccountLogic extends BaseLogic
         $rs = AccountModel::where(['id' => self::$aid, 'is_del' => CommonModel::$del_normal])
             ->save($da);
 
-        return $rs ? json_show(CommonModel::$success, '修改密码成功') : json_show(CommonModel::$error_param, '修改密码失败');
+        return $rs ? json_show(CommonModel::$error_token, '修改密码成功') : json_show(CommonModel::$error_param, '修改密码失败');
 
     }
 
 
-
 }

app/mobile/middleware/mobileMiddleware.php

@@ -35,19 +35,24 @@ class mobileMiddleware
 
         //判断白名单
         if (!in_array(request()->pathinfo(), $this->white_list)) {
-            $val = Validate::rule(['token' => 'require']);
 
-            if (!$val->check($param)) throw new ValidateException($val->getError());
+            try {
 
-            //获取用户信息
-            $account = $this->verifyMobileToken($param['token']);
-            BaseLogic::setUserInfo($account['aid'], $account['aname'], $account['company_id'], $account['card_id']);
+                $val = Validate::rule(['token' => 'require']);
 
-            $request->aid = $account['aid'];
-            $request->aname = $account['aname'];
-            $request->company_id = $account['company_id'];
-            $request->card_id = $account['card_id'];
+                if (!$val->check($param)) throw new ValidateException($val->getError());
 
+                //获取用户信息
+                $account = $this->verifyMobileToken($param['token']);
+                BaseLogic::setUserInfo($account['aid'], $account['aname'], $account['company_id'], $account['card_id']);
+
+                $request->aid = $account['aid'];
+                $request->aname = $account['aname'];
+                $request->company_id = $account['company_id'];
+                $request->card_id = $account['card_id'];
+            } catch (ValidateException $validateException) {
+                return json_show(CommonModel::$error_token, $validateException->getError());
+            }
         }
 
         return $next($request);