Skip to content

Commit

Permalink
Changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
xuas committed Aug 7, 2019
1 parent 7180661 commit 9bf3b53
Show file tree
Hide file tree
Showing 13 changed files with 457 additions and 1 deletion.
1 change: 1 addition & 0 deletions server-api/server-api-php/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ function_exists("date_default_timezone_set")?date_default_timezone_set("Asia/Sha
require_once($api_config_dir . '/include/errCode.php');
require_once($api_config_dir . '/include/pubFun.php');
require_once($api_config_dir . '/include/dbBase.php');
require_once($api_config_dir . '/include/star_api.php');


$ret = getReadMdb();
Expand Down
2 changes: 2 additions & 0 deletions server-api/server-api-php/debug.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@





2 changes: 1 addition & 1 deletion server-api/server-api-php/eventCenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ function process_group_event($action, $dataArr){

logf("$userId 请求向群 $groupId 新增群成员: $addUsers");

//TODO:可以判断userId是不是群里面的成员,如果不是群里面的成员,可以不让其邀请别人进群
//TODO:可以判断 userId 是不是群里面的成员,如果不是群里面的成员,可以不让其邀请别人进群
//或者判断userId是不是群的创建者,从而实现只允许创建者邀请别人进群
$addUsersArr = explode(",", $addUsers);
foreach($addUsersArr as $userId){
Expand Down
52 changes: 52 additions & 0 deletions server-api/server-api-php/group/addUsersToGroup.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?php
//后台主动 添加群成员

$dir = dirname(dirname(__FILE__));
require_once($dir . '/config.php');
require_once($dir . '/include/group.php');
require_once($dir . '/include/group_join.php');




$addUsers = '524048'; //要添加进的群的所有用户id,用逗号隔开
$groupId = 100457;


$addUsersArr = explode(",", $addUsers);
foreach($addUsersArr as $userId){
$ret = joinGroup($groupId, $userId);
if($ret != 0){
echoErr('join group failed:'.$ret);
}
}

$ret = addUsersToGroup($groupId, $addUsers);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
if($ret['data'] == 'GROUPPUSH_ERRID_GROUPID_NOT_SYNC'){

$ret = getGroupList($groupId);
if($ret['ret'] != 0){
echoErr('get GroupList err'.$ret['ret']);
}

$groupList = $ignoreList = '';
if(!empty($ret['data']['groupList'])){// groupList表示这个群的所有群成员,用逗号分开。
$groupList = $ret['data']['groupList'];
}
if(!empty($ret['data']['ignoreList'])){//ignoreList为可选参数,表示对该群开启了消息免打扰的所有群成员,用逗号分开。
$ignoreList = $ret['data']['ignoreList'];
}

$ret = syncGroupList($groupId, $groupList, $ignoreList);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
echoErr('失败');
}
}else{
echoErr('addUsersToGroup_failed');
}
}

echoK('success');
31 changes: 31 additions & 0 deletions server-api/server-api-php/group/create.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php
//后台主动创建群

$dir = dirname(dirname(__FILE__));
require_once($dir . '/config.php');
require_once($dir . '/include/group.php');
require_once($dir . '/include/group_create.php');


$userId = 'system'; //也可以是系统里面注册的其它用户
$groupName = '测试群';




$addUsers = $userId; //addUsers :用逗号分开的群成员列表,里面已经包含了创建者
$ret = createGroup($userId, $groupName, $addUsers);
if($ret['ret'] != 0){
echoErr('createGroup failed:'.$ret['ret']);
}
$groupId = $ret['data']['groupId'];

$groupList = $userId;
$ignoreList = '';
$ret = syncGroupList($groupId, $groupList, $ignoreList);

$data = json_decode($ret, TRUE);
if($data['status'] != 1){
echoErr('群创建失败');
}
echoK('success');
54 changes: 54 additions & 0 deletions server-api/server-api-php/group/delUsersFromGroup.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php
//后台主动 删除群成员

$dir = dirname(dirname(__FILE__));
require_once($dir . '/config.php');
require_once($dir . '/include/group.php');
require_once($dir . '/include/group_quit.php');


//希望从群内删除的成员列表,用逗号分隔,如果删除单个用户,则没有逗号。

//TODO 可检查 是不是群主,如果不是可以不让其踢人,同时可以不让群主踢自已

$groupId = 100457;
$removeUsers = '524048';
$removeUsersArr = explode(",", $removeUsers);
foreach($removeUsersArr as $userId){
$ret = quitGroup($userId, $groupId);
if($ret != 0){
echoErr('quitGroup_failed:'.$ret);
}
}



$ret = delUsersFromGroup($groupId, $removeUsers);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
if($ret['data'] == 'GROUPPUSH_ERRID_GROUPID_NOT_SYNC'){
$ret = getGroupList($groupId);
if($ret['ret'] != 0){
echoErr('get GroupList err'.$ret['ret']);
}

$groupList = $ignoreList = '';
if(!empty($ret['data']['groupList'])){// groupList表示这个群的所有群成员,用逗号分开。
$groupList = $ret['data']['groupList'];
}
if(!empty($ret['data']['ignoreList'])){//ignoreList为可选参数,表示对该群开启了消息免打扰的所有群成员,用逗号分开。
$ignoreList = $ret['data']['ignoreList'];
}

$ret = syncGroupList($groupId, $groupList, $ignoreList);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
echoErr('失败');
}
}else{
echoErr('delUsersFromGroup_failed');
}
}


