修改伴声

addons/qcloudsms/config.php

@@ -97,8 +97,7 @@ return [
         'type' => 'array',
         'content' => [],
         'value' => [
-            'resetpwd' => '1240947',
-            'default' => '1240882',
+            'default' => '1241032',
         ],
         'rule' => 'required',
         'msg' => '',

application/api/controller/Common.php

@@ -10,6 +10,7 @@ use app\common\model\Version;
 use fast\Random;
 use think\Config;
 use think\Hook;
+use Endroid\QrCode\QrCode;
 
 /**
  * 公共接口
@@ -127,4 +128,160 @@ class Common extends Api
         }
 
     }
+
+    /**
+     * 上传文件
+     * @ApiMethod (POST)
+     * @param File $file 文件流
+     */
+    public function uploads($file) {
+
+        if (empty($file)) {
+            $this->error(__('No file upload or server upload limit exceeded'));
+        }
+
+        //判断是否已经存在附件
+        $sha1 = $file->hash();
+
+        $upload = Config::get('upload');
+
+        preg_match('/(\d+)(\w+)/', $upload['maxsize'], $matches);
+        $type = strtolower($matches[2]);
+        $typeDict = ['b' => 0, 'k' => 1, 'kb' => 1, 'm' => 2, 'mb' => 2, 'gb' => 3, 'g' => 3];
+        $size = (int)$upload['maxsize'] * pow(1024, isset($typeDict[$type]) ? $typeDict[$type] : 0);
+        $fileInfo = $file->getInfo();
+        $suffix = strtolower(pathinfo($fileInfo['name'], PATHINFO_EXTENSION));
+        $suffix = $suffix && preg_match("/^[a-zA-Z0-9]+$/", $suffix) ? $suffix : 'file';
+
+        $mimetypeArr = explode(',', strtolower($upload['mimetype']));
+        $typeArr = explode('/', $fileInfo['type']);
+
+        //禁止上传PHP和HTML文件
+        if (in_array($fileInfo['type'], ['text/x-php', 'text/html']) || in_array($suffix, ['php', 'html', 'htm'])) {
+            $this->error(__('Uploaded file format is limited'));
+        }
+        //验证文件后缀
+        if ($upload['mimetype'] !== '*' &&
+            (
+                !in_array($suffix, $mimetypeArr)
+                || (stripos($typeArr[0] . '/', $upload['mimetype']) !== false && (!in_array($fileInfo['type'], $mimetypeArr) && !in_array($typeArr[0] . '/*', $mimetypeArr)))
+            )
+        ) {
+            $this->error(__('Uploaded file format is limited'));
+        }
+//        //验证是否为图片文件
+//        $imagewidth = $imageheight = 0;
+//        if (in_array($fileInfo['type'], ['image/gif', 'image/jpg', 'image/jpeg', 'image/bmp', 'image/png', 'image/webp']) || in_array($suffix, ['gif', 'jpg', 'jpeg', 'bmp', 'png', 'webp'])) {
+//            $imgInfo = getimagesize($fileInfo['tmp_name']);
+//            if (!$imgInfo || !isset($imgInfo[0]) || !isset($imgInfo[1])) {
+//                $this->error(__('Uploaded file is not a valid image'));
+//            }
+//            $imagewidth = isset($imgInfo[0]) ? $imgInfo[0] : $imagewidth;
+//            $imageheight = isset($imgInfo[1]) ? $imgInfo[1] : $imageheight;
+//        }
+        $replaceArr = [
+            '{year}'     => date("Y"),
+            '{mon}'      => date("m"),
+            '{day}'      => date("d"),
+            '{hour}'     => date("H"),
+            '{min}'      => date("i"),
+            '{sec}'      => date("s"),
+            '{random}'   => Random::alnum(16),
+            '{random32}' => Random::alnum(32),
+            '{filename}' => $suffix ? substr($fileInfo['name'], 0, strripos($fileInfo['name'], '.')) : $fileInfo['name'],
+            '{suffix}'   => $suffix,
+            '{.suffix}'  => $suffix ? '.' . $suffix : '',
+            '{filemd5}'  => md5_file($fileInfo['tmp_name']),
+        ];
+        $savekey = $upload['savekey'];
+        $savekey = str_replace(array_keys($replaceArr), array_values($replaceArr), $savekey);
+
+        $uploadDir = substr($savekey, 0, strripos($savekey, '/') + 1);
+        $fileName = substr($savekey, strripos($savekey, '/') + 1);
+        //
+        $splInfo = $file->validate(['size' => $size])->move(ROOT_PATH . '/public' . $uploadDir, $fileName);
+        if ($splInfo) {
+            $params = array(
+                'admin_id'    => 0,
+                'user_id'     => (int)$this->auth->id,
+                'filesize'    => $fileInfo['size'],
+                'imagetype'   => $suffix,
+                'imageframes' => 0,
+                'mimetype'    => $fileInfo['type'],
+                'url'         => $uploadDir . $splInfo->getSaveName(),
+                'uploadtime'  => time(),
+                'storage'     => 'local',
+                'sha1'        => $sha1,
+            );
+            $attachment = model("attachment");
+            $attachment->data(array_filter($params));
+            $attachment->save();
+            \think\Hook::listen("upload_after", $attachment);
+            return $uploadDir . $splInfo->getSaveName();
+        } else {
+            // 上传失败获取错误信息
+            $this->error($file->getError());
+        }
+    }
+
+
+    // 返回执行日期所在周的第一天(周一)日期
+    public function firstOfWeek($date) {
+        $now = strtotime($date);    //当时的时间戳
+        $number = date("w",$now);  //当时是周几
+        $number = $number == 0 ? 7 : $number; //如遇周末,将0换成7
+        $diff_day = $number - 1; //求到周一差几天
+        return date("Ymd",$now - ($diff_day * 60 * 60 * 24));
+    }
+
+    /**
+     * 数字转化
+     */
+    public function changeW($val) {
+        return $val > 10000 ? round($val/10000,2)."w":$val;
+    }
+
+    public function getModelName($type)
+    {
+        return "app\common\model\\" . ucfirst($type);
+    }
+
+
+    /** 上传文件到 本地+cos
+     * @param $file
+     * @return array|bool|float|int|mixed|object|\stdClass|null
+     * @throws UploadException
+     */
+    public function uploadCos($file)
+    {
+        $config = get_addon_config('cos');
+        $cosConfig = array(
+            'region'      => $config['region'],
+            'schema'      => 'https', //协议头部，默认为http
+            'credentials' => array(
+                'secretId'  => $config['secretId'],
+                'secretKey' => $config['secretKey']
+            )
+        );
+        $upload = new Upload($file);
+        $attachment = $upload->upload();
+        $oss = new \Qcloud\Cos\Client($cosConfig);
+        $oss->upload($config['bucket'], ltrim($attachment->url, "/"), $upload->getFile());
+        return $attachment->url;
+    }
+
+
+    /** 删除本地文件
+     * @param $url
+     * @return string
+     */
+    public function unlinkLocal($url){
+
+        if(file_exists($url)){
+            unlink($url);
+            return '已删除了哦！';
+        }else{
+            return '已经被删除了哦！';
+        }
+    }
 }

