Merge branch 'feature/v1.0.0'

* feature/v1.0.0: (25 commits)
  优化代码
  添加登录通知
  优化代码
  优化代码
  优化代码
  优化代码
  优化代码
  优化代码
  优化代码
  优化代码
  完善投票功能
  添加投票消息
  添加投票消息
  优化代码
  优化代码，添加消息通知提示
  优化代码
  优化代码
  优化代码
  优化代码
  优化代码
  ...

# Conflicts:
#	src/mixins/main-mixin.js
#	src/utils/validate.js

.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=http://127.0.0.1:9503
-VUE_APP_WEB_SOCKET_URL=ws://127.0.0.1:9504/socket.io
+VUE_APP_API_BASE_URL=http://im-serve.gzydong.club
+VUE_APP_WEB_SOCKET_URL=ws://im-socket.gzydong.club/socket.io
 VUE_APP_WEBSITE_NAME="Lumen IM"

README.md

@@ -8,7 +8,7 @@ Lumen IM 是一个网页版在线即时聊天项目，前端使用 Element-ui +
 ### 功能模块
 - 基于 Swoole WebSocket 服务做消息即时推送
 - 支持私聊及群聊
-- 支持多种聊天消息类型 例如:文本、代码块、图片及其它类型文件，并支持文件下载
+- 支持多种聊天消息类型 例如:文本消息、代码块、群投票、图片及其它类型文件，并支持文件下载
 - 支持聊天消息撤回、删除(批量删除)、转发消息(逐条转发、合并转发)
 - 支持编写个人笔记、支持笔记分享(好友或群)
 
