整理首页接口

application/api/controller/Baseconfig.php

@@ -80,4 +80,44 @@ class Baseconfig extends Api
         $this->success('success',$config);
     }
 
+
+    //获取版本更新信息
+    public function getversion() {
+        // 获取二维码
+        $is_force = config("site.is_force"); //是否强制更新 1是 0否
+        $apk_url = config("site.apk_url"); //下载链接
+        $apk_name = config("site.apk_name"); //apk更新标题
+        $apk_desc = config("site.apk_desc"); //apk更新描述
+        $version_code = config("site.version_code"); //版本迭代号
+
+        $data['is_force'] = $is_force;
+        $data['apk_url'] = $apk_url;
+        $data['apk_name'] = $apk_name;
+        $data['apk_desc'] = $apk_desc;
+        $data['version_code'] = $version_code;
+
+        $this->success('Success', $data);
+    }
+
+
+
+    //获取ios版本更新信息
+    public function getiosversion() {
+        // 获取二维码
+        $is_force = config("site.ios_is_force"); //是否强制更新 1是 0否
+        $apk_url = config("site.ios_apk_url"); //下载链接
+        $apk_name = config("site.ios_apk_name"); //apk更新标题
+        $apk_desc = config("site.ios_apk_desc"); //apk更新描述
+        $version_code = config("site.ios_version_code"); //版本迭代号
+
+        $data['is_force'] = $is_force;
+        $data['apk_url'] = $apk_url;
+        $data['apk_name'] = $apk_name;
+        $data['apk_desc'] = $apk_desc;
+        $data['version_code'] = $version_code;
+
+        $this->success('Success', $data);
+    }
+
+
 }

application/api/controller/Index.php

