From 81a706e8095186d070b8fac7259408a003581f4a Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Fri, 31 Jul 2020 14:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9session=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PaymentMerchantController.class.php      | 3 +++
 Application/Admin/Controller/UserController.class.php         | 2 +-
 Application/Common/Conf/config.php                            | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php
index 6185f2fe5..5e89bcb4c 100644
--- a/Application/Admin/Controller/PaymentMerchantController.class.php
+++ b/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) {
diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php
index 5dab9e377..5d1420f60 100644
--- a/Application/Admin/Controller/UserController.class.php
+++ b/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('该手机号码已经添加过!');
                 }
diff --git a/Application/Common/Conf/config.php b/Application/Common/Conf/config.php
index 8d45ce0a4..02bc95be5 100644
--- a/Application/Common/Conf/config.php
+++ b/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);