方法

app/business/controllers/BaseController.php

@@ -5,7 +5,6 @@ namespace business\controllers;
 use biz\merchant\services\AdminService;
 use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
-use common\components\httpUtil;
 use common\components\jwt;
 use Yii;
 use common\components\util;
@@ -20,7 +19,8 @@ class BaseController extends PublicController
 	public $isLogin = false;
 	public $withoutLogin = [];//不需要登陆的方法名
 	public $validate = true;
-	
+
+	//shish 2020.3.8
 	public function beforeAction($action)
 	{
 		//token验证
@@ -32,7 +32,7 @@ class BaseController extends PublicController
 		if (in_array($action->id, $this->withoutLogin)) {
 			$this->validate = true;
 		}
-
+		
 		if ($this->validate == false) {
 			util::notLogin();
 		}
@@ -54,8 +54,8 @@ class BaseController extends PublicController
 		return parent::beforeAction($action);
 	}
 	
-	public
-	function actionList()
+	//shisq
+	public function actionList()
 	{
 		$numargs = func_num_args();
 		$select = $numargs >= 1 ? func_get_arg(0) : '*';
@@ -68,8 +68,8 @@ class BaseController extends PublicController
 		util::success($list);
 	}
 	
-	public
-	function actionAdd()
+	//shisq
+	public function actionAdd()
 	{
 		$data = Yii::$app->request->post();
 		$service = $this->service;
@@ -77,8 +77,8 @@ class BaseController extends PublicController
 		util::success($re);
 	}
 	
-	public
-	function actionDetail()
+	//shisq
+	public function actionDetail()
 	{
 		$id = Yii::$app->request->get('id');
 		$service = $this->service;
@@ -93,8 +93,8 @@ class BaseController extends PublicController
 		util::fail('');
 	}
 	
-	public
-	function actionUpdate()
+	//shisq
+	public function actionUpdate()
 	{
 		$data = Yii::$app->request->post();
 		$id = $data['id'];
@@ -107,8 +107,8 @@ class BaseController extends PublicController
 		util::fail();
 	}
 	
-	public
-	function actionDelete()
+	//shisq
+	public function actionDelete()
 	{
 		$id = Yii::$app->request->get('id');
 		$service = $this->service;

common/components/util.php

@@ -464,7 +464,7 @@ class util
 	
 	public static function notLogin()
 	{
-		self::encode(['code' => -1, 'msg' => '没有登陆', 'data' => []]);
+		self::encode(['code' => -1, 'msg' => '当前登陆信息已失效，请重新登陆', 'data' => []]);
 	}
 	
 	//shisq