From 0b305ba65bcf6ccce38486cd4f41438de920b688 Mon Sep 17 00:00:00 2001
From: qinzongqing <qinzongqing@wemediacn.com>
Date: Tue, 18 Apr 2023 18:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ControllerBase.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/ControllerBase.php b/app/controllers/ControllerBase.php
index 5a2629f..677a5ae 100644
--- a/app/controllers/ControllerBase.php
+++ b/app/controllers/ControllerBase.php
@@ -172,6 +172,7 @@ class ControllerBase extends Phalcon\Mvc\Controller{
 				//告知用户"ok"
 				$rs['errmsg'] = "ok";
 				$rs['errcode'] = 0;
+				$rs['data'] = array();
 				$rs['data']['request_arr'] = $request_arr;
 			}
 		}
@@ -205,7 +206,7 @@ class ControllerBase extends Phalcon\Mvc\Controller{
 			//告知用户"ok"
 			$rs['errmsg'] = "ok";
 			$rs['errcode'] = 0;
-			$rs['data'] = null;
+			$rs['data'] = array();
 		}
 		//返回结果
 		return $rs;
@@ -229,6 +230,7 @@ class ControllerBase extends Phalcon\Mvc\Controller{
 			//告知用户"ok"
 			$rs['errmsg'] = "ok";
 			$rs['errcode'] = 0;
+			$rs['data'] = array();
 			$rs['data']['AppInfo'] = $AppInfo;
 		}
 		//返回结果
@@ -266,12 +268,13 @@ class ControllerBase extends Phalcon\Mvc\Controller{
 					$rs['errcode'] = 80105;
 					$rs['data'] = null;
 				}
-				//如果现access_token未过期
+				//如果前access_token未过期
 				else{
 					//告知用户"ok"
 					$rs['errmsg'] = "ok";
 					$rs['errcode'] = 0;
-					$rs['data'] = null;
+					$rs['data'] = array();
+					$rs['data']['AccessToken'] = $AccessToken;
 				}
 			}
 			//如果所传access_token匹配现access_token
@@ -281,14 +284,15 @@ class ControllerBase extends Phalcon\Mvc\Controller{
 					//告知用户"access_token is expired,err detail:accesstoken 已过期"
 					$rs['errmsg'] = "access_token is expired,err detail:accesstoken 已过期";
 					$rs['errcode'] = 80105;
-					$rs['data']['AccessToken'] = $AccessToken;
+					$rs['data'] = null;
 				}
 				//如果现access_token未过期
 				else{
 					//告知用户"ok"
 					$rs['errmsg'] = "ok";
 					$rs['errcode'] = 0;
-					$rs['data'] = null;
+					$rs['data'] = array();
+					$rs['data']['AccessToken'] = $AccessToken;
 				}
 			}
 		}