Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

mobile/control/crash_log.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ */
+
+defined('InShopNC') or exit('Access Invalid!');
+
+class crash_logControl extends mobileHomeControl
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function uploadOp()
+    {
+        $crash_content = $_POST['content'];
+        if (!empty($crash_content)) {
+
+            $platform = $_GET['client'];
+            if (!empty($platform)) {
+                $path = BASE_DATA_PATH . '/log/' . $platform . '/';
+            } else {
+                $path = BASE_DATA_PATH . '/log/default/';
+            }
+
+            if (!is_dir($path)) mkdir($path);
+
+            $version = $_GET['version'];
+            if (!empty($version)) {
+                $path = $path . $version . '/';
+            } else {
+                $path = $path . 'default/';
+            }
+
+            if (!is_dir($path)) mkdir($path);
+
+            $file_name = date('Ymd', TIMESTAMP) . '-' . random(4) . '.crash.log';
+
+            file_put_contents($path . $file_name, $crash_content, FILE_APPEND);
+
+        } else {
+            return joutput_error(errcode::ErrInputParam, '无crash内容');
+        }
+
+        joutput_data();
+    }
+}

mobile/control/login.php

@@ -55,7 +55,7 @@ class loginControl extends mobileHomeControl
         $userid = $model_member->getMemberID($openid, $type, $password);
 
         if ($userid == -1) {
-            return joutput_error(errcode::ErrLogin, "{$openid}:{$password},登录失败");
+            return joutput_error(errcode::ErrLogin, "用户名或密码错误");
         } else {
             $key = memberModel::gen_uid_token($userid);
             $ret = rcache($key, 'member');
@@ -285,8 +285,8 @@ class loginControl extends mobileHomeControl
         }
 
         $model = Model('member');
