用户统一提交

application/api/controller/Sms.php

@@ -59,7 +59,7 @@ class Sms extends Api
         if ($ret) {
             $this->success(__('发送成功'));
         } else {
-            $this->error(__('发送失败，请检查短信配置是否正确'));
+            $this->error(__('发送失败，短信尚未对接'));
         }
     }
 

application/api/controller/User.php

@@ -290,10 +290,7 @@ class User extends Api
                     $ret = $this->auth->direct($user->id);
                     $is_register = 0;
 
-                    //非首次注册男性用户每次打开app，系统自动推送女性（公会）打招呼消息3人次
-                    /*if($user->gender == 1 && $user->gh_id == 0){
-                        $this->firstopen_send($user->id);
-                    }*/
+
                 } else {
 //                    $this->success('选择性别', ['code' => 5]);
 
@@ -303,15 +300,10 @@ class User extends Api
                     ];
                     $ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, $extend);
                     $is_register = 1;
-                    //亿米
-//                    if(input('register_from','') == 'xiaomi'){
-//                        $this->yimi_advert();
-//                    }
+
                 }
 
-                //结果
-                /*$rs['userinfo'] = $this->auth->getUserinfo();
-                $rs['is_register'] = $is_register;*/
+
                 if ($ret) {
                     $this->success(__('Logged in successful'), $this->auth->getUserinfo());
                 } else {
@@ -381,10 +373,7 @@ class User extends Api
                     $ret = $this->auth->direct($user->id);
                     $is_register = 0;
 
-                    //非首次注册男性用户每次打开app，系统自动推送女性（公会）打招呼消息3人次
-                    /*if($user->gender == 1 && $user->gh_id == 0){
-                        $this->firstopen_send($user->id);
-                    }*/
+
                 } else {
                     $extend = [
                         'register_from' => input('register_from',''),
@@ -392,15 +381,11 @@ class User extends Api
                     ];
                     $ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, $extend);
                     $is_register = 1;
-                    //亿米
-//                    if(input('register_from','') == 'xiaomi'){
-//                        $this->yimi_advert();
-//                    }
+
                 }
 
                 //结果
-                /*$rs['userinfo'] = $this->auth->getUserinfo();
-                $rs['is_register'] = $is_register;*/
+
                 if ($ret) {
                     $this->success(__('Logged in successful'), $this->auth->getUserinfo());
                 } else {
@@ -1857,7 +1842,7 @@ class User extends Api
             $this->error('您的网络开小差啦~');
         }
 
-        $data = $this->userInfo('return');
+        //$data = $this->userInfo('return');
         $data['gender'] = $edit_data['gender'];
         $data['avatar'] = $edit_data['avatar'];
 

application/common.php

@@ -765,7 +765,7 @@ function get_last_time($time = NULL) {
     $t = time() - $time; //时间差 （秒）
     $y = date('Y', $time)-date('Y', time());//是否跨年
     switch($t){
-        case $t = 0:
+        case $t == 0:
             $text = '刚刚';
             break;
         case $t < 60:

application/common/controller/Api.php

@@ -409,7 +409,7 @@ class Api
             // http协议：http://api.ip138.com/ip/
             // https协议：https://api.ip138.com/ip/
 
-            $url = 'http://api.ip138.com/ip/?ip='.$ip.'&datatype=jsonp&token=19fc471ea42124e6d1f7e4e473ef2647'; //15811816496   huang19871217
+            $url = 'http://api.ip138.com/ip/?ip='.$ip.'&datatype=jsonp&token=b25bac08734ed80bb3aebffd90dab87a'; //13001877198密码zhang139033
             $result = json_decode(curl_get($url),true);
             //dump($result);exit;