stanley-king 6 年 前
コミット
30684770ea

+ 1 - 1
helper/event/buffer_looper.php

@@ -38,7 +38,7 @@ class buffer_looper
         $this->mEvTimeouts = [];
 
         $this->mBufferID = 1;
-//        event_init(); //for libevent C 库 2.16 版本
+        //event_init(); //for libevent C 库 2.16 版本
         $this->mEvBase   = event_base_new();
     }
 

+ 0 - 1
helper/fcgi_server.php

@@ -144,7 +144,6 @@ class fcgi_server
             session::instance()->end();
             fcgi_headers_sent();
             $contents = ob_get_clean();
-//            Log::record("run_looper contents={$contents}",Log::ERR);
             fcgi_echo($contents);
             Log::end_sql_log();
 

+ 1 - 13
helper/request_helper.php

@@ -249,22 +249,12 @@ class request_helper
             }
         }
     }
-    /**
-     * 302  跳转
-     */
-    static public function url_jump(){
-        Log::record("server:" . json_encode($_SERVER));
-        if ($_SERVER['HTTP_CLIENT_TYPE'] == 'Android' && $_SERVER['HTTP_CLIENT_VERSION'] == '3') {
-             http_header::instance()->header('location:http://a.lrlz.com:8000'.request_helper::req_uri(),false,302);
-        }
-   }
 }
 
 function init_request()
 {
     request_helper::fill_server();
     request_helper::fill_param();
-    //request_helper::url_jump();
 }
 
 class local_request
@@ -298,7 +288,6 @@ class local_request
     }
 }
 
-
 function init_localreq(local_request $req)
 {
     $squery = $req->query_string();
@@ -313,5 +302,4 @@ function init_localreq(local_request $req)
             $_POST[$key] = $val;
         }
     }
-}
-
+}

+ 4 - 0
helper/session_helper.php

@@ -274,6 +274,10 @@ class session_helper
         }
         else
         {
+            if(session_helper::client_type() == session_helper::device_mini) {
+                return false;
+            }
+
             $relay_id = session_helper::relay_id();
             if(session_helper::logined()) {
                 return false;

+ 0 - 32
mobile/control/member_info.php

@@ -252,36 +252,4 @@ class member_infoControl extends mbMemberControl
     {
         return self::outsuccess(['url' => session_helper::qrcode()]);
     }
-
-    /**
-     * 微信绑定
-     *
-     * 输入参数:
-     * wx_openid 微信id
-     * user_info: 用户信息
-     */
-//    public function bindOp()
-//    {
-//        $wx_openid = trim($_GET['wx_openid']);
-//        $wx_info = trim($_GET['user_info']);
-//
-//        Log::record("wechat info={$wx_info}",Log::DEBUG);
-//
-//        // 输入内容判断
-//        $validator = new Validate();
-//        $validator->setValidate(Validate::verify_openid($wx_openid));
-//        $err = $validator->validate();
-//        if ($err != '') {
-//            return self::outerr(errcode::ErrInputParam);
-//        }
-//
-//        // 判断是否处理
-//        $model = Model('member');
-//        $ret = $model->editMember(array('member_id' => $_SESSION['member_id']), array('member_wxopenid' => $wx_openid, 'wx_info' => serialize($wx_info)));
-//        if ($ret == false) {
-//            return self::outerr(errcode::ErrDB);
-//        } else {
-//            return self::outsuccess(NULL);
-//        }
-//    }
 }

+ 5 - 0
test/TestEvent.php

@@ -33,6 +33,11 @@ class TestServer extends PHPUnit_Framework_TestCase
         Base::run_util();
     }
 
+    public function testFactory()
+    {
+        room\factory_client::instance()->access();
+    }
+
     public function testAsyncALl()
     {
         global $config;

+ 0 - 1
test/TestSocket.php

@@ -95,6 +95,5 @@ class TestSocket extends PHPUnit_Framework_TestCase
     {
         $path = '/Users/stanley-king/work/PHPProject/shopnc/data/upload/shop/store/goods/6/6_05215748240985301_240.jpg';
         $info = pathinfo($path);
-
     }
 }

+ 2 - 2
test/TestStat.php

@@ -74,11 +74,11 @@ class TestStat extends PHPUnit_Framework_TestCase
         $y = urldecode($x);
         $z = base64_decode($y);
 
-        $t = 'act=member_bonus&op=index';
+        $t = 'special_id=0&act=special&op=index&page=10&curpage=1';
         $t1=base64_encode($t);
         $t2=urlencode($t1);
 
-        $n = 'YWN0PXNwZWNpYWwmb3A9aW5kZXgmc3BlY2lhbF9pZD0w';
+        $n = 'c3BlY2lhbF9pZD0wJmFjdD1zcGVjaWFsJm9wPWluZGV4JnBhZ2U9MTAmY3VycGFnZT0x';
         $k = urlencode($n);
     }