@@ -79,10 +79,11 @@ server {
 |代码仓库|前端源码|后端源码|
 |-|-|-|
 |Github|https://github.com/gzydong/LumenIM|https://github.com/gzydong/hyperf-chat|
-|码云|https://gitee.com/gzydong/LumenIM||
+|码云|https://gitee.com/gzydong/LumenIM|https://gitee.com/gzydong/hyperf-chat|
 
 
-#### 联系方式  
-QQ : 837215079
+#### 联系方式
+QQ作者 : 837215079
+QQ技术交流群 : 513037553
 
 ### 如果你觉得还不错，请 Star , Fork 给作者鼓励一下。

src/api/article.js

@@ -2,114 +2,127 @@ import { post, get, upload } from '@/utils/request'
 import { getToken } from '@/utils/auth'
 import config from '@/config/config'
 
+// -------- 笔记相关 --------
+
 // 查询用户文集分类服务接口
-export const ServeGetArticleClass = data => {
-  return get('/api/v1/article/article-class', data)
+export const ServeGetArticleList = data => {
+  return get('/api/v1/article/search', data)
 }
 
-// 获取笔记表标签服务接口
-export const ServeGetArticleTag = data => {
-  return get('/api/v1/article/article-tags', data)
+// 编辑笔记服务接口
+export const ServeEditArticle = data => {
+  return post('/api/v1/article/editor', data)
 }
 
-// 查询用户文集分类服务接口
-export const ServeGetArticleList = data => {
-  return get('/api/v1/article/article-list', data)
+// 删除笔记服务接口
+export const ServeDeleteArticle = data => {
+  return post('/api/v1/article/delete', data)
+}
+
+// 永久删除笔记回收站的笔记
+export const ServeForeverDeleteArticle = data => {
+  return post('/api/v1/article/forever-delete', data)
+}
+
+// 恢复笔记服务接口
+export const ServeRecoverArticle = data => {
+  return post('/api/v1/article/recover', data)
+}
+
+// 设置标记星号笔记服务接口
+export const ServeSetAsteriskArticle = data => {
+  return post('/api/v1/article/asterisk', data)
 }
 
 // 查询用户文集分类服务接口
 export const ServeGetArticleDetail = data => {
-  return get('/api/v1/article/article-detail', data)
+  return get('/api/v1/article/detail', data)
 }
 
-// 添加或编辑文集分类服务接口
-export const ServeEditArticleClass = data => {
-  return post('/api/v1/article/edit-article-class', data)
+// 移动笔记服务接口
+export const ServeMoveArticle = data => {
+  return post('/api/v1/article/move', data)
 }
 
-// 添加或编辑笔记标签服务接口
-export const ServeEditArticleTag = data => {
-  return post('/api/v1/article/edit-article-tag', data)
+// 笔记图片上传服务接口
+export const ServeUploadArticleImg = data => {
+  return upload('/api/v1/article/upload-image', data)
 }
 
-// 删除笔记分类服务接口
-export const ServeDeleteArticleClass = data => {
-  return post('/api/v1/article/del-article-class', data)
+// 更新笔记标签服务接口
+export const ServeUpdateArticleTag = data => {
+  return post('/api/v1/article/update-tag', data)
 }
 
-// 删除笔记标签服务接口
-export const ServeDeleteArticleTag = data => {
-  return post('/api/v1/article/del-article-tag', data)
+// -------- 笔记分类相关 --------
+
+// 查询用户文集分类服务接口
+export const ServeGetArticleClass = data => {
+  return get('/api/v1/article/classifys', data)
+}
+
+// 添加或编辑文集分类服务接口
+export const ServeEditArticleClass = data => {
+  return post('/api/v1/article/classify/editor', data)
+}
+
+// 删除笔记分类服务接口
+export const ServeDeleteArticleClass = data => {
+  return post('/api/v1/article/classify/delete', data)
 }
 
 // 笔记分类排序服务接口
 export const ServeArticleClassSort = data => {
-  return post('/api/v1/article/article-class-sort', data)
+  return post('/api/v1/article/classify/sort', data)
 }
 
 // 合并笔记分类服务接口
 export const ServeMergeArticleClass = data => {
-  return post('/api/v1/article/merge-article-class', data)
-}
-
-// 移动笔记服务接口
-export const ServeMoveArticle = data => {
-  return post('/api/v1/article/move-article', data)
+  return post('/api/v1/article/classify/merge', data)
 }
 
-// 设置标记星号笔记服务接口
-export const ServeSetAsteriskArticle = data => {
-  return post('/api/v1/article/set-asterisk-article', data)
-}
+// -------- 笔记标签相关 --------
 
-// 编辑笔记服务接口
-export const ServeEditArticle = data => {
-  return post('/api/v1/article/edit-article', data)
+// 获取笔记表标签服务接口
+export const ServeGetArticleTag = data => {
+  return get('/api/v1/article/tags', data)
 }
 
-// 删除笔记服务接口
-export const ServeDeleteArticle = data => {
-  return post('/api/v1/article/delete-article', data)
+// 添加或编辑笔记标签服务接口
+export const ServeEditArticleTag = data => {
+  return post('/api/v1/article/tag/editor', data)
 }
 
-// 恢复笔记服务接口
-export const ServeRecoverArticle = data => {
-  return post('/api/v1/article/recover-article', data)
+// 删除笔记标签服务接口
+export const ServeDeleteArticleTag = data => {
+  return post('/api/v1/article/tag/delete', data)
 }
 
-// 笔记图片上传服务接口
-export const ServeUploadArticleImg = data => {
-  return upload('/api/v1/article/upload-article-image', data)
-}
+// -------- 笔记附件相关 --------
 
 // 笔记附件上传服务接口
 export const ServeUploadArticleAnnex = data => {
-  return upload('/api/v1/article/upload-article-annex', data)
+  return upload('/api/v1/article/annex/upload', data)
 }
 
 // 移除笔记附件服务接口
 export const ServeDeleteArticleAnnex = data => {
-  return post('/api/v1/article/delete-article-annex', data)
-}
-
-// 恢复笔记附件服务接口
-export const ServeRecoverArticleAnnex = data => {
-  return post('/api/v1/article/recover-article-annex', data)
+  return post('/api/v1/article/annex/delete', data)
 }
 
 // 永久删除笔记附件回收站文件
 export const ServeForeverDeleteAnnex = data => {
-  return post('/api/v1/article/forever-delete-annex', data)
+  return post('/api/v1/article/annex/forever-delete', data)
 }
 
-// 永久删除笔记回收站的笔记
-export const ServeForeverDeleteArticle = data => {
-  return post('/api/v1/article/forever-delete-article', data)
+// 恢复笔记附件服务接口
+export const ServeRecoverArticleAnnex = data => {
+  return post('/api/v1/article/annex/recover', data)
 }
 
 // 笔记附件回收站列表服务接口
 export const ServeGetRecoverAnnexList = () => {
-  return get('/api/v1/article/recover-annex-list')
+  return get('/api/v1/article/annex/recover-list')
 }
 
 // 下载笔记附件服务接口
@@ -124,7 +137,3 @@ export const ServeDownloadAnnex = annex_id => {
   }
 }
 
-// 更新笔记标签服务接口
-export const ServeUpdateArticleTag = data => {
-  return post('/api/v1/article/update-article-tag', data)
-}

src/api/chat.js

@@ -30,29 +30,14 @@ export const ServeTalkRecords = data => {
   return get('/api/v1/talk/records', data)
 }
 
-// 撤回消息服务接口
-export const ServeRevokeRecords = data => {
-  return post('/api/v1/talk/revoke-records', data)
-}
-
-// 删除消息服务接口
-export const ServeRemoveRecords = data => {
-  return post('/api/v1/talk/remove-records', data)
-}
-
-// 转发消息服务接口
-export const ServeForwardRecords = data => {
-  return post('/api/v1/talk/forward-records', data)
-}
-
 // 获取转发会话记录详情列表服务接口
 export const ServeGetForwardRecords = data => {
   return get('/api/v1/talk/get-forward-records', data)
 }
 
 // 对话列表置顶服务接口
 export const ServeSetNotDisturb = data => {
-  return post('/api/v1/talk/set-not-disturb', data)
+  return post('/api/v1/talk/disturb', data)
 }
 
 // 查找用户聊天记录服务接口
@@ -71,20 +56,48 @@ export const ServeGetRecordsContext = data => {
 
 // 发送代码块消息服务接口
 export const ServeSendTalkCodeBlock = data => {
-  return post('/api/v1/talk/send-code-block', data)
+  return post('/api/v1/talk/message/code', data)
 }
 
 // 发送聊天文件服务接口
 export const ServeSendTalkFile = data => {
-  return post('/api/v1/talk/send-file', data)
+  return post('/api/v1/talk/message/file', data)
 }
 
 // 发送聊天图片服务接口
 export const ServeSendTalkImage = data => {
-  return upload('/api/v1/talk/send-image', data)
+  return upload('/api/v1/talk/message/image', data)
 }
 
 // 发送表情包服务接口
 export const ServeSendEmoticon = data => {
-  return post('/api/v1/talk/send-emoticon', data)
+  return post('/api/v1/talk/message/emoticon', data)
+}
+
+// 转发消息服务接口
+export const ServeForwardRecords = data => {
+  return post('/api/v1/talk/message/forward', data)
+}
+
+// 撤回消息服务接口
+export const ServeRevokeRecords = data => {
+  return post('/api/v1/talk/message/revoke', data)
+}
+
+// 删除消息服务接口
+export const ServeRemoveRecords = data => {
+  return post('/api/v1/talk/message/delete', data)
+}
+
+// 收藏表情包服务接口
+export const ServeCollectEmoticon = data => {
+  return post('/api/v1/talk/message/collect', data)
+}
+
+export const ServeSendVote = data => {
+  return post('/api/v1/talk/message/vote', data)
+}
+
+export const ServeConfirmVoteHandle = data => {
+  return post('/api/v1/talk/message/vote/handle', data)
 }

src/api/contacts.js

@@ -5,11 +5,6 @@ export const ServeGetContacts = data => {
   return get('/api/v1/contacts/list', data)
 }
 
-// 好友申请服务接口
-export const ServeCreateContact = data => {
-  return post('/api/v1/contacts/add', data)
-}
-
 // 解除好友关系服务接口
 export const ServeDeleteContact = data => {
   return post('/api/v1/contacts/delete', data)
@@ -20,27 +15,31 @@ export const ServeEditContactRemark = data => {
   return post('/api/v1/contacts/edit-remark', data)
 }
 
-// 查询好友申请未读数量服务接口
-export const ServeFindFriendApplyNum = () => {
-  return get('/api/v1/contacts/apply-unread-num')
+// 搜索联系人
+export const ServeSearchContact = data => {
+  return get('/api/v1/contacts/search', data)
+}
+
+// 好友申请服务接口
+export const ServeCreateContact = data => {
+  return post('/api/v1/contacts/apply/create', data)
 }
 
 // 查询好友申请服务接口
 export const ServeGetContactApplyRecords = data => {
-  return get('/api/v1/contacts/apply-records', data)
+  return get('/api/v1/contacts/apply/records', data)
 }
 
 // 处理好友申请服务接口
-export const ServeHandleFriendApply = data => {
-  return post('/api/v1/contacts/accept-invitation', data)
+export const ServeApplyAccept = data => {
+  return post('/api/v1/contacts/apply/accept', data)
 }
 
-// 删除好友申请记录服务接口
-export const ServeDeleteContactApply = data => {
-  return post('/api/v1/contacts/delete-apply', data)
+export const ServeApplyDecline = data => {
+  return post('/api/v1/contacts/apply/decline', data)
 }
 
-// 搜索联系人
-export const ServeSearchContact = data => {
-  return get('/api/v1/contacts/search', data)
+// 查询好友申请未读数量服务接口
+export const ServeFindFriendApplyNum = () => {
+  return get('/api/v1/contacts/apply-unread-num')
 }

src/api/emoticon.js

@@ -2,24 +2,19 @@ import { post, get, upload } from '@/utils/request'
 
 // 查询用户表情包服务接口
 export const ServeFindUserEmoticon = () => {
-  return get('/api/v1/emoticon/user-emoticon')
+  return get('/api/v1/emoticon/list')
 }
 
 // 查询系统表情包服务接口
 export const ServeFindSysEmoticon = () => {
-  return get('/api/v1/emoticon/system-emoticon')
+  return get('/api/v1/emoticon/system')
 }
 
 // 设置用户表情包服务接口
 export const ServeSetUserEmoticon = data => {
   return post('/api/v1/emoticon/set-user-emoticon', data)
 }
 
-// 收藏表情包服务接口
-export const ServeCollectEmoticon = data => {
-  return post('/api/v1/emoticon/collect-emoticon', data)
-}
-
 // 移除收藏表情包服务接口
 export const ServeDelCollectEmoticon = data => {
   return post('/api/v1/emoticon/del-collect-emoticon', data)