application/api/controller/Party.php

@@ -35,21 +35,22 @@ class Party extends Common
      * 创建/进入派对
      */
     public function createParty() {
-            $room_type = $this->request->request('room_type',1); // 房间类型:1=派对，2=直播
+            //$room_type = $this->request->request('room_type',1); // 房间类型:1=派对，2=直播
+        $room_type = 1;
         $partyModel = new \app\common\model\Party();
 
         $user_id = $this->auth->id;
         // 开直播时，判断当前用户是否为主播
-        if($room_type == 2) {
+        /*if($room_type == 2) {
             $anchorInfo = \app\common\model\UserAnchor::where(["user_id"=>$user_id])->find();
 
             $anchorInfo || $this->error("您还未申请主播！");
             $anchorInfo->status == 0 && $this->error("您的主播申请信息还未受理，请耐心等待！");
             $anchorInfo->status == 2 && $this->error("您的主播申请未通过，请重新提交！");
-        }
+        }*/
 
         // 1。实名认证
-        $userAuthInfo = \app\common\model\UserAuth::where(["user_id"=>$user_id])->find();
+        /*$userAuthInfo = \app\common\model\UserAuth::where(["user_id"=>$user_id])->find();
         if($userAuthInfo) {
             if($userAuthInfo->status == 0) {
                 $this->error("您的实名认证还在这审核中...，请耐心等待！");
@@ -58,8 +59,21 @@ class Party extends Common
             }
         } else {
             $this->error("请先申请实名认证！");
+        }*/
+
+        //
+        if($this->auth->idcard_status == -1){
+            $this->error('请先申请实名认证');
+        }
+        if($this->auth->idcard_status == 0){
+            $this->error('您已经提交实名认证,请等待审核');
         }
+        if($this->auth->idcard_status == 2){
+            $this->error('您的实名认证审核未通过，请重新申请');
+        }
+
 
+/*
         if($room_type == 1) {
             // 2。开厅申请
             $authInfo = \app\common\model\GuildApply::where(["user_id"=>$user_id])->find();
@@ -73,7 +87,7 @@ class Party extends Common
                 $this->error("请先申请开厅资质！");
             }
         }
-
+*/
 
         // 判断派对是否存在
         $redis = new Redis();
@@ -92,7 +106,7 @@ class Party extends Common
                 $this->error("房间数量已达上线，请联系客服！");
             }
 
-            $party_name = $this->auth->u_id."的房间"; // 派对名称
+            $party_name = $this->auth->username."的房间"; // 派对名称
             $party_logo = "/assets/api/party_logo.png"; // 派对logo
             $party_type = 0; // 派对类型（情感互动,心动点单 等）
             $party_notice = "请编辑房间公告"; // 派对公告
@@ -102,8 +116,8 @@ class Party extends Common
             }
             $party_ids = $partyModel->column("party_id");
             // 创建派对ID (临时ID四位，派对数不超过8999)
