Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -233,7 +233,10 @@ class LoginController extends BaseController
         $common = new Common();
         $common = new Common();
         $arr = $common->decrypt(urldecode($this->param['token']));
         $arr = $common->decrypt(urldecode($this->param['token']));
         if(empty($arr)){
         if(empty($arr)){
-            $this->response('登录失败',Code::USER_ERROR);
+            $this->response('非法请求！',Code::USER_ERROR);
+        }
+        if (empty($arr['timestamp']) || time() - $arr['timestamp'] > 60) {
+            $this->response('授权已过期，请重新获取授权码！',Code::USER_ERROR);
         }
         }
         //没有from_order_id的项目  进入演示版 运营中心
         //没有from_order_id的项目  进入演示版 运营中心
         $arr['from_order_id'] = $arr['from_order_id'] ?? 0;
         $arr['from_order_id'] = $arr['from_order_id'] ?? 0;