echoK('success');
28 changes: 28 additions & 0 deletions server-api/server-api-php/group/delete.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php
//后台主动删除群

$dir = dirname(dirname(__FILE__));
require_once($dir . '/config.php');
require_once($dir . '/include/group.php');
require_once($dir . '/include/group_del.php');


$userId = 'system'; //也可以是系统里面注册的其它用户
$groupId = 100457;


$ret = deleteGroup($userId, $groupId);
if($ret != 0){
echoErr('deleteGroup_failed:'.$ret);
}


$groupList = ''; //不传groupList表示清空这个群的成员
$ignoreList = '';
$ret = syncGroupList($groupId, $groupList, $ignoreList);

$data = json_decode($ret, TRUE);
if($data['status'] != 1){
echoErr('群创建失败');
}
echoK('success');
48 changes: 48 additions & 0 deletions server-api/server-api-php/group/setPushIgnore.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php
//后台主动 设置 免打扰:设置某人不接收群消息

$dir = dirname(dirname(__FILE__));
require_once($dir . '/config.php');
require_once($dir . '/include/group.php');



$groupId = 100457;
$ignoreList = '524048';
$usersArr = explode(",", $ignoreList);
foreach($usersArr as $userId){
$ret = pushIgnore($groupId, $userId, GROUP_DND);
if($ret != 0){
echoErr('pushIgnore failed:'.$ret);
}
}

$ret = setPushIgnore($groupId, $ignoreList);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
if($ret['data'] == 'GROUPPUSH_ERRID_GROUPID_NOT_SYNC'){

$ret = getGroupList($groupId);
if($ret['ret'] != 0){
echoErr('get GroupList err'.$ret['ret']);
}

$groupList = $ignoreList = '';
if(!empty($ret['data']['groupList'])){// groupList表示这个群的所有群成员,用逗号分开。
$groupList = $ret['data']['groupList'];
}
if(!empty($ret['data']['ignoreList'])){//ignoreList为可选参数,表示对该群开启了消息免打扰的所有群成员,用逗号分开。
$ignoreList = $ret['data']['ignoreList'];
}

$ret = syncGroupList($groupId, $groupList, $ignoreList);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
echoErr('失败');
}
}else{
echoErr('addUsersToGroup_failed');
}
}

echoK('success');
47 changes: 47 additions & 0 deletions server-api/server-api-php/group/unsetPushIgnore.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php
//后台主动 设置 取消免打扰:设置某人接收群消息

$dir = dirname(dirname(__FILE__));
require_once($dir . '/config.php');
require_once($dir . '/include/group.php');



$groupId = 100457;
$ignoreList = '524048';
$usersArr = explode(",", $ignoreList);
foreach($usersArr as $userId){
$ret = pushIgnore($groupId, $userId, GROUP_PUSH);
if($ret != 0){
echoErr('pushIgnore failed:'.$ret);
}
}

$ret = unsetPushIgnore($groupId, $ignoreList);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
if($ret['data'] == 'GROUPPUSH_ERRID_GROUPID_NOT_SYNC'){

$ret = getGroupList($groupId);
if($ret['ret'] != 0){
echoErr('get GroupList err'.$ret['ret']);
}

$groupList = $ignoreList = '';
if(!empty($ret['data']['groupList'])){// groupList表示这个群的所有群成员,用逗号分开。
$groupList = $ret['data']['groupList'];
}
if(!empty($ret['data']['ignoreList'])){//ignoreList为可选参数,表示对该群开启了消息免打扰的所有群成员,用逗号分开。
$ignoreList = $ret['data']['ignoreList'];
}

$ret = syncGroupList($groupId, $groupList, $ignoreList);
$data = json_decode($ret, TRUE);
if($data['status'] != 1){
echoErr('失败');
}
}else{
echoErr('addUsersToGroup_failed');
}
}
echoK('success');
21 changes: 21 additions & 0 deletions server-api/server-api-php/include/pubFun.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ function echoK_zh($data, $exit = 1){
}
}

function echoDebug($data, $exit = 0){
echo '<pre>======<br/>';
print_r($data);
echo '<br/>======</pre>';
if($exit == 1){
exit;
}
}

function logf($data){
$fp = fopen(log_file, "a+");//读写方式打开,将文件指针指向文件末尾。如果文件不存在则尝试创建之。
Expand Down Expand Up @@ -93,3 +101,16 @@ function getSuffix($prefix_suffix){
}
}

function curl_post($url, $data){
$ch = curl_init();
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_POST, 1 );
//curl_setopt( $ch, CURLOPT_HTTPHEADER, array('Content-Type: text/xml'));
curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
$result = curl_exec($ch);
curl_close($ch);
return $result;
}


Loading

0 comments on commit 9bf3b53

Please sign in to comment.