Commit 920219f7 authored by 王源's avatar 王源
Browse files

Merge branch 'msg-rpc'

parents 1b164b3d ee443c91

composer.json

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
    "ext-redis": "*",

    "ext-gd": "*",

    "ext-curl": "*",

    "ext-mbstring": "*",

    "hyperf/cache": "~1.1.0",

    "hyperf/framework": "~1.1.0",

    "hyperf/db-connection": "~1.1.0",

src/Handler/MessageHandler.php

+18 −0
Original line number Diff line number Diff line
@@ -113,4 +113,22 @@ class MessageHandler 
        $this->messageService->send($receiverIds, $application, 0, 0, [], $content);

    }



    /**

     * 发送markdown 文本消息

     * @param $receiverIds

     * @param $content

     * @param $title

     * @throws HttpResponseException

     */

    public function sendMarkDownText($receiverIds, $content, $title)

    {

        $application = $this->config->get('app_name');

        if (!$application) {

            throw new HttpResponseException("请设置应用名app_name");

        }

        $receiverIds = is_array($receiverIds) ? $receiverIds : [$receiverIds];

        $sendUserId = Auth::id();

        $this->messageService->SendMarkDownMessage($receiverIds, $application, 0, $sendUserId, [], $content, $title);

    }



}

src/Service/Interfaces/AppServiceInterface.php

+19 −0
Original line number Diff line number Diff line
@@ -18,4 +18,23 @@ interface AppServiceInterface 
     * @return mixed

     */

    public function getAccessApps($user, $isSuperAdmin = false);



    /**

     * 获取单个数据

     * @param int $id

     * @param array $relations 关联关系只有['group']

     * @param array $columns

     * @return mixed

     */

    public function get(int $id, array $relations = [], array $columns = ['id', 'title']);



    /**

     * 通过id列表获取应用数组

     * @param array $idList 默认去重

     * @param array $relations 关联关系只有['group']

     * @param array $columns 默认展示id和title,可传['title', 'name', 'entry', 'prefix', 'group_id', 'is_inside', 'is_active', 'icon', 'desc', 'weight']

     * @return array 默认keyBy('id')

     */

    public function getByIdList(array $idList, array $relations = [], array $columns = ['id', 'title']): array;



}

src/Service/Interfaces/BaseInfoServiceInterface.php

+26 −0
Original line number Diff line number Diff line
@@ -162,4 +162,30 @@ interface BaseInfoServiceInterface 
     */

    public function getReviewUsers($teamId, $authId);



    /**

     * 通过id数组获取部门数组

     * @param array $idList 默认去重

     * @param array $relations 关联关系,默认空 ['users', 'leader']

     * @param array $columns 要显示的字段,默认全部 ['id', 'name', 'pid', 'remark']

     * @return array 默认keyBY('id')

     */

    public function getDepartmentListByIdList(array $idList, array $relations = [], array $columns = ['*']): array;



    /**

     * 获取单个部门数据

     * @param int $id

     * @param array $relations 关联关系,默认空 ['users', 'leader']

     * @param array $columns 要显示的字段,默认全部 ['id', 'name', 'pid', 'remark']

     * @return array|null

     */

    public function getDepartmentById($id, array $relations = [], array $columns = ['*']);



    /**

     * 获取所有部门数据

     * @param array $relations 关联关系,默认空 ['users', 'leader']

     * @param array $columns 要显示的字段,默认全部 ['id', 'name', 'pid', 'remark']

     * @return array 默认已keyBy('id')

     */

    public function departments(array $relations = [], array $columns = ['*']): array;



}

src/Service/Interfaces/MessageServiceInterface.php

+27 −0
Original line number Diff line number Diff line
@@ -22,4 +22,31 @@ interface MessageServiceInterface 
     * @return bool

     */

    public function send(array $receiveUserId, $application, $templateId = 0, $sendUserId = 0, $replace = [], $content = ''): bool;





    /**

     * description:发送邮件

     * author: fuyunnan

     * @param array $userList ['111@qq.com','222@qq.com']

     * @param string $subject 邮件标题

     * @param string $body 邮件内容

     * @return bool

     * @throws

     * Date: 2020/9/10

     */

    public function sendMail($userList, $subject, $body): bool;





    /**

     * 发送markdown文本消息

     * @param array $receiveUserId

     * @param $application

     * @param int $templateId

     * @param int $sendUserId

     * @param array $replace

     * @param string $content

     * @param string $title

     * @return bool

     */

    public function SendMarkDownMessage(array $receiveUserId, $application, $templateId = 0, $sendUserId = 0, $replace = [], $content = '',$title = ''): bool;

}