Merge branch 'hotfix/session_and_bug' of wmtx/platform into release

修改session过期时间

Application/Admin/Controller/AdminController.class.php

@@ -48,7 +48,7 @@ class AdminController extends Controller {
             if ( false === $access ) {
                 $this->error('403:禁止访问');
             }elseif(null === $access ){
-                $access_controller = ['Ajax', 'Finance', 'FinancePromote', 'PayChannel','FinanceCompare',"AggregateFinanceStatement"];
+                $access_controller = ['Ajax', 'Finance', 'FinancePromote', 'PayChannel','FinanceCompare',"AggregateFinanceStatement","PaymentMerchant"];
                 if(!in_array(CONTROLLER_NAME, $access_controller)){//ajax放行
                     //检测访问权限
                     $rule  = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME);

Application/Admin/Controller/PaymentMerchantController.class.php

@@ -469,6 +469,7 @@ class PaymentMerchantController extends ThinkController
     
     public function addRule()
     {
+        $this->meta_title = '新增支付商户配置';
         $gameService = new GameService();
         $gameTypes = $gameService->getGameTypes(null, 'id,type_name');
         $games = $gameService->getBaseGames(null, 'id,name');
@@ -554,6 +555,8 @@ class PaymentMerchantController extends ThinkController
 
     public function editRule()
     {
+        $this->meta_title = '修改支付商户配置';
+
         $id = I('id', 0);
         $rule = M('payment_rule', 'tab_')->where(['id' => $id])->find();
         if ($rule === null) {

Application/Admin/Controller/UserController.class.php

@@ -382,7 +382,7 @@ class UserController extends AdminController
             }
 
             if($_POST['mobile']) {
-                $mobile_data = M("ucenter_member")->where(['mobile'=>$_POST['mobile']])->find();
+                $mobile_data = M("ucenter_member")->where(['mobile'=>$_POST['mobile'], 'id' => ['neq', $id]])->find();
                 if ($mobile_data) {
                     $this->error('该手机号码已经添加过！');
                 }

Application/Common/Conf/config.php

@@ -88,6 +88,10 @@ $config = array(
     'ERROR_MESSAGE' => '页面错误！请稍后再试～',//错误显示信息,非调试模式有效
     'ERROR_PAGE' => 'public/error/404.html', // 错误定向页面。
 
+    // session 配置数组 支持type name id path expire domain 等参数
+    'SESSION_OPTIONS' =>  array(
+        'expire' => 7200
+    ),
 );
 $config = array_merge($config, $env);
 return array_merge($config, $cache_config);