改账号，改bug

application/api/controller/Baseconfig.php

@@ -14,8 +14,8 @@ class Baseconfig extends Api
 
    
     public function index(){
-        $jewelMoneyConfig = config('site.jewel_money');
-        $jewelMoney = bcdiv(1,$jewelMoneyConfig,10);//转换为小数给前端，前端是乘以的方式计算的
+//        $jewelMoneyConfig = config('site.jewel_money');
+//        $jewelMoney = bcdiv(1,$jewelMoneyConfig,10);//转换为小数给前端，前端是乘以的方式计算的
         $config = [
 //            'domain_name' => config('site.domain_name'),
 //            'domain_cdnurl' => config('site.domain_cdnurl'),
@@ -30,7 +30,7 @@ class Baseconfig extends Api
             'show_wechat_pay' => config('site.show_wechat_pay'),
             'show_ali_pay' => config('site.show_ali_pay'),
             'show_intimacy' => config('site.show_intimacy'),
-            'jewel_money' => $jewelMoney,
+//            'jewel_money' => $jewelMoney,
         ];
 
         $this->success('success',$config);

application/api/controller/Recharge.php

@@ -209,6 +209,7 @@ class Recharge extends Api
 
     //兑换rmb
     public function exchangermb() {
+        exit;//知音国际版才有钻石，这里用不到了
         $freemoney = input_post('freemoney', 0, 'intval'); //自定义
         $uid = $this->auth->id;
         if(!$freemoney){

application/api/controller/User.php

@@ -784,49 +784,7 @@ class User extends Api
         $this->success('success',$check);
     }
 
-    //申请私密视频
-    public function apply_secretvideo(){
-        $secretvideo = input('secretvideo','');
 
-        if(empty($secretvideo)){
-            $this->error();
-        }
-
-        Db::startTrans();
-        $check = Db::name('user_secretvideo')->where('user_id',$this->auth->id)->lock(true)->find();
-        if(!empty($check)){
-            if($check['status'] == 0){
-                Db::rollback();
-                $this->error('您已经提交私密视频,请等待审核');
-            }
-        }
-
-        $data = [
-            'user_id' => $this->auth->id,
-            'secretvideo' => $secretvideo,
-            'status' => 0,
-            'createtime' => time(),
-            'updatetime' => time(),
-            'audittime'  => 0,
-            'auditremark' => '',
-        ];
-
-        //更新
-        $update_rs = Db::name('user')->where('id',$this->auth->id)->update(['secretvideo_status'=>0]);
-        if(!empty($check)){
-            $rs = Db::name('user_secretvideo')->where('id',$check['id'])->update($data);
-        }else{
-            $rs = Db::name('user_secretvideo')->insertGetId($data);
-        }
-
-        if(!$rs || !$update_rs){
-            Db::rollback();
-            $this->error('提交失败');
-        }
-
-        Db::commit();
-        $this->success('提交成功,请等待审核');
-    }
 
     //申请实名认证
     public function apply_idcard_confirm(){

application/api/controller/Usercenter.php

@@ -99,13 +99,11 @@ class Usercenter extends Api
         //用户数据
         $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
         $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
-        $secretvideo    = Db::name('user_secretvideo')->where('user_id',$uid)->find();
 
         $new_data = [
             'age'            => birthtime_to_age($userinfo['birthday']),
             'truename'       => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
             'alipay_account' => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['alipay_account'])) ? $idcard_confirm['alipay_account'] : '',
-//            'secretvideo'    => ($userinfo['secretvideo_status'] == 1 && isset($secretvideo['secretvideo'])) ? $secretvideo['secretvideo'] : '',
         ];
 
         //亲密度，登录用户给当前用户花了多少钱

application/common/library/Auth.php

@@ -726,14 +726,12 @@ class Auth
         $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
 
         $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$this->id)->find();
