Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Controller/BaseController.class.php

@@ -11,7 +11,7 @@ class BaseController extends RestController{
 		'Apple.apple_platform_pay','Spend.notice','Apple.apple_union_pay','WapPay.wap_shortcut_pay',
 		'WapPay.shortcut_pay','WapPay.android_shortcut_pay','WapPay.wap_shortcut_pay','WapPay.wap_shortcut_pay',
 		'Apple.apple_weixin_pay','Ipa365','User.user_login','platform_coin_deduction','get_user_money',
-        'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk',
+        'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk','get_suspend'
 //       'test','Game.get_suspend', 
         		
 	];

Application/Sdk/Controller/GameController.class.php

@@ -105,7 +105,9 @@ class GameController extends BaseController{
         }
         $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find();
         $menus = json_decode($sdkMenus['config'],true);
-        foreach($menus as $k => &$v) {
+        foreach($menus as $k => $v) {
+            if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version'])
+                unset($menus[$k]);
             $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon'];
 //             die;
             if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") {
@@ -128,7 +130,10 @@ class GameController extends BaseController{
         }
         $personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config');
         $personalMenu = json_decode($personalMenu, true);
-        foreach($personalMenu as $k => &$v) {
+        foreach($personalMenu as $k => $v) {
+            if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']){
+                unset($personalMenu[$k]);
+            }
         	 $personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon'];
 //             die;
             if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") {