From 90ae2df1999659cd5a956742fe2be05ba92a38ff Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 31 Aug 2019 14:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8F=96=E6=B6=88=E5=9C=B0?=
 =?UTF-8?q?=E5=9F=9F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ServerSwitchController.class.php           |  5 +++--
 webapp/controller/ShopController.class.php     |  9 +++++++++
 webapp/controller/TeamController.class.php     | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/ServerSwitchController.class.php b/webapp/controller/ServerSwitchController.class.php
index b72f375..1bbe3b7 100644
--- a/webapp/controller/ServerSwitchController.class.php
+++ b/webapp/controller/ServerSwitchController.class.php
@@ -17,7 +17,8 @@ class ServerSwitchController {
 
     private function isForbidCity()
     {
-        if (in_array(strtolower($_REQUEST['province']),
+        return false;
+        /*if (in_array(strtolower($_REQUEST['province']),
                      array(
                          strtolower('Shanghai'),
                          strtolower('Beijing'),
@@ -36,7 +37,7 @@ class ServerSwitchController {
         ) {
             return true;
         }
-        return false;
+        return false;*/
     }
 
     public function getSwitch()
diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 6833aa5..d04030d 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -170,6 +170,9 @@ class ShopController{
             return;
         }
         $shop_id = $_REQUEST['shop_id'];
+        if (!isset($_REQUEST['shop_uuid'])) {
+            return;
+        }
         $shop_uuid = $_REQUEST['shop_uuid'];
         $item_id = 0;
         $item_num = 0;
@@ -237,6 +240,9 @@ class ShopController{
             phpcommon\sendError(ERR_USER_BASE + 1, 'session无效');
             return;
         }
+        if (!isset($_REQUEST['shop_uuid'])) {
+            return;
+        }
         $shop_id = $_REQUEST['shop_id'];
         $shop_uuid = $_REQUEST['shop_uuid'];
         $item_id = 0;
@@ -291,6 +297,9 @@ class ShopController{
             phpcommon\sendError(ERR_USER_BASE + 1, 'session无效');
             return;
         }
+        if (!isset($_REQUEST['shop_uuid'])) {
+            return;
+        }
         $shop_uuid = $_REQUEST['shop_uuid'];
         $shop_type = $_REQUEST['shop_type'];
         $shop_list = array();
diff --git a/webapp/controller/TeamController.class.php b/webapp/controller/TeamController.class.php
index 99102df..fce7549 100644
--- a/webapp/controller/TeamController.class.php
+++ b/webapp/controller/TeamController.class.php
@@ -49,6 +49,9 @@ class TeamController{
 
     public function teamInfo()
     {
+        if (!isset($_REQUEST['team_uuid'])) {
+            return;
+        }
         $team_uuid = $_REQUEST['team_uuid'];
         $r = $this->getRedis($team_uuid);
 
@@ -87,6 +90,9 @@ class TeamController{
 
     public function joinTeam()
     {
+        if (!isset($_REQUEST['team_uuid'])) {
+            return;
+        }
         $team_uuid = $_REQUEST['team_uuid'];
 
         $r = $this->getRedis($team_uuid);
@@ -137,6 +143,9 @@ class TeamController{
 
     public function kickoutMember()
     {
+        if (!isset($_REQUEST['team_uuid'])) {
+            return;
+        }
         $team_uuid = $_REQUEST['team_uuid'];
         $r = $this->getRedis($team_uuid);
         if (!$r) {
@@ -189,6 +198,9 @@ class TeamController{
 
     public function leaveTeam()
     {
+        if (!isset($_REQUEST['team_uuid'])) {
+            return;
+        }
         $team_uuid = $_REQUEST['team_uuid'];
         $r = $this->getRedis($team_uuid);
 
@@ -235,6 +247,9 @@ class TeamController{
 
     public function updateTeam()
     {
+        if (!isset($_REQUEST['team_uuid'])) {
+            return;
+        }
         $team_uuid = $_REQUEST['team_uuid'];
         $r = $this->getRedis($team_uuid);
 
@@ -272,6 +287,9 @@ class TeamController{
 
     public function startGame()
     {
+        if (!isset($_REQUEST['team_uuid'])) {
+            return;
+        }
         $team_uuid = $_REQUEST['team_uuid'];
         $r = $this->getRedis($team_uuid);