@@ -14,7 +14,7 @@ use app\common\library\Token;
  */
 class Index extends Api
 {
-    protected $noNeedLogin = ['zhiyint_registration','index','contactus','tcpTest','getAppShare','getWebsiteInfo','getUserCharmRankList','getPartyHotList','searchUsers','getInviteCode','getEdition','getInviteImg','getWebsiteInfoForMini','getBankList','getSwitch','getBootAnimation', 'tencentcall', 'getversion', 'getversionZx', 'getiosversion'];
+    protected $noNeedLogin = ['index','getAppShare','getWebsiteInfo','getInviteCode','getEdition','getInviteImg','tencentcall', 'getversion', 'getiosversion'];
     protected $noNeedRight = ['*'];
 
     public function index(){
@@ -45,6 +45,7 @@ class Index extends Api
 //            'user.cityname' => $this->auth->cityname,
 //            'user.longitude' => ['between',[$this->auth->longitude - 0.1,$this->auth->longitude + 0.1]],
 //            'user.latitude' => ['between',[$this->auth->latitude - 0.1,$this->auth->latitude + 0.1]],
+//            'user.is_online|user.is_livebc' => 1, //完全不考虑直播与语聊的权重，只用活跃做排序
         ];
 
         //排序
@@ -99,7 +100,7 @@ class Index extends Api
 
         //dump($map);
         $field = [
-            'user.id','user.nickname','user.birthday','user.height','user.longitude','user.latitude','user.avatar','user.bio','user.gender','user.idcard_status', 'user.real_status', 'user.job_id', 'user.is_active', 'user.wages_id', 'user.is_recommend', 'user.cityname', 'user.hometown_cityid', 'user.is_hideaddress'
+            'user.id','user.nickname','user.birthday','user.height','user.longitude','user.latitude','user.avatar','user.bio','user.gender','user.idcard_status', 'user.real_status', 'user.job', 'user.is_active', 'user.wages', 'user.is_recommend', 'user.cityname', 'user.hometown_cityid', 'user.is_hideaddress'
         ];
 
         //$list = Db::name('user')->alias('user')->field($field)->where($map)->order($order)->autopage()->select();
@@ -247,170 +248,8 @@ class Index extends Api
 
 
 
-    /*
-     * 获取系统消息列表
-     */
-    public function getMessage() {
-        $page = $this->request->request('page',1); // 分页
-        $pageNum = $this->request->request('pageNum',10); // 分页
-        // 分页搜索构建
-        $pageStart = ($page-1)*$pageNum;
-
-        $flag = $this->request->request("flag",1,"intval"); //标识:1=只取一条,0=全部
-        $user_id = $this->auth->id;
-
-        $obj = \app\common\model\Message::where(["user_id"=>$user_id])->order("createtime","desc")->limit($pageStart,$pageNum);
-        if($flag == 1) {
-            $list = $obj->find();
-            $list || $list = [];
-            $list && $list["createtime"] = get_last_time($list["createtime"]);
-        } else {
-            $list = $obj->select();
-            if($list) foreach($list as $k => &$v) {
-                $v["createtime"] = get_last_time($v["createtime"]);
-            }
-        }
-
-        $this->success("获取成功！",$list);
-
-    }
-
-    /**
-     * 删除系统消息
-     */
-    public function delMessage() {
-        $id = $this->request->request("id",0,"intval"); //消息ID
-        if($id <= 0) {
-            $this->error("参数传入错误！");
-        }
-        $res = \app\common\model\Message::where(["id"=>$id,"user_id"=>$this->auth->id])->delete();
-
-        if($res) {
-            $this->success("删除成功！");
-        } else {
-            $this->error("删除失败！");
-        }
-    }
-
-
-
-
-    /**
-     * 获取下载二维码和邀请码
-     */
-    public function getInviteCode() {
-        // 获取二维码
-        $qrcode = $this->httpurl(config("site.qrcode"));
-        $miniqrcode = $this->httpurl(config("site.miniqrcode"));
-        // 获取用户邀请码
-        $inviteCode = \app\common\model\User::where(["id"=>$this->auth->id])->value("invite_no");
-        $host = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"];
-        $downlowdLink = $host."/index/index/appJump?t=wlt".rand(10,999).Random::alpha(8);
-        $this->success("获取成功！",["qrcode"=>$qrcode,"miniqrcode"=>$miniqrcode,"inviteCode"=>$inviteCode,"downlowdLink"=>$downlowdLink]);
-    }
 
-    /**
-     * 获取app分享海报
-     */
-    public function getAppShare() {
-        $this->success("获取成功！",["url"=>$this->httpurl(config("site.appShare"))]);
-    }
-
-
-    /**
-     * 获取版本更新信息
-     */
-    public function getEdition() {
-        // 获取二维码
-        $is_force = config("site.is_force");
-        $apkUrl = config("site.apk_url");
-        $apkName = config("site.apkName");
-        $desc = config("site.desc");
-        $versionCode = config("site.versionCode");
-        $this->success("获取成功！",["versionCode"=>$versionCode,"isForceUpdate"=>$is_force,"apkUrl"=>$apkUrl,"apkName"=>$apkName,"desc"=>$desc]);
-    }
-
-    /**
-     * 获取邀请图片
-     */
-    public function getInviteImg() {
-        $plat = $this->request->request("plat",1); //平台:1=小程序,2=app
-        if(!in_array($plat,[1,2])) $this->error("参数错误");
-        // 获取用户的邀请码
-        $invitecode = \app\common\model\User::where(["id"=>$this->auth->id])->value("invite_no");
-
-        // 文字图片合成
-        $bigImgPath = $this->httpurlLocal('/assets/img/inviteimg.jpeg');
-        $img = imagecreatefromstring(file_get_contents($bigImgPath));
-        //字体文件
-        $font = realpath('./assets/fonts/lato/lato-black.ttf');
-
-        //字体颜色(RGB)
-        $black = imagecolorallocate($img, 217, 76, 41);
-        //字体大小
-        $fontSize = 30;
-        //旋转角度
-        $circleSize = 0;
-        //左边距
-        $left = 275;
-        //上边距
-        $top = 540;
-        imagefttext($img, $fontSize, $circleSize, $left, $top, $black, $font, $invitecode);
-        $filename = date("YmdH").".jpeg";
-        $path = "/uploads/qrcode/".$filename;
-        $file = $_SERVER['DOCUMENT_ROOT'] . $path;//打开文件准备写入
-        list($bgWidth, $bgHight, $bgType) = getimagesize($bigImgPath);
-        switch ($bgType) {
-            case 1://gif
-                header('Content-Type:image/gif');
-                imagegif($img,$file);
-                break;
-            case 2://jpg
-                header('Content-Type:image/jpg');
-                imagejpeg($img,$file);
-                break;
-            case 3://jpg
-                header('Content-Type:image/png');
-                imagepng($img,$file);
-                break;
-            default:
-                break;
-        }
-        //销毁照片
-        imagedestroy($img);
-
-        // 图片和二维码合成
-        $qrcode = $plat == 1 ? config("site.miniqrcode"):config("site.qrcode");
-
-
-        $background = $file;
-        $target = $this->httpurl($qrcode);
-
-        $background_iamge = imagecreatefromstring(file_get_contents($background));
-        $target_image = imagecreatefromstring(file_get_contents($target));
-        list($target_width, $target_height, $target_type) = getimagesize($target);
-        imagecopymerge($background_iamge , $target_image , 250, 700, 0, 0, $target_width, $target_height, 100);
-        list($background_width, $background_height, $background_type) = getimagesize($background);
-        switch ($background_type) {
-            case 1://gif
-                header('Content-Type:image/gif');
-                imagegif($background_iamge,$file);
-                break;
-            case 2://jpg
-                header('Content-Type:image/jpg');
-                imagejpeg($background_iamge,$file);
-                break;
-            case 3://jpg
-                header('Content-Type:image/png');
-                imagepng($background_iamge,$file);
-                break;
-            default:
-                break;
-        }
-        $savepath = $this->httpurlLocal($path);
 
-        $this->success("获取成功!",$savepath);
-    }
 
 
     //轮播图
@@ -640,42 +479,4 @@ class Index extends Api
 
         $this->success('sussess', $data);
     }
-
-    //获取版本更新信息
-    public function getversion() {
-        // 获取二维码
-        $is_force = config("site.is_force"); //是否强制更新 1是 0否
-        $apk_url = config("site.apk_url"); //下载链接
-        $apk_name = config("site.apk_name"); //apk更新标题
-        $apk_desc = config("site.apk_desc"); //apk更新描述
-        $version_code = config("site.version_code"); //版本迭代号
-
-        $data['is_force'] = $is_force;
-        $data['apk_url'] = $apk_url;
-        $data['apk_name'] = $apk_name;
-        $data['apk_desc'] = $apk_desc;
-        $data['version_code'] = $version_code;
-
-        $this->success('Success', $data);
-    }
-    
-
-
-    //获取ios版本更新信息
-    public function getiosversion() {
-        // 获取二维码
-        $is_force = config("site.ios_is_force"); //是否强制更新 1是 0否
-        $apk_url = config("site.ios_apk_url"); //下载链接
-        $apk_name = config("site.ios_apk_name"); //apk更新标题
-        $apk_desc = config("site.ios_apk_desc"); //apk更新描述
-        $version_code = config("site.ios_version_code"); //版本迭代号
-
-        $data['is_force'] = $is_force;
-        $data['apk_url'] = $apk_url;
-        $data['apk_name'] = $apk_name;
-        $data['apk_desc'] = $apk_desc;
-        $data['version_code'] = $version_code;
-
-        $this->success('Success', $data);
-    }
 }