7
This commit is contained in:
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+13
-3
@@ -72,13 +72,22 @@ class CommonController extends BaseController{
|
|||||||
$version_wgt = Input('version_wgt');
|
$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) {
|
if($update_data) {
|
||||||
return $this->success('',$update_data);
|
return $this->success('',$update_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询WGT数据
|
// 查询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) {
|
if($update_wgt_data) {
|
||||||
return $this->success('',$update_wgt_data);
|
return $this->success('',$update_wgt_data);
|
||||||
}
|
}
|
||||||
@@ -158,8 +167,9 @@ class CommonController extends BaseController{
|
|||||||
//return $this->error(__('Invalid invite code'));
|
//return $this->error(__('Invalid invite code'));
|
||||||
}
|
}
|
||||||
$extends = [
|
$extends = [
|
||||||
'role_id' => 0,
|
'role_id' => 1,
|
||||||
'group_id' => 0,
|
'group_id' => 0,
|
||||||
|
'nickname' => input('nickname'),
|
||||||
'avatar' => '/static/img/avatar.png',
|
'avatar' => '/static/img/avatar.png',
|
||||||
];
|
];
|
||||||
// validate(\app\validate\User::class)
|
// validate(\app\validate\User::class)
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+2
-2
@@ -43,7 +43,7 @@ class OpenIm extends Command
|
|||||||
|
|
||||||
$im = new \support\OpenImSdk\Client([
|
$im = new \support\OpenImSdk\Client([
|
||||||
'host' => 'http://127.0.0.1:10002', // OpenIM API地址
|
'host' => 'http://127.0.0.1:10002', // OpenIM API地址
|
||||||
'secret' => 'openIM123', // OpenIM密钥
|
'secret' => 'n1e5a6s6m7', // OpenIM密钥
|
||||||
]);
|
]);
|
||||||
$data = $im->user->updateUserInfo('100001',['userInfo'=>['userId'=>'wx100001']]);
|
$data = $im->user->updateUserInfo('100001',['userInfo'=>['userId'=>'wx100001']]);
|
||||||
cp($data);
|
cp($data);
|
||||||
@@ -52,7 +52,7 @@ class OpenIm extends Command
|
|||||||
private function sync_users(InputInterface $input, OutputInterface $output):int{
|
private function sync_users(InputInterface $input, OutputInterface $output):int{
|
||||||
$im = new \support\OpenImSdk\Client([
|
$im = new \support\OpenImSdk\Client([
|
||||||
'host' => 'http://127.0.0.1:10002', // OpenIM API地址
|
'host' => 'http://127.0.0.1:10002', // OpenIM API地址
|
||||||
'secret' => 'openIM123', // OpenIM密钥
|
'secret' => 'n1e5a6s6m7', // OpenIM密钥
|
||||||
]);
|
]);
|
||||||
$data = $im->user->getAllUsersUid(1,1000);
|
$data = $im->user->getAllUsersUid(1,1000);
|
||||||
cp($data);
|
cp($data);
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+23
@@ -19,6 +19,29 @@ class HookController{
|
|||||||
"nextCode"=> 0
|
"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
|
* @return void
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+3
-1
@@ -143,7 +143,9 @@ class User{
|
|||||||
}
|
}
|
||||||
// 批量插入关系
|
// 批量插入关系
|
||||||
try {
|
try {
|
||||||
Db::name('user_team')->insertAll($teamData);
|
if($teamData){
|
||||||
|
Db::name('user_team')->insertAll($teamData);
|
||||||
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
cp($e->getMessage());
|
cp($e->getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
+6
@@ -839,8 +839,14 @@ if(!function_exists('get_user_rights')){
|
|||||||
$key = 'user_rights_'.$user_id;
|
$key = 'user_rights_'.$user_id;
|
||||||
$result = cache($key);
|
$result = cache($key);
|
||||||
if(!$result){
|
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')
|
$result = \think\facade\Db::name('user_role')->alias('ur')
|
||||||
->join('user u','ur.id = u.role_id')
|
->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')
|
->field('ur.name,ur.max_send_msg_count,ur.max_friend_count,ur.max_group_join_count,ur.max_gourp_create_count')
|
||||||
->find();
|
->find();
|
||||||
cache($key,$result,86400);
|
cache($key,$result,86400);
|
||||||
|
|||||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user