7

app/api/controller/CommonController.php

@@ -72,13 +72,22 @@ class CommonController extends BaseController{
         $version_wgt = Input('version_wgt');
 
     	// 查询整包、外链数据
-    	$update_data = $verUpdate->where(['type'=>['in', '0,2'], 'status'=>1, 'version'=>['>', $version], 'platform'=>$platform])->field($field)->order('id desc')->find();
+    	$update_data = $verUpdate->whereIn('type','0,2')
+            ->where('status',1)
+            ->where('version','>', $version)
+            ->where('platform',$platform)
+            ->field($field)
+            ->order('id desc')->find();
     	if($update_data) {
             return $this->success('',$update_data);
         }
 
     	// 查询WGT数据
-    	$update_wgt_data = $verUpdate->where(['type'=>1, 'status'=>1, 'version_wgt'=>['>', $version_wgt], 'platform'=>$platform])->field($field)->order('id desc')->find();
+    	$update_wgt_data = $verUpdate->where('type',1)
+            ->where('status',1)
+            ->where('version_wgt','>', $version_wgt)
+            ->where('platform',$platform)
+            ->field($field)->order('id desc')->find();
     	if($update_wgt_data) {
             return $this->success('',$update_wgt_data);
         }
@@ -158,8 +167,9 @@ class CommonController extends BaseController{
             //return $this->error(__('Invalid invite code'));
         }
         $extends = [
-            'role_id'   =>  0,
+            'role_id'   =>  1,
             'group_id'     =>  0,
+            'nickname'     =>  input('nickname'),
             'avatar'    =>  '/static/img/avatar.png',
         ];
         // validate(\app\validate\User::class)

app/command/OpenIm.php

@@ -43,7 +43,7 @@ class OpenIm extends Command
         
         $im = new \support\OpenImSdk\Client([
             'host' => 'http://127.0.0.1:10002', // OpenIM API地址
-            'secret' => 'openIM123', // OpenIM密钥
+            'secret' => 'n1e5a6s6m7', // OpenIM密钥
         ]);
         $data = $im->user->updateUserInfo('100001',['userInfo'=>['userId'=>'wx100001']]);
         cp($data);
@@ -52,7 +52,7 @@ class OpenIm extends Command
     private function sync_users(InputInterface $input, OutputInterface $output):int{
         $im = new \support\OpenImSdk\Client([
             'host' => 'http://127.0.0.1:10002', // OpenIM API地址
-            'secret' => 'openIM123', // OpenIM密钥
+            'secret' => 'n1e5a6s6m7', // OpenIM密钥
         ]);
         $data = $im->user->getAllUsersUid(1,1000);
         cp($data);

app/controller/HookController.php

@@ -19,6 +19,29 @@ class HookController{
             "nextCode"=> 0
         ]);
     }
+    function callbackAfterUserRegisterCommand(Request $request): Response
+    {
+        $userID= Input('userID');
+        $nickname= Input('nickname');
+
+        $im = new \support\OpenImSdk\Client([
+            'host' => 'http://127.0.0.1:10002', // OpenIM API地址
+            'secret' => 'n1e5a6s6m7', // OpenIM密钥
+        ]);
+        $im->message->sendBusinessNotification('system',$userID,[
+            'contentType'   =>  101,
+            'textElem'  =>  [
+                'content' => '欢迎使用'.Config('site.name')
+            ]
+        ]);
+        return json([
+            "actionCode"    => 0,
+            "errCode"   => 0,
+            "errMsg"    => "",
+            "errDlt"    => "",
+            "nextCode"=> 0
+        ]);
+    }
     /**
      * 在发送单聊消息前的回调
      * @return void

app/event/User.php

@@ -143,7 +143,9 @@ class User{
         }
         // 批量插入关系
         try {
-            Db::name('user_team')->insertAll($teamData);
+            if($teamData){
+                Db::name('user_team')->insertAll($teamData);
+            }
         } catch (\Exception $e) {
             cp($e->getMessage());
         }

app/functions.php

@@ -839,8 +839,14 @@ if(!function_exists('get_user_rights')){
         $key = 'user_rights_'.$user_id;
         $result = cache($key);
         if(!$result){
+            log_alert(\think\facade\Db::name('user_role')->alias('ur')
+            ->join('user u','ur.id = u.role_id')
+            ->where('u.id',$user_id)
+            ->field('ur.name,ur.max_send_msg_count,ur.max_friend_count,ur.max_group_join_count,ur.max_gourp_create_count')
+            ->buildSql());
             $result = \think\facade\Db::name('user_role')->alias('ur')
                 ->join('user u','ur.id = u.role_id')
+                ->where('u.id',$user_id)
                 ->field('ur.name,ur.max_send_msg_count,ur.max_friend_count,ur.max_group_join_count,ur.max_gourp_create_count')
                 ->find();
             cache($key,$result,86400);

app/queue/redis/Sms.php

@@ -22,7 +22,7 @@ class Sms implements Consumer
         }else{
             $body = $this->getTemplate($data);
         }
-        $url = 'http://api.smsbao.com/sms?u=aisiaisi8899&p='.md5('Aaa123123').'&m='.$data['mobile'].'&c='.urlencode($body);
+        $url = 'http://api.smsbao.com/sms?u=shunliao&p='.md5('Aaa1231232').'&m='.$data['mobile'].'&c='.urlencode($body);
         $statusStr = array(
             "0" => "短信发送成功",
             "-1" => "参数不全",
@@ -47,7 +47,7 @@ class Sms implements Consumer
         //var_export($data); // 输出 ['to' => 'tom@gmail.com', 'content' => 'hello']
     }
     function getTemplate($data){
-        $str = '【问析科技】验证码:{$code},该验证码在30分钟内输入有效,若非您本人操作请尽快修改登录密码';
+        $str = '【瞬聊】验证码:{$code},该验证码在5分钟内输入有效,若非您本人操作请尽快修改登录密码';
         foreach($data as $k=>$v){
             $str = str_replace('{$'.$k.'}',$v,$str);
         }