-        $ret = $model->where(array('member_mobile' => $mobile))->find();
-        if(empty($ret) || count($ret) == 0) {
+        $member_info = $model->where(array('member_mobile' => $mobile))->find();
+        if(empty($member_info) || count($member_info) == 0) {
             return joutput_error(errcode::ErrUserExisted, "用户不存在.");
         }
         else
@@ -297,6 +297,8 @@ class loginControl extends mobileHomeControl
             {
                 $success = $model->where(array('member_mobile' => $mobile))->update(array('member_type' => 0,'member_passwd' => md5($password)));
                 if($success) {
+                    $key = $this->gen_openid_uid($mobile, 0);
+                    dcache($key, 'member');
                     return joutput_data(NULL);
                 } else {
                     return joutput_error(errcode::ErrDB,"DB error.");
@@ -361,6 +363,12 @@ class loginControl extends mobileHomeControl
         }
     }
 
+    public static function gen_openid_uid($openid, $type)
+    {
+        $key = 'openid_uid:' . $openid . ':' . $type;
+        return $key;
+    }
+
     public static function gen_token_code($token)
     {
         $key = 'token_code:' . $token;
@@ -406,7 +414,7 @@ class loginControl extends mobileHomeControl
 
         if ($status == 0) {
             $key = $this->gen_mobile_code($mobile);
-            wcache($key, array('code' => $code, 'mobile' => $mobile), 'member', self::code_expire);
+            $ret = wcache($key, array('code' => $code, 'mobile' => $mobile), 'member', self::code_expire);
             joutput_data(NULL);
         } else {
             return joutput_error(errcode::ErrSms, "send error={$status}.");

mobile/control/member_address.php

@@ -13,6 +13,8 @@ defined('InShopNC') or exit('Access Invalid!');
 
 class member_addressControl extends mobileMemberControl
 {
+    const MAX_ADDRESS_COUNT = 10;
+
 	public function __construct() {
 		parent::__construct();
 	}
@@ -85,6 +87,12 @@ class member_addressControl extends mobileMemberControl
             return joutput_error($err_code,$err);
         }
 
+        $addr_acount = $model_address->field('count(*) as address_count')->where(array('member_id' => $this->member_info['member_id']))->select();
+
+        if(intval($addr_acount[0]['address_count']) >= self::MAX_ADDRESS_COUNT){
+            return joutput_error(errcode::ErrAddress,'地址数量已达上限');
+        }
+
         $result = $model_address->addAddress($address_info);
         if($result)
         {

mobile/control/member_info.php

@@ -1,85 +1,85 @@
-<?php
-/**
- * 红包管理
- *
- *
- *
- ***/
-defined('InShopNC') or exit('Access Invalid!');
-
-class member_infoControl extends mobileMemberExControl
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function getinfoOp()
-    {
-        $token = $_GET['key'];
-
-        if (empty($token)) {
-            return joutput_error(errcode::ErrInputParam, '输入参数有误');
-        }
-
-        if ($this->checkToken($token) != errcode::Success) {
-            return joutput_error($this->err_code, errcode::msg($this->err_code));
-        }
-
-        $member_id = $this->member_info['member_id'];
-
-        $model = Model('member');
-        $member_info = $model->getMemberInfoByID($member_id, 'member_name,member_sex');
-
-        $ret = array();
-        if (!empty($member_info)) {
-
-            $ret['member_name'] = $member_info['member_name'];
-
-            if(empty($member_info['member_name'])){
-                $ret['member_name'] = '新用户';
-            }
-
-            if ($member_info['member_sex'] == 1) {
-                $ret['member_sex'] = '1';
-            } else {
-                $ret['member_sex'] = '0';
-            }
-        }
-
-        joutput_data($ret);
-    }
-
-    public function updateinfoOp()
-    {
-        $member_name = urldecode($_GET['member_name']);
-        $member_sex = urldecode($_GET['member_sex']);
-
-        if (empty($member_name) && empty($member_sex)) {
-            return joutput_error(errcode::ErrInputParam, '输入参数有误');
-        }
-
-        $token = $_GET['key'];
-        if ($this->checkToken($token) != errcode::Success) {
-            return joutput_error($this->err_code, errcode::msg($this->err_code));
-        }
-
-        $member_id = $this->member_info['member_id'];
-
-        $condition = array('member_id' => $member_id);
-        $updateinfo = array('member_name' => $member_name, 'member_sex' => $member_sex);
-
-        $ret = Model('member')->where($condition)->update($updateinfo);
-
-        dcache($member_id,'member');
-
-        $result = array();
-        if ($ret) {
-            $result['ret'] = 0;
-        } else {
-            $result['ret'] = 1;
-        }
-
-        joutput_data($result);
-    }
+<?php
+/**
+ * 绾㈠寘绠＄悊
+ *
+ *
+ *
+ ***/
+defined('InShopNC') or exit('Access Invalid!');
+
+class member_infoControl extends mobileMemberExControl
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function getinfoOp()
+    {
+        $token = $_GET['key'];
+
+        if (empty($token)) {
+            return joutput_error(errcode::ErrInputParam, '杈撳叆鍙傛暟鏈夎�');
+        }
+
+        if ($this->checkToken($token) != errcode::Success) {
+            return joutput_error($this->err_code, errcode::msg($this->err_code));
+        }
+
+        $member_id = $this->member_info['member_id'];
+
+        $model = Model('member');
+        $member_info = $model->getMemberInfoByID($member_id, 'member_name,member_sex');
+
+        $ret = array();
+        if (!empty($member_info)) {
+
+            $ret['member_name'] = $member_info['member_name'];
+
+            if(empty($member_info['member_name'])){
+                $ret['member_name'] = '新用户';
+            }
+
+            if ($member_info['member_sex'] == 1) {
+                $ret['member_sex'] = '1';
+            } else {
+                $ret['member_sex'] = '0';
+            }
+        }
+
+        joutput_data($ret);
+    }
+
+    public function updateinfoOp()
+    {
+        $member_name = urldecode($_GET['member_name']);
+        $member_sex = urldecode($_GET['member_sex']);
+
+        if (empty($member_name) && empty($member_sex)) {
+            return joutput_error(errcode::ErrInputParam, '杈撳叆鍙傛暟鏈夎�');
+        }
+
+        $token = $_GET['key'];
+        if ($this->checkToken($token) != errcode::Success) {
+            return joutput_error($this->err_code, errcode::msg($this->err_code));
+        }
+
+        $member_id = $this->member_info['member_id'];
+
+        $condition = array('member_id' => $member_id);
+        $updateinfo = array('member_name' => $member_name, 'member_sex' => $member_sex);
+
+        $ret = Model('member')->where($condition)->update($updateinfo);
+
+        dcache($member_id,'member');
+
+        $result = array();
+        if ($ret) {
+            $result['ret'] = 0;
+        } else {
+            $result['ret'] = 1;
+        }
+
+        joutput_data($result);
+    }
 }

shop/control/crash_log.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ *
+ */
+
+defined('InShopNC') or exit('Access Invalid!');
+
+class crash_logControl extends BaseHomeControl
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function uploadOp()
+    {
+        if ($_FILES['file']['error'] === 0) {
+
+            $platform = $_GET['client'];
+            if (!empty($platform)) {
+                $path = BASE_DATA_PATH . '/log/' . $platform . '/';
+            } else {
+                $path = BASE_DATA_PATH . '/log/default/';
+            }
+
+            if (!is_dir($path)) mkdir($path);
+
+            $version = $_GET['version'];
+            if (!empty($version)) {
+                $path = $path . $version . '/';
+            } else {
+                $path = $path . 'default/';
+            }
+
+            if (!is_dir($path)) mkdir($path);
+
+            $file_name = date('Ymd', TIMESTAMP) . '-' . random(4) . '.crash.log';
+
+            move_uploaded_file($_FILES['file']['tmp_name'], $path . $file_name);
+        }
+    }
+}