-            $party_id = $this->auth->getUinqueId(4,$party_ids);
-            if($party_id > 9999) {
+            $party_id = $this->auth->getUinqueId(6,$party_ids);
+            if($party_id > 999999) {
                 $this->error("派对超限，请联系客服");
             }
             $data = [];
@@ -125,11 +139,11 @@ class Party extends Common
                 $this->error("派对创建失败，请稍后重试！");
             }
             $data["id"] = $id;
-
+/*
             if($room_type == 2) {
                 \app\common\model\User::update(["is_live"=>1],["id"=>$user_id]);
             }
-
+*/
             $partyInfo = $partyModel->where(["id"=>$id])->find();
             $partyInfo["is_new"] = 1;
 
@@ -139,9 +153,9 @@ class Party extends Common
                 $userInfo = \app\common\model\User::field("id,nickname,avatar")->where(["id"=>$partyInfo["naming"]])->find();
             }
             // 头像
-            if($partyInfo["user_id"] > 0 && $room_type == 2) {
+            /*if($partyInfo["user_id"] > 0 && $room_type == 2) {
                 $partyInfo["avatar"] = \app\common\model\User::where(["id"=>$partyInfo["user_id"]])->value("avatar");
-            }
+            }*/
             // 派对类型
             $partyTypeName = "普通房";
             if($partyInfo["party_type"]) {

application/common/library/Auth.php

@@ -85,6 +85,30 @@ class Auth
     }
 
     /**
+     * 生成不重复的随机数字
+     */
+    function /*6*dfadsf/getUinqueId($length = 8, $ids = [])
+    {
+        $newid = Random::build("nozero", $length);
+        if (in_array($newid, $ids)) {
+            $newid = $this->getUinqueId($length, $ids);
+        }
+        return $newid;
+    }
+
+    /**
+     * 生成不重复的随机数字字母组合
+     */
+    function getUinqueNo($length = 8, $nos = [])
+    {
+        $newid = Random::build("alnum", $length);
+        if (in_array($newid, $nos)) {
+            $newid = $this->getUinqueNo($length, $nos);
+        }
+        return $newid;
+    }
+
+    /**
      * 获取User模型
      * @return User
      */

application/extra/upload.php

@@ -9,7 +9,7 @@ return [
     /**
      * CDN地址
      */
-    'cdnurl'    => '',
+    'cdnurl'    => 'http://mita.com',
     /**
      * 文件保存格式
      */