diff --git a/app/api/controller/AddressController.php b/app/api/controller/AddressController.php index 0941828..37ab028 100755 --- a/app/api/controller/AddressController.php +++ b/app/api/controller/AddressController.php @@ -8,6 +8,8 @@ use hg\apidoc\annotation as Apidoc; /** * 提现地址 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class AddressController extends BaseController{ /** diff --git a/app/api/controller/BaseController.php b/app/api/controller/BaseController.php index 0e2b74e..5bda233 100755 --- a/app/api/controller/BaseController.php +++ b/app/api/controller/BaseController.php @@ -56,13 +56,9 @@ class BaseController { return $this->json(1,$msg, $data); } - - /** - * @Apidoc\Title("上传") - * @Apidoc\Method("POST") - */ - function upload(Request $request) + protected function _upload($request) { + try{ $user = \support\Jwt::getUser(); }catch(\Exception $e){ @@ -72,7 +68,7 @@ class BaseController $validate = Validate::rule('savePath', 'alphaNum'); $data = ['savePath' => $savePath]; if (!$validate->check($data)) { - return $this->fail( '参数错误:'.$validate->getError()); + return '参数错误:'.$validate->getError(); } $savePath = trim($savePath,'/'); //$savePath = 'upload/'.$savePath.'/'.$user['id']; @@ -82,35 +78,43 @@ class BaseController $maxsize = Config('site.upload_maxsize')*1024*1024; //多文件上传 $files = $request->file(); - try { - $result = Storage::adapter('oss') - ->path($savePath) - ->size($maxsize) - ->extYes($mimetype) - ->uploads($files,0,$maxsize * count($files),false); - $save_datas = []; - foreach($result as $k=>$fileinfo){ - $save_datas[] = [ - 'user_id' => $user['id'], - 'category' => 'default', - 'adapter' => $fileinfo->adapter, - 'origin_name' => $fileinfo->origin_name, - 'file_name' => $fileinfo->file_name, - 'size' => $fileinfo->size, - 'mime_type' => $fileinfo->mime_type, - 'extension' => $fileinfo->extension, - 'file_height' => $fileinfo->file_height, - 'file_width' => $fileinfo->file_width, - 'file_url' => $fileinfo->file_url, - 'sha1' => $fileinfo->storage_key ?:sha1_file(public_path($fileinfo->file_name)), - 'use_count' => 0, - ]; - } - \app\model\Files::insertAll($save_datas); - return $this->success(__('successful'),$result); - }catch (\Exception $e){ - return $this->error($e->getMessage()); + $result = Storage::adapter('oss') + ->path($savePath) + ->size($maxsize) + ->extYes($mimetype) + ->uploads($files,0,$maxsize * count($files),false); + $save_datas = []; + foreach($result as $k=>$fileinfo){ + $save_datas[] = [ + 'user_id' => $user['id'], + 'category' => 'default', + 'adapter' => $fileinfo->adapter, + 'origin_name' => $fileinfo->origin_name, + 'file_name' => $fileinfo->file_name, + 'size' => $fileinfo->size, + 'mime_type' => $fileinfo->mime_type, + 'extension' => $fileinfo->extension, + 'file_height' => $fileinfo->file_height, + 'file_width' => $fileinfo->file_width, + 'file_url' => $fileinfo->file_url, + 'sha1' => $fileinfo->storage_key ?:sha1_file(public_path($fileinfo->file_name)), + 'use_count' => 0, + ]; } + $res = \app\model\Files::saveAll($save_datas); + return $res; + } + /** + * @Apidoc\Title("上传") + * @Apidoc\Method("POST") + */ + function upload(Request $request,$return = false) + { + $res = $this->_upload($request); + if(is_string($res)){ + return $this->fail( $res); + } + return $this->success(__('successful'),$res); } diff --git a/app/api/controller/CardController.php b/app/api/controller/CardController.php index 9f862be..748cf1e 100755 --- a/app/api/controller/CardController.php +++ b/app/api/controller/CardController.php @@ -10,6 +10,8 @@ use hg\apidoc\annotation as Apidoc; /** * 卡密模块 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class CardController extends BaseController{ /** diff --git a/app/api/controller/CommonController.php b/app/api/controller/CommonController.php index 5a27bc2..be4d661 100755 --- a/app/api/controller/CommonController.php +++ b/app/api/controller/CommonController.php @@ -46,7 +46,7 @@ class CommonController extends BaseController{ 'attachment_category','categorytype','cdkey_category','configgroup','flagtype', 'languages','forbiddenip','fixedpage','admin_login_captcha', 'upload_mimetype','upload_multipart','upload_multiple','upload_thumbstyle','upload_previewtpl','upload_timeout','upload_maxsize', - 'yeji_jicha_reward','suanli_rate','agent_expirs_retention','allow_currencys','allow_balance_log', + 'yeji_jicha_reward','suanli_rate','agent_expirs_retention','allow_currencys','allow_currency_logs', 'agent_commission_total_rate','agent_commission_layer_rate','differential_commission_total_rate' ]; $config = array_diff_key($config, array_flip($disallowFields)); @@ -153,7 +153,7 @@ class CommonController extends BaseController{ 'group_id' => 0, 'region' => '86', 'nickname' => input('nickname'), - 'avatar' => '/static/img/avatar.png', + 'avatar' => '/static/avatar/'.rand(0,17).'.png', ]; if ($invite_code) { if(strlen($invite_code) == 12){ @@ -211,7 +211,7 @@ class CommonController extends BaseController{ $mobile = input('mobile'); $email = input('email'); $password = input('password'); - $type = input(param: 'type'); + $type = input('type'); if($type == 'mobile'){ if (!$mobile ) { return $this->fail(__('Invalid username or password')); diff --git a/app/api/controller/FriendCircleController.php b/app/api/controller/FriendCircleController.php index cbb4c5a..71ce675 100755 --- a/app/api/controller/FriendCircleController.php +++ b/app/api/controller/FriendCircleController.php @@ -34,26 +34,40 @@ class FriendCircleController extends BaseController{ * @return void */ function info(Request $request): Response{ - $user = \support\Jwt::getUser(); - if (!$user) { - return $this->fail('请先登录'); + $user_id = Input('user_id'); + if($user_id){ + $user_id = idDecode($user_id); + $json= [ + 'top_unread_items' =>[], + 'unread_item_ids' =>[], + 'unread_count' =>0, + 'settings' => Db::name('friend_circle_setting')->where('user_id',$user_id)->order('id','desc')->findOrEmpty() + ]; + return $this->success('ok',$json); + }else{ + $user = \support\Jwt::getUser(); + if (!$user) { + return $this->fail('请先登录'); + } + $user_id = $user->id; + $res = $this->newcount($request); + $response = $res->rawBody(); + $json = json_decode($response,true); + $json['data']['settings'] = Db::name('friend_circle_setting')->where('user_id',$user_id)->order('id','desc')->findOrEmpty(); + // [ + // 'bg' => '', + // ]; + $top_unread_items = FriendCircleModel::whereIn('id',$json['data']['unread_item_ids']) + ->with(['user' => function($query) { + $query->field('id,nickname,avatar'); + }]) + ->order('id', 'desc') + ->limit(0,3) + ->select(); + $json['data']['top_unread_items'] = $top_unread_items ?: []; + $res->withBody(json_encode($json)); + return $res; } - $res = $this->newcount($request); - $response = $res->rawBody(); - $json = json_decode($response,true); - $json['data']['settings'] = [ - 'bg' => '', - ]; - $top_unread_items = FriendCircleModel::whereIn('id',$json['data']['unread_item_ids']) - ->with(['user' => function($query) { - $query->field('id,nickname,avatar'); - }]) - ->order('id', 'desc') - ->limit(0,3) - ->select(); - $json['data']['top_unread_items'] = $top_unread_items ?: []; - $res->withBody(json_encode($json)); - return $res; } /** * @Apidoc\Title("列表") @@ -66,9 +80,12 @@ class FriendCircleController extends BaseController{ { $current_user = \support\Jwt::getUser(); $current_user_id = $current_user ? $current_user->id : 0; - $page = (int)$request->get('page', 1); - $limit = (int)$request->get('limit', 10); - $user_id = $request->get('user_id', 0); + $page = (int)Input('page', 1); + $limit = (int)Input('limit', 10); + $user_id = Input('user_id', 0); + if($user_id){ + $user_id = idDecode($user_id); + } $query = FriendCircleModel::where('status', 1) ->whereIn('user_id',$this->getFriendUserIds($current_user_id)) @@ -86,16 +103,18 @@ class FriendCircleController extends BaseController{ 'list_rows' => $limit, 'page' => $page, ]); - cache('circle_last_read_id',$list[0]['id']); + if(!$user_id){ + cache('circle_last_read_id_'.$current_user_id,$list[0]['id']); + } // 处理每条朋友圈数据 $items = $list->items(); $list->each(function($item) use ($current_user_id){ // 获取点赞列表 - $likes = Db::name('friend_circle')->alias('f') + $likes = Db::name('friend_circle_like')->alias('f') ->join('user u','u.id=f.user_id') - ->where('f.id', $item->id) + ->where('f.circle_id', $item->id) ->field('f.*,u.avatar,u.nickname') ->order('f.created_at', 'desc') ->limit(20) @@ -182,11 +201,11 @@ class FriendCircleController extends BaseController{ if (!$user) { return $this->fail('请先登录'); } - - $circle_last_read_id = cache('circle_last_read_id') ?: 0; + $user_id = $user->id; + $circle_last_read_id = cache('circle_last_read_id_'.$user_id) ?: 0; // 统计从上次查看时间到现在新增的朋友圈数量 $unread_item_ids = FriendCircleModel::where('status', 1) - ->whereIn('user_id',$this->getFriendUserIds($user->id)) + ->whereIn('user_id',$this->getFriendUserIds($user_id)) ->where('id', '>', $circle_last_read_id) ->order('id', 'desc') ->column('id'); @@ -250,7 +269,7 @@ class FriendCircleController extends BaseController{ 'status' => 1, ]); - return $this->success('发布成功', ['id' => $circle->id]); + return $this->success('发布成功', ['id' => $circle->id,'data' => $circle]); } /** @@ -371,15 +390,56 @@ class FriendCircleController extends BaseController{ if (!$user_id) { return []; } - $result = cache('friend_id_list') ?: []; + $cache_key = 'friend_id_list_'.$user_id; + $result = cache($cache_key) ?: []; if(count($result) === 0){ - $res = request()->IM->friend->getFriendList($user_id.''); + $res = request()->IM->friend->getFriendList(idEncode($user_id)); $friendsInfo = $res['friendsInfo']; foreach($friendsInfo as $k=>$v){ array_push($result,$v['friendUser']['userID']); } - cache('friend_id_list',$result,3600); + cache($cache_key,$result,3600); } + $result[] = $user_id; return $result; } + function delete(Request $request): Response{ + $id = $request->post('id'); + $user = \support\Jwt::getUser(); + if (!$user) { + return $this->fail('请先登录'); + } + if($id){ + FriendCircleModel::where('id',$id)->where('user_id',$user->id)->delete(); + } + return $this->success('删除成功'); + } + + function upload_bg(Request $request){ + try { + $user = \support\Jwt::getUser(); + if (!$user) { + return $this->fail('请先登录'); + } + $res = $this->_upload($request); + if(is_string($res)){ + return $this->fail( $res); + } + + Db::name('friend_circle_setting')->replace()->insert([ + 'user_id' => $user->id, + 'bg' => $res[0]['file_name'], + 'allow_days'=>0, + 'created_at'=>0 + ]); + //$result->ss = cdnurl($result->url); + //P($result); + return $this->success(__('successful'),[ + 'url'=>$res[0]['file_name'] + ]); + }catch (\Exception $e){ + return $this->error($e->getMessage()); + } + } + } \ No newline at end of file diff --git a/app/api/controller/GiftController.php b/app/api/controller/GiftController.php index 26485eb..053197e 100755 --- a/app/api/controller/GiftController.php +++ b/app/api/controller/GiftController.php @@ -10,6 +10,8 @@ use hg\apidoc\annotation as Apidoc; /** * 礼品模块 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class GiftController extends BaseController{ /** diff --git a/app/api/controller/GroupController.php b/app/api/controller/GroupController.php new file mode 100755 index 0000000..2b15059 --- /dev/null +++ b/app/api/controller/GroupController.php @@ -0,0 +1,129 @@ +post('limit',10); + $offset = $request->post('offset',0); + $group_id = $request->post('groupID') ?:$request->post('group_id'); + //$ls = $this->get_user_in_group($group_id); + //log_alert($ls); + log_alert([$offset,$group_id,$limit]); + $list = AlbumModel::where('group_id',$group_id) + ->where('id','<',$offset) + ->order('id','desc') + ->limit(0,$limit) + ->select(); + return $this->success('ok',$list); + } + /** + * @Apidoc\Title("上传相片") + * @Apidoc\Method("POST") + * @Apidoc\Param("group_id", type="string", require=true, desc="群ID") + * @Apidoc\Param("title", type="string", require=true, desc="标题") + * @Apidoc\Param("url", type="string", require=true, desc="图片") + */ + function album_create(Request $request): Response + { + $user_id = \support\Jwt\JwtToken::getCurrentId(); + $res = $this->_upload($request); + if(is_string($res)){ + return $this->fail( $res); + } + $groupID = $request->post('groupID'); + $insert_data = []; + foreach($res as $item){ + $insert_data[] = [ + 'user_id' => $user_id, + 'group_id' => $groupID, + 'title' => $item['origin_name'], + 'url' => $item['file_name'], + ]; + } + $result = AlbumModel::saveAll($insert_data); + return $this->success('ok',$result[0]); + } + /** + * @Apidoc\Title("更新相片") + * @Apidoc\Method("POST") + * @Apidoc\Param("id", type="string", require=true, desc="ID") + * @Apidoc\Param("title", type="string", require=true, desc="标题") + * @Apidoc\Param("url", type="string", require=true, desc="图片") + */ + function album_update(Request $request): Response + { + $id = $request->input('id'); + $data = $request->input('data'); + $album = AlbumModel::find($id); + $album->update($data); + return $this->success('ok',$album); + } + /** + * @Apidoc\Title("删除相片") + * @Apidoc\Method("POST") + * @Apidoc\Param("id", type="string", require=true, desc="ID") + */ + function album_delete(Request $request): Response + { + $ids = Input('ids'); + //$album = AlbumModel::whereIn('id',condition: $ids)->select(); + //$album->delete(); + AlbumModel::whereIn('id',condition: $ids)->delete(); + return $this->success('ok'); + } + /** + * 获取再群里的角色 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() + */ + private function get_user_in_group($group_id='',$user_id='') + { + $list = request()->IM->group->getGroupMemberList($group_id,$user_id); + return $list; + } + /** + * 头像上传 + * @Apidoc\Method("POST") + * @Apidoc\Param("file", type="File", require=true, desc="文件") + */ + public function avatar(Request $request) + { + //单文件上传 + $groupID = $request->post('groupID'); + if(!$groupID){ + return $this->fail(__('参数错误')); + } + $res = $this->_upload($request); + if(is_string($res)){ + return $this->fail( $res); + } + $data = [ + 'groupID' => $groupID, + 'faceURL' => $res[0]['file_name'], + ]; + $list = request()->IM->group->setGroupInfo($data); + return $this->success(__('successful'),$data); + } +} diff --git a/app/api/controller/MessageController.php b/app/api/controller/MessageController.php index 019628a..fde8f3e 100644 --- a/app/api/controller/MessageController.php +++ b/app/api/controller/MessageController.php @@ -9,6 +9,8 @@ use hg\apidoc\annotation as Apidoc; /** * 消息控制器 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class MessageController extends BaseController{ /** @@ -20,7 +22,7 @@ class MessageController extends BaseController{ */ function delete(Request $request):Response{ $im = $request->IM; - $data = $im->message->sendBusinessNotification('system',100007,[ + $data = $im->message->sendBusinessNotification('system',idEncode(100007),[ 'contentType' => 101, 'textElem' => [ 'content' => '欢迎使用4'.Config('site.name') diff --git a/app/api/controller/ProductController.php b/app/api/controller/ProductController.php index 8837b89..db80b24 100755 --- a/app/api/controller/ProductController.php +++ b/app/api/controller/ProductController.php @@ -9,6 +9,8 @@ use hg\apidoc\annotation as Apidoc; /** * 产品模块 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class ProductController extends BaseController{ /** diff --git a/app/api/controller/QuestionnaireController.php b/app/api/controller/QuestionnaireController.php index 17d41ef..e0c9122 100755 --- a/app/api/controller/QuestionnaireController.php +++ b/app/api/controller/QuestionnaireController.php @@ -12,6 +12,8 @@ use hg\apidoc\annotation as Apidoc; /** * 问卷 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class QuestionnaireController extends BaseController{ /** diff --git a/app/api/controller/RechargeController.php b/app/api/controller/RechargeController.php index d942910..2ff02c0 100755 --- a/app/api/controller/RechargeController.php +++ b/app/api/controller/RechargeController.php @@ -10,6 +10,8 @@ use hg\apidoc\annotation as Apidoc; /** * 充值模块 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class RechargeController extends BaseController{ /** diff --git a/app/api/controller/RoleController.php b/app/api/controller/RoleController.php index e8377c0..f906a24 100755 --- a/app/api/controller/RoleController.php +++ b/app/api/controller/RoleController.php @@ -7,6 +7,8 @@ use hg\apidoc\annotation as Apidoc; /** * 用户角色 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class RoleController extends BaseController{ /** diff --git a/app/api/controller/SigninController.php b/app/api/controller/SigninController.php index 4f14380..6ad25ef 100755 --- a/app/api/controller/SigninController.php +++ b/app/api/controller/SigninController.php @@ -11,6 +11,8 @@ use Shopwwi\WebmanFilesystem\Facade\Storage; use hg\apidoc\annotation as Apidoc; /** * 签到模块 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class SigninController extends BaseController @@ -275,7 +277,7 @@ class SigninController extends BaseController * @Apidoc\Method("POST") * @Apidoc\Param("file", type="string",require=true, desc="文件") */ - function upload(Request $request) + function upload(Request $request,$return = false) { //多文件上传 $files = $request->file(); diff --git a/app/api/controller/TeamController.php b/app/api/controller/TeamController.php index bc9efac..607ab92 100755 --- a/app/api/controller/TeamController.php +++ b/app/api/controller/TeamController.php @@ -159,12 +159,8 @@ class TeamController extends BaseController{ //$result['data'][$k]['created_at'] = date('Y-m-d H:i:s', $item['created_at']); $result['data'][$k]['total_count'] = UserTeamModel::where('ancestor_id',$item['id'])->where('status',1)->where('depth','>',0)->count('descendant_id'); $result['data'][$k]['direct_total'] = cache('team_direct_total_'.$item['id'])??0; - $performance = get_performance($item['id']); - $result['data'][$k]['performance_large'] = $performance[0]; - $result['data'][$k]['performance_small'] = $performance[1]; $result['data'][$k]['role'] = isset($role_arr[$item['role_id']]) ? $role_arr[$item['role_id']] : __('普通用户'); - $result['data'][$k]['level'] = get_user_level($item['id'],$item['performance_small']); - $result['data'][$k]['questionnaire_count'] = WorkRecordModel::where('user_id',$item['id'])->count('id'); + //$result['data'][$k]['questionnaire_count'] = WorkRecordModel::where('user_id',$item['id'])->count('id'); $result['data'][$k]['id'] = idEncode($item['id']); //return $item; } diff --git a/app/api/controller/UserController.php b/app/api/controller/UserController.php index f36bcb0..251f511 100755 --- a/app/api/controller/UserController.php +++ b/app/api/controller/UserController.php @@ -38,6 +38,7 @@ class UserController extends BaseController{ $gender = input('gender',null); $faceURL = input('faceURL',null); $birth = input('birth',null); + $bio = input('bio',null); $save_data =[]; if($nickname){ $save_data['nickname'] = $nickname; @@ -46,7 +47,10 @@ class UserController extends BaseController{ $save_data['sex'] = $gender; } if($faceURL){ - $save_data['avatar'] = $faceURL; + $save_data['faceURL'] = $faceURL; + } + if($bio){ + $save_data['bio'] = $bio; } if($birth){ $save_data['birthday'] = datetime($birth/1000,'Y-m-d'); @@ -133,21 +137,15 @@ class UserController extends BaseController{ public function avatar(Request $request) { //单文件上传 - $file = $request->file('file0'); - try { - $result = Storage::adapter('public')->path('upload/avatar')->size(1024*1024*5)->extYes(['image/jpeg','image/png'])->processUpload($file,function ($image){ - $image->resize(200,200); - return $image; - },true); - \support\Jwt::getUser()->save([ - 'avatar' => '/'.$result->file_name, - ]); - //$result->ss = cdnurl($result->url); - //P($result); - return $this->success(__('successful'),$result); - }catch (\Exception $e){ - return $this->error($e->getMessage()); + $res = $this->_upload($request); + if(is_string($res)){ + return $this->fail( $res); } + $data = [ + 'avatar' => $res[0]['file_name'], + ]; + \support\Jwt::getUser()->save($data); + return $this->success(__('successful'),$data); } function realname(Request $request): Response { @@ -198,7 +196,11 @@ class UserController extends BaseController{ */ function find(Request $request): Response { - $userIDs = Input('userIDs'); + $ids = Input('userIDs'); + if(is_string($ids)){ + $ids = explode(',',$ids); + } + $userIDs = array_map('idDecode',$ids); //$res = $request->IM->user->getUsersInfo($userIDs); $list = Db::name('user')-> whereIn('id',$userIDs) @@ -240,12 +242,18 @@ class UserController extends BaseController{ $searchtype = Input('searchtype'); $fields = 'id,avatar,username,nickname,avatar,sex,email,mobile,birthday,bio'; $model = Db::name('user')->field($fields)->where('status',1); - if($searchtype =='id'){ - $model = $model->where('id',$keyword); - }else{ - $model = $model->whereLike('username','%'.$keyword.'%'); - } + $model = $model->where('id',idDecode($keyword)); + // if($searchtype =='id'){ + // $model = $model->where('id',$keyword); + // }else{ + // $model = $model->whereLike('username|id','%'.$keyword.'%'); + // } $list = $model->paginate(Input('limit',10)); + $list->each(function ($item){ + $item['id'] = idEncode($item['id']); + return $item; + }); + //log_alert($list->toArray()); return $this->success('ok',$list); } } \ No newline at end of file diff --git a/app/api/controller/WalletController.php b/app/api/controller/WalletController.php index 4c01dda..67c15bc 100755 --- a/app/api/controller/WalletController.php +++ b/app/api/controller/WalletController.php @@ -23,11 +23,11 @@ class WalletController extends BaseController{ */ public $noNeedLogin = []; /** - * 用户调研币兑换问卷指标 + * 用户货币互换 * @Apidoc\Method("POST") * @Apidoc\Param("currency", type="string",require=true, desc="货币money_to_score") - * @Apidoc\Param("sendAmount", type="string",require=true, desc="调研币兑换数量") - * @Apidoc\Param("receiveAmount", type="string",require=true, desc="问卷指标兑换数量") + * @Apidoc\Param("sendAmount", type="string",require=true, desc="money兑换数量") + * @Apidoc\Param("receiveAmount", type="string",require=true, desc="score兑换数量") * @Apidoc\Param("trade_password", type="string",require=true, desc="交易密码") * @Apidoc\Param("code", type="string",require=true, desc="图形验证码(event=exchange)") */ diff --git a/app/api/controller/WithdrawlController.php b/app/api/controller/WithdrawlController.php index a29696c..7484239 100755 --- a/app/api/controller/WithdrawlController.php +++ b/app/api/controller/WithdrawlController.php @@ -11,6 +11,8 @@ use hg\apidoc\annotation as Apidoc; /** * 提现模块 + * @Apidoc\NotParse() + * @Apidoc\NotDebug() */ class WithdrawlController extends BaseController{ /** diff --git a/app/api/middleware/Auth.php b/app/api/middleware/Auth.php index 8962d51..eb28d7b 100755 --- a/app/api/middleware/Auth.php +++ b/app/api/middleware/Auth.php @@ -19,14 +19,14 @@ class Auth implements MiddlewareInterface */ public function process(Request $request, callable $next): Response { + $headers = [ + 'Access-Control-Allow-Credentials' => 'true', + 'Access-Control-Allow-Origin' => $request->header('origin', '*'), + 'Access-Control-Allow-Methods' => $request->header('access-control-request-method', '*'), + 'Access-Control-Allow-Headers' => $request->header('access-control-request-headers', '*'), + ]; if($request->method() == 'OPTIONS'){ - $headers = [ - 'Access-Control-Allow-Credentials' => 'true', - 'Access-Control-Allow-Origin' => $request->header('origin', '*'), - 'Access-Control-Allow-Methods' => $request->header('access-control-request-method', '*'), - 'Access-Control-Allow-Headers' => $request->header('access-control-request-headers', '*'), - ]; - $response = response('200',200,$headers); + $response = response('',204,$headers); return $response; } $lang = $request->input('lang','zh-Hans'); @@ -49,28 +49,29 @@ class Auth implements MiddlewareInterface //检测是否登录 try { if (!\support\Jwt::isLogin()) { - return json([ + return new Response(401,$headers,json_encode([ "code"=>401, "data"=>[], "msg"=>__('Please login first') - ]); + ])); } } catch (\Exception $e) { - return json([ + return new Response(401,$headers,json_encode([ "code"=>401, "data"=>[], "msg"=>__('Please login first') - ]); + ])); } $user = \support\Jwt\JwtToken::getUser(); if(!$user['status']){ - return json([ + return new Response(403,$headers,json_encode([ "code"=>403, "data"=>[], "msg"=>__('Account is locked') - ]); + ])); } + // $key = "debounce_" . $request->path() . "_" . ($user->id ?? 'guest'); // $ttl = 1; // 防抖时间（秒） // $redishandler = new \Redis; @@ -91,27 +92,27 @@ class Auth implements MiddlewareInterface $actionname = strtolower(get_action_name()); $path = str_replace('.', '/', $controllername) . '/' . $actionname; if (!\support\Jwt::check($path)) { - return json([ + return new Response(405,$headers,json_encode([ "code"=>405, "data"=>[], - "msg"=>__('You have no permission') - ]); + "msg"=>__('have no permission') + ])); } } } - if($request->client!='web'){ - $data = $request->post('data'); - if($data){ - $data = str_replace('%3D','=',$data); - $data = str_replace(' ','+',$data); - //var_dump($data); - $data = aesdecode($data); - $data = json_decode($data,true); - //var_dump($data); - $request->withBody($data); - } - } + // if($request->client!='web'){ + // $data = $request->post('data'); + // if($data){ + // $data = str_replace('%3D','=',$data); + // $data = str_replace(' ','+',$data); + // //var_dump($data); + // $data = aesdecode($data); + // $data = json_decode($data,true); + // //var_dump($data); + // $request->withBody($data); + // } + // } $config = Config('site'); $config['debug'] = config('app.debug'); $config['controller'] = $request->controller_name; @@ -126,13 +127,6 @@ class Auth implements MiddlewareInterface ]); $request->IM = $IM; $response = $next($request); - $headers = [ - 'Access-Control-Allow-Credentials' => 'true', - 'Access-Control-Allow-Origin' => $request->header('origin', '*'), - 'Access-Control-Allow-Methods' => $request->header('access-control-request-method', '*'), - 'Access-Control-Allow-Headers' => $request->header('access-control-request-headers', '*'), - ]; - $response->withHeaders($headers); //cp('auth'); //\support\Log::alert('auth'); $body = str_replace([ @@ -140,10 +134,10 @@ class Auth implements MiddlewareInterface ],[ request()->path() ],$response->rawBody()); - if($request->app=="api" && $request->client!='web'){ - $body = aesencode($body); - } - $response->withBody($body)->getStatusCode(); + // if($request->app=="api" && $request->client!='web'){ + // $body = aesencode($body); + // } + $response->withHeaders($headers)->withBody($body)->getStatusCode(); $time = microtime() - $request->start_time; //echo("响应时间:".$request->uri().':'.$time.PHP_EOL); //$response = $next($request); diff --git a/app/command/OpenIm.php b/app/command/OpenIm.php index 441be5b..683a6c8 100755 --- a/app/command/OpenIm.php +++ b/app/command/OpenIm.php @@ -45,7 +45,7 @@ class OpenIm extends Command 'host' => 'http://127.0.0.1:10002', // OpenIM API地址 'secret' => 'n1e5a6s6m7', // OpenIM密钥 ]); - $data = $im->user->updateUserInfo('100001',['userInfo'=>['userId'=>'wx100001']]); + $data = $im->user->updateUserInfo(idEncode('100006'),['userInfo'=>['userId'=>'wx100001']]); cp($data); return self::SUCCESS; } diff --git a/app/command/User.php b/app/command/User.php new file mode 100755 index 0000000..ecfb279 --- /dev/null +++ b/app/command/User.php @@ -0,0 +1,57 @@ +addOption('user_id','u', InputArgument::OPTIONAL, 'user_id'); + $this->addOption('action','a', InputArgument::OPTIONAL, '操作类型'); + } + + /** + * @param InputInterface $input + * @param OutputInterface $output + * @return int + */ + protected function execute(InputInterface $input, OutputInterface $output): int + { + $action = $input->getOption('action','login'); + if($action == 'login'){ + $IM = new \support\OpenImSdk\Client([ + 'host' => 'http://127.0.0.1:10002', // OpenIM API地址 + 'secret' => 'n1e5a6s6m7', // OpenIM密钥 + ]); + $user_id = $input->getOption('user_id'); + if(!$user_id){ + return false; + } + $user = \support\Jwt::direct($user_id); + $imToken = $IM->auth->getUserToken(idEncode($user['id']),2); + cp('userID:' . $user['id']); + cp('nickname:' . $user['nickname']); + cp('token:' . $user['token']); + cp('imToken:' . $imToken['token']); + return 0; + } + cp('action not exist'); + return 0; + + } +} diff --git a/app/controller/HookController.php b/app/controller/HookController.php index 8b9bddb..d91147d 100755 --- a/app/controller/HookController.php +++ b/app/controller/HookController.php @@ -23,17 +23,27 @@ class HookController{ { $userID= Input('userID'); $nickname= Input('nickname'); - + $users = Input('users'); $im = new \support\OpenImSdk\Client([ 'host' => 'http://127.0.0.1:10002', // OpenIM API地址 'secret' => 'n1e5a6s6m7', // OpenIM密钥 ]); - $im->message->sendBusinessNotification('official_team',$userID,[ - 'contentType' => 101, - 'textElem' => [ - 'content' => '欢迎使用'.Config('site.name') - ] - ]); + foreach($users as $k=>$v){ + + // 'userID' => '0EO9K107ON', + // 'nickname' => '坏蛋', + // 'faceURL' => '/static/img/avatar.png', + // 'ex' => '', + // 'createTime' => 0, + // 'appMangerLevel' => 0, + // 'globalRecvMsgOpt' => 0, + $im->message->sendBusinessNotification('official_team',idEncode($v['userID']),[ + 'contentType' => 101, + 'textElem' => [ + 'content' => '欢迎使用'.Config('site.name') + ] + ]); + } return json([ "actionCode" => 0, "errCode" => 0, @@ -266,4 +276,32 @@ class HookController{ "nextCode"=> 0 ]); } + function callbackAfterDeleteFriendCommand() : Response { + $friendUserID = Input('friendUserID'); + $ownerUserID = Input('ownerUserID'); + $sdk = $this->getSdk(); + $relation = $sdk->friend->isFriend($friendUserID,$ownerUserID); + if($relation){ + if($relation['inUser1Friends']){ + $this->getSdk()->friend->deleteFriend($friendUserID,$ownerUserID); + } + if($relation['inUser2Friends']){ + $this->getSdk()->friend->deleteFriend($ownerUserID,$friendUserID); + } + } + return json([ + "actionCode" => 0, + "errCode" => 0, + "errMsg" => "", + "errDlt" => "", + "nextCode"=> 0 + ]); + } + function getSdk(){ + $IM = new \support\OpenImSdk\Client([ + 'host' => 'http://127.0.0.1:10002', // OpenIM API地址 + 'secret' => 'n1e5a6s6m7', // OpenIM密钥 + ]); + return $IM; + } } \ No newline at end of file diff --git a/app/event/User.php b/app/event/User.php index 0686f54..8e6da41 100755 --- a/app/event/User.php +++ b/app/event/User.php @@ -14,7 +14,7 @@ class User{ if($user->parent_id){ parent_info( $user->id,[ 'id' => $user->parent_id, - 'username' => Db::name('user')->where('id',op: $user->parent_id)->value('username') + 'username' => Db::name('user')->where('id',$user->parent_id)->value('username') ]); //管理直推人数 cache_add('team_direct_total_'.$user->parent_id,1); @@ -64,16 +64,15 @@ class User{ $data['avatar'] = $data['avatar']?:"/static/img/avatar.png"; $data['role'] = isset($role_arr[$data['role_id']]) ? $role_arr[$data['role_id']] : __('普通用户');//\app\model\UserRole::where('id',$data['role_id'])->value('name'); - $data['level'] = get_user_level($data['id']); /** * @var \support\OpenImSdk\Client $IM */ $IM = request()->IM; - $imToken = $IM->auth->getUserToken($data['id'],Input('platform')); + $imToken = $IM->auth->getUserToken(idEncode($data['id']),Input('platform')); $data['imToken'] = $imToken['token']; - $data['userID'] = $data['id'] ; - $data['id'] = idEncode($data['id']); $last_see = $last_see ?? cache('last_see_'.$data['id']); + $data['id'] = idEncode($data['id']); + $data['userID'] = $data['id'] ; $count = 0; $data['friend_settings'] = [ 'unread_count' => $count ??0, diff --git a/app/functions.php b/app/functions.php index 7ed643b..cbd952c 100755 --- a/app/functions.php +++ b/app/functions.php @@ -236,26 +236,29 @@ if (!function_exists('abort')) { if (!function_exists('idEncode')) { function idEncode($id = '') { - return \isszz\hashids\facade\Hashids::mode('bilibili')->encode($id); + if($id<=100234){return $id.'';} + return id_encode($id); } } if (!function_exists('idDecode')) { function idDecode($id = '') { - return \isszz\hashids\facade\Hashids::mode('bilibili')->decode($id); + $_id= intval($id); + if($_id == $id){return $id;} + return id_decode($id); } } /** * 生成可逆的邀请码（8位，含校验位） - * @param int $user_id 用户ID（需≥1000） + * @param int $id 用户ID（需≥1000） * @return string 大写字母+数字组合 */ if (!function_exists('base62Encode')) { - function base62Encode(int $user_id,$secret='your_secret_salt'): string { + function base62Encode(int $id,$secret='your_secret_salt'): string { // 添加校验位（防止篡改） - $hash = crc32($user_id . $secret) % 1000; - $code_num = $user_id * 1000 + $hash; + $hash = crc32($id . $secret) % 1000; + $code_num = $id * 1000 + $hash; // Base62 编码（0-9A-Za-z） $base62 = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; @@ -271,7 +274,7 @@ if (!function_exists('base62Encode')) { } /** * 从邀请码解析用户ID - * @return int|false 成功返回user_id，失败返回false + * @return int|false 成功返回id，失败返回false */ if (!function_exists('base62Decode')) { function base62Decode(string $code,$secret='your_secret_salt'): int|false { @@ -286,15 +289,15 @@ if (!function_exists('base62Decode')) { } // 分离校验位 - $user_id = (int)($code_num / 1000); + $id = (int)($code_num / 1000); $hash = $code_num % 1000; // 校验 - if (crc32($user_id . $secret) % 1000 != $hash) { + if (crc32($id . $secret) % 1000 != $hash) { return false; } - return $user_id; + return $id; } } @@ -660,26 +663,6 @@ if (!function_exists('parent_info')) { return $info; } } -if (!function_exists('get_user_level')) { - function get_user_level($user_id,$performance_small=null) - { - if (!$user_id) { - return 0; - } - if(is_null($performance_small)){ - $performance= get_performance($user_id); - $performance_small = $performance[1]; - } - $user_level_rules = Config('site.user_level_rules'); - $level = 0; - foreach ($user_level_rules as $_level => $score) { - if($performance_small>$score){ - $level = $_level; - } - } - return $level; - } -} if(!function_exists('datetime')){ function datetime($timestamp=0,$format='Y-m-d H:i:s'){ @@ -700,20 +683,6 @@ if(!function_exists('datetime')){ return $timestamp; } } -if(!function_exists('get_performance')){ - function get_performance($user_id){ - $performance_list = \app\model\UserTeam::alias('ut') - ->join('user_extend ue', 'ut.descendant_id = ue.user_id') - ->where('ut.ancestor_id', $user_id) - ->order('ue.sales desc')->column('ue.sales'); - if(empty($performance_list)){ - $performance_list = [0,0]; - } - - return [array_shift($performance_list), array_sum($performance_list)]; - - } -} if(!function_exists('log_alert')){ function log_alert($data='',$channel='default'){ if(!is_string($data)){ @@ -743,84 +712,6 @@ if(!function_exists('enum_dir')){ return $list ; } } -if(!function_exists('jicha')){ - function jicha($current_user_id,$amount,$reward_arr=[]){ - $distributed_users = []; - $distributed_rate = 0; // 已分配的累计比例 - $last_commissioned_level = 0; // 上一次成功分佣的用户角色等级（role_id） - - //$reward_arr = [0,0.02,0.04,0.06,0.08,0.1]; // 索引为角色等级（role_id），值为对应比例 - $max_level = count($reward_arr) - 1; // 可用的最高等级 - - while (count($distributed_users) < 10) { - $parent_id = get_parent_id($current_user_id); - if (!$parent_id) { - // cp(sprintf("用户ID:%s\t级别:%s\t父级:%s\t%s\t%s\n\n", - // $parent_id.'', - // '-', - // '-', - // "最终用户 ", - // "" - // )); - break; - } - $parent_role_id = (int)\app\model\User::where('id', $parent_id)->value('role_id'); - //cp($parent_id."\t".$parent_role_id."\t".$last_commissioned_level); - if ($parent_role_id > 5) { - // cp(sprintf("用户ID:%s\t级别:%s\t父级:%s\t%s\t%s\n\n", - // $parent_id, - // $parent_role_id, - // '-', - // "用户级别异常", - // "" - // )); - break; - } - - // 仅当上级角色等级高于上一次成功分佣的等级时才考虑分配 - if ($parent_role_id > $last_commissioned_level) { - $idx = $parent_role_id; - if ($idx > $max_level) { // 超出定义范围则使用最高档 - $idx = $max_level; - } - $current_rate = $reward_arr[$idx]; - $available_rate = bcsub($current_rate, $distributed_rate, 4); - - if (bccomp($available_rate, 0, 6) === 1) { // available_rate > 0 - $commission = bcmul($available_rate, $amount, 4); - $distributed_rate += $available_rate; - $last_commissioned_level = $parent_role_id; - $distributed_users[] = [ - 'user_id' => $parent_id, - 'role_id' => $parent_role_id, - 'rate' => $available_rate, - 'amount' => $commission - ]; - } else { - // 可分配比例<=0，停止继续查找 - // cp(sprintf("用户ID:%s\t级别:%s\t父级:%s\t%s\t%s\n\n", - // $parent_id, - // $parent_role_id, - // '-', - // "可分配比例不足，结束", - // "已分配比例:".$distributed_rate - // )); - break; - } - } else { - // cp(sprintf("用户ID:%s\t级别:%s\t父级:%s\t%s\t%s\n\n", - // $parent_id, - // $parent_role_id, - // '-', - // "用户等级不够高", - // "最后分佣等级:".$last_commissioned_level - // )); - } - $current_user_id = $parent_id; - } - return $distributed_users; - } -} if(!function_exists('generateShortUniqueID')){ function generateShortUniqueID($length = 8) { // 生成指定长度的随机字节，转为 Base64 编码并去除不必要字符 @@ -836,14 +727,15 @@ if(!function_exists('get_user_rights')){ // 'max_group_join_count' => 999999999999, // 'max_gourp_create_count' => 999999999999 // ]; + $user_id = idDecode($user_id); $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()); + // 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) diff --git a/app/model/Album.php b/app/model/Album.php new file mode 100755 index 0000000..5fe9be6 --- /dev/null +++ b/app/model/Album.php @@ -0,0 +1,52 @@ + [ + 'status' => 1, + ], + ]); + } + public static function onAfterInsert($row){ + $changeData = $row->getChangedData(); + if(isset($changeData['url'])) { + Files::where('path',$changeData['url'])->inc('use_count'); + }; + } + + public static function onAfterUpdate($row){ + $OrgData = $row->getOrigin(); + $changeData = $row->getChangedData(); + if(isset($OrgData['url']) && $OrgData['url']) { + \support\Log::info('OrgData string'); + Files::where('path',$OrgData['url'])->dec('use_count'); + }; + if(isset($changeData['url']) && $changeData['url']) { + \support\Log::info('changeData string'); + Files::where('path',$changeData['url'])->inc('use_count'); + }; + } + + public static function onAfterDelete($row){ + Files::where('path',$row->url)->dec('use_count'); + } + +} + diff --git a/app/model/BalanceLog.php b/app/model/BalanceLog.php index 734c98b..3b02c77 100755 --- a/app/model/BalanceLog.php +++ b/app/model/BalanceLog.php @@ -37,7 +37,7 @@ class BalanceLog extends Base { $model = new static(); if(isset($data['currency'])){ - if(in_array($data['currency'],Config('site.allow_balance_log'))){ + if(in_array($data['currency'],Config('site.allow_currency_logs'))){ $data['status']=isset($data['status']) ? $data['status']:1; $data['user_id'] = intval($data['user_id']); $data['amount'] = floatval($data['amount']); @@ -56,8 +56,8 @@ class BalanceLog extends Base public static function createAllIndexes(): array { $results = []; - $allow_balance_log = Config('site.allow_balance_log'); - foreach ($allow_balance_log as $currency) { + $allow_currency_logs = Config('site.allow_currency_logs'); + foreach ($allow_currency_logs as $currency) { $results[$currency] = self::createTableIndexes($currency); } return $results; @@ -115,8 +115,8 @@ class BalanceLog extends Base public static function archiveData(int $days = 3): array { $results = []; - $allow_balance_log = Config('site.allow_balance_log'); - foreach ($allow_balance_log as $currency) { + $allow_currency_logs = Config('site.allow_currency_logs'); + foreach ($allow_currency_logs as $currency) { $results[$currency] = self::archiveCurrencyData($currency, $days); } return $results; @@ -175,17 +175,7 @@ class BalanceLog extends Base ->order('created_at', 'desc'); if ($type) { - if($type == '99999'){ - $query->whereIn('type', [ - \app\enum\BalanceType::OUTPUT_REWARD->value, - \app\enum\BalanceType::WITHDRAW_REWARD->value, - \app\enum\BalanceType::PRODUCT_INCOME->value, - \app\enum\BalanceType::AGENT_COMMISSION->value, - \app\enum\BalanceType::DIFFERENTIAL_COMMISSION->value - ]); - }else{ - $query->where('type', intval($type)); - } + $query->whereIn('type', $type); } if ($startTime) { diff --git a/app/model/FriendCircle.php b/app/model/FriendCircle.php index 650c3a9..0aa531e 100755 --- a/app/model/FriendCircle.php +++ b/app/model/FriendCircle.php @@ -57,6 +57,12 @@ class FriendCircle extends Base } }; } + + public static function onAfterDelete($row){ + FriendCircleLike::whereIn('circle_id',$row->id)->delete(); + FriendCircleComment::whereIn('circle_id',$row->id)->delete(); + } + /** * 关联用户 */ diff --git a/app/model/User.php b/app/model/User.php index 7fe6726..7689e67 100755 --- a/app/model/User.php +++ b/app/model/User.php @@ -75,9 +75,9 @@ use support\think\Db; */ class User extends Base { - use \think\model\concern\SoftDelete; + //use \think\model\concern\SoftDelete; public static function onAfterInsert($row){ - $res = request()->IM->user->userRegister($row->id,$row->nickname,cdnurl($row->avatar)); + $res = request()->IM->user->userRegister(idEncode($row->id),$row->nickname,cdnurl($row->avatar)); } public static function onAfterUpdate($row){ $changeData = $row->getChangedData(); @@ -87,25 +87,24 @@ class User extends Base 'nickname' => $row->nickname, 'faceURL' => cdnurl($row->avatar) ]; - request()->IM->user->updateUserInfo($row->id,$sdata); + request()->IM->user->updateUserInfo(idEncode($row->id),$sdata); } if(isset($changeData['status']) || $changeData['status'] == '0'){ - request()->IM->user->forceLogout($row->id); + request()->IM->user->forceLogout(idEncode($row->id)); } } public static function onAfterDelete($row) { Db::name('address')->where('user_id',$row->id)->delete(); Db::name('recharge')->where('user_id',$row->id)->delete(); - Db::name('record')->where('user_id',$row->id)->delete(); + //Db::name('record')->where('user_id',$row->id)->delete(); Db::name('withdrawl')->where('user_id',$row->id)->delete(); Db::name('user_extend')->where('user_id',$row->id)->delete(); Db::name('user_team')->where('descendant_id|ancestor_id','=',$row->id)->delete(); - Db::name('withdrawl')->where('user_id',$row->id)->delete(); foreach(Config('site.allow_currencys') as $currency){ (new \app\model\BalanceLog)->setSuffix('_'.$currency)->where('user_id',(int)$row->id)->delete(); } - request()->IM->user->forceLogout($row->id); + request()->IM->user->forceLogout(idEncode($row->id)); } public function role() { diff --git a/config/areacode.php b/config/areacode.php new file mode 100644 index 0000000..be988b3 --- /dev/null +++ b/config/areacode.php @@ -0,0 +1,121 @@ + "中国", "value" => "86"], + ["label" => "马来西亚", "value" => "60"], + ["label" => "印度尼西亚", "value" => "62"], + ["label" => "菲律宾", "value" => "63"], + ["label" => "新加坡", "value" => "65"], + ["label" => "泰国", "value" => "66"], + ["label" => "文莱", "value" => "673"], + ["label" => "日本", "value" => "81"], + ["label" => "韩国", "value" => "82"], + ["label" => "越南", "value" => "84"], + ["label" => "朝鲜", "value" => "850"], + ["label" => "香港(中国)", "value" => "852"], + ["label" => "澳门(中国)", "value" => "853"], + ["label" => "柬埔寨", "value" => "855"], + ["label" => "老挝", "value" => "856"], + ["label" => "台湾(中国)", "value" => "886"], + ["label" => "孟加拉国", "value" => "880"], + ["label" => "土耳其", "value" => "90"], + ["label" => "印度", "value" => "91"], + ["label" => "巴基斯坦", "value" => "92"], + ["label" => "阿富汗", "value" => "93"], + ["label" => "斯里兰卡", "value" => "94"], + ["label" => "缅甸", "value" => "95"], + ["label" => "马尔代夫", "value" => "960"], + ["label" => "黎巴嫩", "value" => "961"], + ["label" => "约旦", "value" => "962"], + ["label" => "叙利亚", "value" => "963"], + ["label" => "伊拉克", "value" => "964"], + ["label" => "科威特", "value" => "965"], + ["label" => "沙特阿拉伯", "value" => "966"], + ["label" => "阿曼", "value" => "968"], + ["label" => "以色列", "value" => "972"], + ["label" => "巴林", "value" => "973"], + ["label" => "卡塔尔", "value" => "974"], + ["label" => "不丹", "value" => "975"], + ["label" => "蒙古", "value" => "976"], + ["label" => "尼泊尔", "value" => "977"], + ["label" => "伊朗", "value" => "98"], + ["label" => "塞浦路斯", "value" => "357"], + ["label" => "巴勒斯坦", "value" => "970"], + ["label" => "阿联酋", "value" => "971"], + ["label" => "俄罗斯联邦", "value" => "7"], + ["label" => "希腊", "value" => "30"], + ["label" => "荷兰", "value" => "31"], + ["label" => "比利时", "value" => "32"], + ["label" => "法国", "value" => "33"], + ["label" => "西班牙", "value" => "34"], + ["label" => "直布罗陀", "value" => "350"], + ["label" => "葡萄牙", "value" => "351"], + ["label" => "卢森堡", "value" => "352"], + ["label" => "爱尔兰", "value" => "353"], + ["label" => "冰岛", "value" => "354"], + ["label" => "阿尔巴尼亚", "value" => "355"], + ["label" => "马耳他", "value" => "356"], + ["label" => "安道尔", "value" => "376"], + ["label" => "芬兰", "value" => "358"], + ["label" => "保加利亚", "value" => "359"], + ["label" => "匈牙利", "value" => "36"], + ["label" => "德国", "value" => "49"], + ["label" => "南斯拉夫", "value" => "381"], + ["label" => "意大利", "value" => "39"], + ["label" => "圣马力诺", "value" => "378"], + ["label" => "梵蒂冈", "value" => "3906698"], + ["label" => "罗马尼亚", "value" => "40"], + ["label" => "瑞士", "value" => "41"], + ["label" => "列支敦士登", "value" => "423"], + ["label" => "奥地利", "value" => "43"], + ["label" => "英国", "value" => "44"], + ["label" => "丹麦", "value" => "45"], + ["label" => "瑞典", "value" => "46"], + ["label" => "挪威", "value" => "47"], + ["label" => "波兰", "value" => "48"], + ["label" => "捷克", "value" => "420"], + ["label" => "斯洛伐克", "value" => "421"], + ["label" => "摩纳哥", "value" => "377"], + ["label" => "马其顿", "value" => "389"], + ["label" => "科罗地亚", "value" => "385"], + ["label" => "斯洛文尼亚", "value" => "386"], + ["label" => "波斯尼亚和塞哥维那", "value" => "387"], + ["label" => "亚美尼亚共和国", "value" => "374"], + ["label" => "白俄罗斯共和国", "value" => "375"], + ["label" => "格鲁吉亚共和国", "value" => "995"], + ["label" => "哈萨克斯坦共和国", "value" => "7"], + ["label" => "吉尔吉斯坦共和国", "value" => "996"], + ["label" => "乌兹别克斯坦共和国", "value" => "998"], + ["label" => "塔吉克斯坦共和国", "value" => "992"], + ["label" => "土库曼斯坦共和国", "value" => "993"], + ["label" => "乌克兰", "value" => "380"], + ["label" => "立陶宛", "value" => "370"], + ["label" => "拉脱维亚", "value" => "371"], + ["label" => "爱沙尼亚", "value" => "372"], + ["label" => "摩尔多瓦", "value" => "373"], + ["label" => "埃及", "value" => "20"], + ["label" => "摩洛哥", "value" => "212"], + ["label" => "阿尔及利亚", "value" => "213"], + ["label" => "突尼斯", "value" => "216"], + ["label" => "利比亚", "value" => "218"], + ["label" => "冈比亚", "value" => "220"], + ["label" => "塞内加尔", "value" => "221"], + ["label" => "毛里塔尼亚", "value" => "222"], + ["label" => "马里", "value" => "223"], + ["label" => "几内亚", "value" => "224"], + ["label" => "科特迪瓦", "value" => "225"], + ["label" => "布基拉法索", "value" => "226"], + ["label" => "尼日尔", "value" => "227"], + ["label" => "多哥", "value" => "228"], + ["label" => "贝宁", "value" => "229"], + ["label" => "毛里求斯", "value" => "230"], + ["label" => "利比里亚", "value" => "231"], + ["label" => "塞拉利昂", "value" => "232"], + ["label" => "加纳", "value" => "233"], + ["label" => "尼日利亚", "value" => "234"], + ["label" => "乍得", "value" => "235"], + ["label" => "中非", "value" => "236"], + ["label" => "喀麦隆", "value" => "237"], + ["label" => "佛得角", "value" => "238"], + ["label" => "圣多美", "value" => "239"], + ["label" => "普林西比", "value" => "239"], +]; diff --git a/config/plugin/isszz/webman-hashids/app.php b/config/plugin/isszz/webman-hashids/app.php index 27f4f4b..1479cf7 100755 --- a/config/plugin/isszz/webman-hashids/app.php +++ b/config/plugin/isszz/webman-hashids/app.php @@ -4,18 +4,18 @@ return [ 'enable' => true, // 默认连接名称 - 'default' => 'main', // 支持bilibili的BV模式 + 'default' => 'other', // 支持bilibili的BV模式 // Hashids modes 'modes' => [ 'main' => [ - 'salt' => '', - 'length' => 0, + 'salt' => 'n1e5a6s6m7', + 'length' => 10, ], 'other' => [ - 'salt' => 'salt', - 'length' => 0, - 'alphabet' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890' + 'salt' => 'n1e5a6s6m7', + 'length' => 10, + 'alphabet' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890' ], 'bilibili' => [ // 此模式无需添加其他的配置 diff --git a/config/server.php b/config/server.php index b07f284..ff92d3d 100755 --- a/config/server.php +++ b/config/server.php @@ -17,7 +17,7 @@ return [ 'transport' => 'tcp', 'context' => [], 'name' => 'webman', - 'count' => \support\Env::get('app.debug',false) ? 2 : cpu_count() * 4, + 'count' => cpu_count() * 4, //'count' => 4, 'user' => '', 'group' => '', diff --git a/plugin/admin/app/controller/ConversationController.php b/plugin/admin/app/controller/ConversationController.php new file mode 100755 index 0000000..e3bc6ab --- /dev/null +++ b/plugin/admin/app/controller/ConversationController.php @@ -0,0 +1,38 @@ +IM->conversation->getSortedConversationList(); + return json([ + 'code' => 0, + 'msg' => 'success', + 'data' => $list + ]); + } + +} diff --git a/plugin/admin/app/controller/FriendController.php b/plugin/admin/app/controller/FriendController.php new file mode 100755 index 0000000..e856c7c --- /dev/null +++ b/plugin/admin/app/controller/FriendController.php @@ -0,0 +1,38 @@ +model = new \app\model\UserXuanchuan(); + $statusList = $this->model->getStatusList(); + $this->assign("statusList", $statusList); + $this->assignconfig("statusList", $statusList); + $typeList = $this->model->getTypeList(); + $this->assign("typeList", $typeList); + $this->assignconfig("typeList", $typeList); + } + +} diff --git a/plugin/admin/app/controller/GroupController.php b/plugin/admin/app/controller/GroupController.php new file mode 100755 index 0000000..a89bb89 --- /dev/null +++ b/plugin/admin/app/controller/GroupController.php @@ -0,0 +1,38 @@ +model = new \app\model\UserXuanchuan(); + $statusList = $this->model->getStatusList(); + $this->assign("statusList", $statusList); + $this->assignconfig("statusList", $statusList); + $typeList = $this->model->getTypeList(); + $this->assign("typeList", $typeList); + $this->assignconfig("typeList", $typeList); + } + +} diff --git a/plugin/admin/app/controller/MessageController.php b/plugin/admin/app/controller/MessageController.php new file mode 100755 index 0000000..9324928 --- /dev/null +++ b/plugin/admin/app/controller/MessageController.php @@ -0,0 +1,38 @@ +model = new \app\model\UserXuanchuan(); + $statusList = $this->model->getStatusList(); + $this->assign("statusList", $statusList); + $this->assignconfig("statusList", $statusList); + $typeList = $this->model->getTypeList(); + $this->assign("typeList", $typeList); + $this->assignconfig("typeList", $typeList); + } + +} diff --git a/plugin/admin/app/controller/UserController.php b/plugin/admin/app/controller/UserController.php index 781d14d..0ad0291 100755 --- a/plugin/admin/app/controller/UserController.php +++ b/plugin/admin/app/controller/UserController.php @@ -38,6 +38,9 @@ class UserController extends Crud $this->assignconfig('groupList',$groupList); $this->assign('roleList',$roleList); $this->assignconfig('roleList',$roleList); + $areaList = Config('areacode'); + $this->assign('areaList',$areaList); + $this->assignconfig('areaList',$areaList); } public function team(Request $request): Response { diff --git a/plugin/admin/app/view/balance_log/index.html b/plugin/admin/app/view/balance_log/index.html index d82f70e..7b04578 100755 --- a/plugin/admin/app/view/balance_log/index.html +++ b/plugin/admin/app/view/balance_log/index.html @@ -2,7 +2,7 @@
diff --git a/plugin/admin/app/view/user/update.html b/plugin/admin/app/view/user/update.html index 5dd03d2..09b7813 100755 --- a/plugin/admin/app/view/user/update.html +++ b/plugin/admin/app/view/user/update.html @@ -47,9 +47,18 @@
-->
- +
- +
+
+ +
+ +
@@ -86,7 +95,7 @@
- +
-
- + @@ -125,7 +134,7 @@ data-date-debug="true" data-date-sideBySide="true" data-date-collapse="false" - data-date-format="YYYY-MM-DD HH:mm:ss" + data-date-format="YYYY-MM-DD" autocomplete="off" class="form-control datetimepicker">
diff --git a/plugin/admin/public/js/user.js b/plugin/admin/public/js/user.js index c3d710d..c4f4c5a 100755 --- a/plugin/admin/public/js/user.js +++ b/plugin/admin/public/js/user.js @@ -129,10 +129,7 @@ define(['table', 'upload','form','qrcode'], function (Table,Upload,Form) { Table.api.bindevent(table); }, update:function(){ - Config['upload_url'] = '/files/avatar'; - var form = $('form'); - Form.api.bindevent(form) - this.getRole(); + this.insert(); $('#qrcode div').qrcode({ width: 128,height: 128, @@ -144,6 +141,9 @@ define(['table', 'upload','form','qrcode'], function (Table,Upload,Form) { var form = $('form'); Form.api.bindevent(form) this.getRole(); + $('[name=mobile]').on('change',function(){ + $('[name=username]').val($(this).val()); + }); }, getRole:function(){ Fast.api.ajax({ diff --git a/public/index.html b/public/index.html index fedf158..54acaa0 100755 --- a/public/index.html +++ b/public/index.html @@ -528,11 +528,14 @@ const onClickDownload = () => { const $nav = navigator.userAgent.toLowerCase(); if($nav.match(/iphone/i) == "iphone"){ - alert('暂未开放'); + //alert('暂未开放'); //window.location.href = 'https://shunliao.oss-accelerate.aliyuncs.com'; + //window.location.href = 'https://static.shun777.com/app/shunliao.ipa'; + window.location.href = 'https://h5.shun777.com'; }else{ //window.location.href = 'https://shunliao.oss-accelerate.aliyuncs.com/apk/install.apk'; - window.location.href = '/shunliao.apk'; + window.location.href = 'https://static.shun777.com/app/shunliao_v3.apk'; + //window.location.href = '/shunliao.apk?v=2'; } } diff --git a/public/shunliao.apk1 b/public/shunliao.apk1 new file mode 100644 index 0000000..9242294 Binary files /dev/null and b/public/shunliao.apk1 differ diff --git a/public/static/avatar/0.png b/public/static/avatar/0.png new file mode 100644 index 0000000..701df83 Binary files /dev/null and b/public/static/avatar/0.png differ diff --git a/public/static/avatar/1.png b/public/static/avatar/1.png new file mode 100644 index 0000000..056b5a4 Binary files /dev/null and b/public/static/avatar/1.png differ diff --git a/public/static/avatar/10.png b/public/static/avatar/10.png new file mode 100644 index 0000000..91e453e Binary files /dev/null and b/public/static/avatar/10.png differ diff --git a/public/static/avatar/11.png b/public/static/avatar/11.png new file mode 100644 index 0000000..9c8bba9 Binary files /dev/null and b/public/static/avatar/11.png differ diff --git a/public/static/avatar/12.png b/public/static/avatar/12.png new file mode 100644 index 0000000..da89905 Binary files /dev/null and b/public/static/avatar/12.png differ diff --git a/public/static/avatar/13.png b/public/static/avatar/13.png new file mode 100644 index 0000000..bba77ca Binary files /dev/null and b/public/static/avatar/13.png differ diff --git a/public/static/avatar/14.png b/public/static/avatar/14.png new file mode 100644 index 0000000..55403b1 Binary files /dev/null and b/public/static/avatar/14.png differ diff --git a/public/static/avatar/15.png b/public/static/avatar/15.png new file mode 100644 index 0000000..973e631 Binary files /dev/null and b/public/static/avatar/15.png differ diff --git a/public/static/avatar/16.png b/public/static/avatar/16.png new file mode 100644 index 0000000..52d8ebe Binary files /dev/null and b/public/static/avatar/16.png differ diff --git a/public/static/avatar/17.png b/public/static/avatar/17.png new file mode 100644 index 0000000..58b332e Binary files /dev/null and b/public/static/avatar/17.png differ diff --git a/public/static/avatar/2.png b/public/static/avatar/2.png new file mode 100644 index 0000000..10f2c62 Binary files /dev/null and b/public/static/avatar/2.png differ diff --git a/public/static/avatar/3.png b/public/static/avatar/3.png new file mode 100644 index 0000000..76c4464 Binary files /dev/null and b/public/static/avatar/3.png differ diff --git a/public/static/avatar/4.png b/public/static/avatar/4.png new file mode 100644 index 0000000..8a8b127 Binary files /dev/null and b/public/static/avatar/4.png differ diff --git a/public/static/avatar/5.png b/public/static/avatar/5.png new file mode 100644 index 0000000..e96ef59 Binary files /dev/null and b/public/static/avatar/5.png differ diff --git a/public/static/avatar/6.png b/public/static/avatar/6.png new file mode 100644 index 0000000..001b85d Binary files /dev/null and b/public/static/avatar/6.png differ diff --git a/public/static/avatar/7.png b/public/static/avatar/7.png new file mode 100644 index 0000000..b721d3f Binary files /dev/null and b/public/static/avatar/7.png differ diff --git a/public/static/avatar/8.png b/public/static/avatar/8.png new file mode 100644 index 0000000..5484d8c Binary files /dev/null and b/public/static/avatar/8.png differ diff --git a/public/static/avatar/9.png b/public/static/avatar/9.png new file mode 100644 index 0000000..89f9897 Binary files /dev/null and b/public/static/avatar/9.png differ diff --git a/support/Jwt.php b/support/Jwt.php index d87018e..a23d2c7 100755 --- a/support/Jwt.php +++ b/support/Jwt.php @@ -153,11 +153,12 @@ class Jwt return false; } if($verifyType == 'password'){ - //if ($user->username!='' && !\plugin\admin\app\common\Util::passwordVerify($password,$user->password)) { - if (!\plugin\admin\app\common\Util::passwordVerify($password,$user->password)) { - self::setError('Password is incorrect'); - return false; - } + //if ($user->username!='' && $user->id!='100703') { + if (!\plugin\admin\app\common\Util::passwordVerify($password,$user->password)) { + self::setError('Password is incorrect'); + return false; + } + //} }else{ captcha_verfiy($type,'login',$account); } diff --git a/support/OpenImSdk/Api/Auth.php b/support/OpenImSdk/Api/Auth.php index a79c5fb..6bf3ada 100755 --- a/support/OpenImSdk/Api/Auth.php +++ b/support/OpenImSdk/Api/Auth.php @@ -44,7 +44,7 @@ class Auth * @param string $platformID 平台ID，默认为android * @return array */ - public function forceLogout(string $userID, string $platformID = 'android'): array + public function forceLogout(string $userID, string $platformID = 'android'): array|bool { // 获取管理员token $adminToken = Utils::getAdminToken(); diff --git a/support/OpenImSdk/Api/Conversation.php b/support/OpenImSdk/Api/Conversation.php index 14be9a7..a7f7f89 100755 --- a/support/OpenImSdk/Api/Conversation.php +++ b/support/OpenImSdk/Api/Conversation.php @@ -33,11 +33,18 @@ class Conversation * @param string $userID 用户ID * @return array */ - public function getSortedConversationList(string $userID): array + public function getSortedConversationList(string $userID,$conversationIDs='',int $page=1,int $pagesize=10): array { // 获取管理员token $adminToken = Utils::getAdminToken(); - return Utils::send(Url::$getSortedConversationList, ['userID' => $userID], '获取排序的会话列表失败', $adminToken); + return Utils::send(Url::$getSortedConversationList, [ + 'userID' => $userID, + 'conversationIDs' => $conversationIDs, + 'pagination' => [ + 'pageNumber' => $page, + 'showNumber' => $pagesize + ] + ], '获取排序的会话列表失败', $adminToken); } /** diff --git a/support/OpenImSdk/Api/Group.php b/support/OpenImSdk/Api/Group.php index aa065e5..33b12ff 100755 --- a/support/OpenImSdk/Api/Group.php +++ b/support/OpenImSdk/Api/Group.php @@ -7,6 +7,9 @@ use support\OpenImSdk\Core\Utils; class Group { + function setGroupInfo($data=[]){ + return Utils::send('/group/set_group_info_ex', $data); + } /** * 创建群组 * @param string $ownerUserID 群主ID @@ -94,22 +97,23 @@ class Group /** * 获取群成员列表 * @param string $groupID 群组ID - * @param int $filter 过滤类型，0所有，1群主，2管理员，3普通成员，4禁言，5进入黑名单 + * @param string $filter 过滤类型，0所有，1群主，2管理员，3普通成员，4禁言，5进入黑名单 * @param int $offset 偏移量 * @param int $count 数量 * @return array */ - public function getGroupMemberList(string $groupID, int $filter = 0, int $offset = 0, int $count = 100): array + public function getGroupMemberList(string $groupID='', string $keyword = '', int $page = 1, int $pagesize = 100): array { // 获取管理员token - $adminToken = Utils::getAdminToken(); $data = [ 'groupID' => $groupID, - 'filter' => $filter, - 'offset' => $offset, - 'count' => $count + 'keyword' => $keyword, + 'pagination' => [ + 'pageNumber' => $page, + 'showNumber' => $pagesize + ] ]; - return Utils::send(Url::$getGroupMemberList, $data, '获取群成员列表失败', $adminToken); + return Utils::send(Url::$getGroupMemberList, $data, '获取群成员列表失败'); } /** diff --git a/support/OpenImSdk/Api/Message.php b/support/OpenImSdk/Api/Message.php index 7c87cbb..3a89ccc 100755 --- a/support/OpenImSdk/Api/Message.php +++ b/support/OpenImSdk/Api/Message.php @@ -6,7 +6,48 @@ use support\OpenImSdk\Core\Url; use support\OpenImSdk\Core\Utils; class Message -{ +{ + public function sendSingleMessage(string $sendID, string $recvID = '', array $data=[]): array + { + $data['recvID'] = $recvID; + $data['groupID'] = ''; + $data['sessionType'] = 2; + return $this->sendMessage($sendID,$data); + } + public function sendGroupMessage(string $sendID, string $groupID = '', array $data=[]): array + { + $data['recvID'] = ''; + $data['groupID'] = $groupID; + $data['sessionType'] = 3; + return $this->sendMessage($sendID,$data); + } + public function sendMessage(string $sendID, array $data=[]): array + { + $user = \think\facade\Db::name('user')->where('id',$sendID)->field('avatar,nickname')->find(); + $data = array_merge([ + "sendID" => $sendID, + "senderNickname" => $user['nickname'], + "senderFaceURL" => $user['avatar'], + "senderPlatformID" => 5, + "content"=> [ + "content" => "hello!!" + ], + "contentType" => 1, + "sessionType" => 4, + "isOnlineOnly" => false, + "notOfflinePush"=> true, + "sendTime" => time()*1000, + "offlinePushInfo"=> [ + "title" => "您收到一条新的消息", + "desc" => "", + "ex" => "", + "iOSPushSound"=> "default", + "iOSBadgeCount"=> true + ], + "ex"=> "" + ],$data); + return Utils::send(Url::$sendMsg, $data); + } /** * 发送消息 * @param string $sendID 发送者ID @@ -156,16 +197,21 @@ class Message */ public function sendBusinessNotification(string $sendID, string $recvID, array $data,string $type='user'): array { + $key = isset($data['key']) ? $data['key'] : md5(time()); + $sendMsg = isset($data['sendMsg']) ? $data['sendMsg'] : true; + unset($data['key']); + unset($data['sendMsg']); // 获取管理员token $data = [ - 'sendUserID' => $sendID, - 'recvUserID' => $type=='user' ? $recvID : '', - 'recvGroupID' => $type=='user' ? '': $recvID, - 'key' => md5(time()), - 'data' => json_encode($data), - 'sendMsg' => true, + 'sendUserID' => $sendID, + 'recvUserID' => $type=='user' ? $recvID : '', + 'recvGroupID' => $type=='user' ? '': $recvID, + 'key' => $key, + 'data' => json_encode($data), + 'sendMsg' => $sendMsg, 'reliabilityLevel' => 1, ]; + //log_alert($data); return Utils::send(Url::$sendBusinessNotification, $data, '发送业务通知失败'); } diff --git a/support/OpenImSdk/Api/User.php b/support/OpenImSdk/Api/User.php index ae8c3d7..319f8c7 100755 --- a/support/OpenImSdk/Api/User.php +++ b/support/OpenImSdk/Api/User.php @@ -134,13 +134,13 @@ class User * @param string $ex 扩展字段 * @return array */ - public function addNotificationAccount(string $userID, string $nickname = '', string $faceURL = '', int $appMangerLevel = 3): array + public function addNotificationAccount(string $userID, string $nickname = '', string $faceURL = '', \support\OpenImSdk\Enum\appMangerLevel $appMangerLevel = \support\OpenImSdk\Enum\appMangerLevel::Notify): array { $data = [ 'userID' => $userID, 'nickname' => $nickname, 'faceURL' => $faceURL, - 'appMangerLevel' => $appMangerLevel, + 'appMangerLevel' => $appMangerLevel->value, ]; return Utils::send(Url::$addNotificationAccount, $data, '添加通知账号错误'); } diff --git a/support/OpenImSdk/Core/Utils.php b/support/OpenImSdk/Core/Utils.php index bef1848..b2e69d1 100755 --- a/support/OpenImSdk/Core/Utils.php +++ b/support/OpenImSdk/Core/Utils.php @@ -81,15 +81,17 @@ class Utils * @param string $token 认证令牌 * @return array 响应数据 */ - public static function send(string $path, array $data, string $errMsg, string $token = ''): array|bool + public static function send(string $path, array $data, string $errMsg='', string $token = ''): array|bool { - $token = $token ? $token : Utils::getAdminToken(); + if($path != Url::$getAdminToken){ + $token = $token ? $token : Utils::getAdminToken(); + } $url = Url::buildUrl($path); - //cp($url); + log_alert($url); + //log_alert($data); $res = self::request($url, $data, $token); - //cp($data); - //cp($res); + //log_alert($res); $res = json_decode($res, true); if($res['errCode'] !==0 ){ throw new \Exception($res['errMsg'],$res['errCode']); diff --git a/support/OpenImSdk/Enum/BaseEnum.php b/support/OpenImSdk/Enum/BaseEnum.php new file mode 100755 index 0000000..0973347 --- /dev/null +++ b/support/OpenImSdk/Enum/BaseEnum.php @@ -0,0 +1,24 @@ +value]; + } + + /** + * 安全地从值创建枚举实例 + */ + public static function tryFromValue(int $value): ?self + { + return self::tryFrom($value); + } +} \ No newline at end of file diff --git a/support/OpenImSdk/Enum/appMangerLevel.php b/support/OpenImSdk/Enum/appMangerLevel.php new file mode 100755 index 0000000..966c524 --- /dev/null +++ b/support/OpenImSdk/Enum/appMangerLevel.php @@ -0,0 +1,21 @@ +value => __('系统通知号'), + self::Bot->value => __('机器人账号'), + ]; + } + +}; \ No newline at end of file diff --git a/support/Random.php b/support/Random.php index 7758faa..aab66f4 100755 --- a/support/Random.php +++ b/support/Random.php @@ -86,6 +86,8 @@ class Random case 'encrypt': case 'sha1': return sha1(uniqid(mt_rand(), true)); + default: + return substr(str_shuffle(str_repeat($type, ceil($len / strlen($type)))), 0, $len); } }