-        $secretvideo    = Db::name('user_secretvideo')->where('user_id',$this->id)->find();
 
         $new_data = [
             'setpassword'    => !empty($this->password) ? 1 : 0,
             'age'            => birthtime_to_age($this->birthday),
             'truename'       => ($this->idcard_status == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
             'alipay_account' => ($this->idcard_status == 1 && isset($idcard_confirm['alipay_account'])) ? $idcard_confirm['alipay_account'] : '',
-            'secretvideo'    => ($this->secretvideo_status == 1 && isset($secretvideo['secretvideo'])) ? $secretvideo['secretvideo'] : '',
         ];
 
         $userinfo = array_merge($userinfo,$new_data);

application/config.php

@@ -300,21 +300,20 @@ return [
     ],
     //用户端小程序
     'user_wxMiniProgram' => [
-        'appid' => 'wx29d6281c5252f504',
-        'secret' => '915adfd0f51bb9c67fb9f9dfd94a101b'
+        'appid' => '',
+        'secret' => ''
     ],
-    // 腾讯im配置
+    // 腾讯im配置   校友缘 正式
     'tencent_im' => [
-//        'sdkappid' => '1400589001',
-        'sdkappid' => '1400807178',
+        'sdkappid' => '1600035965',
+        'key' => '5587e06e72793d51ea182a480f9de0f548ec3ff07cf8d3f48f11129b4a3bac63',
         'identifier' => 'administrator',
 
         //trtc回调秘钥
         'callback_secret' => 'shezhihuidiaomiyao123456',
-//        'key' => '0e8cd35d0938514fb03d99f9ab14498b2615d6713f43436dfd31c21adc49b96a',
-        'key' => 'e36e45e3f0f1a6bf328c076e6c60238d9e5680eca405cd64e41259f48a935671',
-        'SecretId' => 'AKID42mMlxveBXgaFhz63nNipjPr7B1g7KOE',
-        'SecretKey' => 'h9OOFrHTRBj5DH6h3B4jARWO2PbaR8ct',
+
+        'SecretId' => 'AKID1KjDlOvRvHkMwm2iflInImClFe3SmYOC', //人脸核身用
+        'SecretKey' => 'wn2EIOeH3HDKhBmYahxPyeQK72DjNNTs',    //人脸核身用
     ],
     //腾讯cos   校友缘 正式
     'cos'                  => [
@@ -350,14 +349,14 @@ return [
         'port'      => 6379,
     ],
 
-    // 运营商一键登录
+    // 运营商一键登录      校友缘 正式
     'onLogin'        => [
         //
-        'secretid'     => 'e86a055d216f0335528de729defcfe4b',
+        'secretid'     => 'd815b73979cbd261882e51e502f398a0',
         //
-        'secretkey'      => 'e581556b86814efc64ab3fb6f298abac',
+        'secretkey'      => '401271192248b79757a10dd44482c63f',
         //
-        'businessid'      => 'f3f886f4a728425e967def2efd17758a',
+        'businessid'      => '779931af6df647c2a0ac0d0f72bcf932',
     ],
 
     'renlian' => [
@@ -381,7 +380,6 @@ return [
     'ali_app_id' => '', //appid
     'ali_sign_type' => 'RSA2', //签名
     'public_key' => '',
-    'private_key' => 'MIIEogIBAAKCAQEArSGPEwxMJcEY1X/pooRgx2tZGxb17pKYgf/FgWO8VmXppGKz8/WkiI7GVnJR9YhXGlsME35W1kp1x75otD9qsWP0g7fB3aQGifCFHiO26QxthLFCtibkKiaFgCfj4CSSf6zv/pNROvmRGRLjB6bId+1m7lfx2+EDHE49Bw7Q77XnI259XrHJ4VcrZy4JKSS7CHc+aJMuq9J+iwkDO+dYslcHoRerFNusAa0jGsuYHORuhDMx8s13s/0B3BKO19IbI9kN6a5uOF0qx3l1uXrCWRxWADsjsRWRYMQDm18Jnz4hQbo65g7qLtManNlERUnG8udNBCafk9ZEcHLLgCy6aQIDAQABAoIBADs+UpE4Eg6RRwg33yDnn55d0337m2hp7Zn+hf1Cvb3q3cqMo/uFQSohgSkvsXANmZDBOx6oitqFXExfkcCsOrw88fzosoQ/jqVBEqw/mGWjBQ71AVkHcegiimhSPh4DJcZezTkV/CPsJoSn+9wwbETtjd1dZrvRAZl8BFIX9dMwoTU6HIx6hQxrOEQr3zJM8XEHfHmWc6id0V+y7a7ISL0ckBZbpkKHxhvfs/vsrC4NyufjinJHYsetWffPRJCViUwroaQ+jgWk8EngrksSdCyljRCIpvdAwJKf/TxqFE4PruIoO7VOoKN2xSpOJ87FgfdizgIucky0VsXBQufC1qECgYEA5MG+AmfKhJ9hqfpq63imLAEUHcDyiZJ4BJAsdMwCjORLtCzCmBIM/0PrDbtMNo5y2x1GGXCFJFDKcvLl9Gmwr3k5KqUCdFL9ikm+T3k/iHTAaHmtONh7M8eW9SCKpJ2BpW+Bo5jpzCGm5rnB6x2muBEaL3SmjV7Vm7thOHdmiH0CgYEAwb/rUUTbnAa13mXvKdsvotielY7qB/07Z3JsE64VtG7k42n4X/K78kO7AfLLG+//0pP9HnhDBFXub4c9T52prNnxHxAouEFwRW7nJGGxSsBV4YneN+xmfxM+uqQdg00rOW52E1KZAaBSqkZGeCvMyLxxBgiibP3KcTR2l6g/yV0CgYBzL7tlqq2nKjobRSUhfJbwAXsHoGiALWiRo6c/CJsgJrSX/RHfUPeKccCiIXW24vOisZLirG3eY3ANgZGZCL8XHItUldIukLtqLsfNbNg49dEMyngW76rZ3957f+9QBJ+LliJJJm5Tg35vH4otwbh5ZuMwkiRrex1EVY4WyMiwYQKBgEOBTMnqBeIc7GzqcyPQPI6ujsJpIt1Zu8LVORa6RtGw+YrKt0Em35kPRC7vmxjGzAlgioZ9PExcbFDre88rjZyt6rb5+FYKZsWqWFpyt0TmMoX8dTJi6WtJF0gMOkQvNOoztGwTEUBhzauKBK+GAznFflOt2nnDCy/aKZ+5fU/5AoGARxvJMxsamwYv0yvxTZ8xyOilWDWqVG7oZ9eT1wDHkJLowCU6VselrAeE3XDMXGaBnVO/o8C/LM4ymr40TjAeAvB7jiZnD6JZyoKMrB4s5eVfVHxLQSE5zbH4+zl5VBznkiEcgHKqSlS/XDMxRxbXUA0GeDy8yM294N+6Pqz5euQ=',
-    /*'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJXCLSGPy6IZVDUipevJDO/A9M3d0dIftHvYQxGTF7SyKgySBhCSmA7M+Io+267TaHRxVcQZkNdVGUaJPcmgNIyms+YcGOwESKWZIfa55dhHP3VgHEKC2wguDjWbq73U0fkhX/cY0Wcf4GhsFxptIpa32looTNm4cm4XwtwoV806NDWf/vkOjnw29JVf2LW+gYSah6fQ48OdB2e5Otbgt8keHUviPdy8+LYLg+w8CMvPKyCdcs2Dvc8tBAL2/1k68kaRezrQ5RL4l68FoyNA9eFsRbO1Ci35yUCbvudi7osAWfSKSStbGbU16I5LwfaVM2Cp6OYq144OaNraWayQOQIDAQAB',*/
+    'private_key' => '',
     'ali_public_key' => '',
 ];

application/extra/site.php

@@ -90,7 +90,6 @@ return array (
   'recommend_get_money' => '10000',
   'no_screenshot' => '0',
   'show_intimacy' => '0',
-  'jewel_money' => '100',
   'show_wechat_pay' => '1',
   'show_ali_pay' => '1',
   'meiyan' => 'NytoMmpSejUyUURnTUlHZE1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTEFEQ0JDSDNod0tCZ1FEM0hKeFRXeXEwS0xlTzF4cWFZRjNOS1ltSFJsTFpvCkFvYjAyeGpyakZCVGxxTnM3b2VNUkJYSHRPc1l3bkV0UlA0QmxBMUJxdlZmaklhc3JJOXN3aVdQc0ZVNUNuSHQ2TWpHZEVKT0toSzk3NVB1NmtGMVkKTGNDN1NOL2RtNVNIL1Bza2NhcERtM1VaZUpQV295SVFKVUFoclJKaVBLTUlDOXVlc3huK0QxK05JU0dkTnpxdXlBUWZVUXFRWVB4dmJQQ1BUb096UUpFU2VyOWlRdk1wOG5tcG12U1BXZzFIUjZaUWF6R29BNzgKQ1Y1aVpXd1BDcDJhSTg4Vk9RSUJBdzdNcEdzL1FLVk52OVZOWjVYbW9RVWNGdTFxRUVPSDBya1YxQWlRSTBxbmpxSysyZnVQQkR0UGs1cG9SMmZ3dEVidDJZUDNYV2IyST0=',