Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

LICENSE

+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

-### 主要技术 
+### 技术栈
+
+- 开发语言：Scala
+- 平台：JVM
+- 前端：LayIM 3.0
+- MVC：Spring Boot
+- 数据库：Redis、MySQL
+- DAO：Mybatis
+- 分页：PageHelper
+- 连接池：Druid
+- WebSocket：Akka Actor、Akka HTTP
+- 邮件：Java Mail
+- API文档：Swagger
+- 构建工具：Gradle
+
+### 项目结构
 
-* Scala
-* Akka
-* Spring Boot
-* Redis
-* Alibaba Druid
-* Java Mail
-* WebSocket
-* Mybatis And PageHelper
-* Swagger
-* LayIM
-
-### 环境 
-
-* Scala 2.13.x
-* JDK 1.8
-* Gradle
-* Mysql
-* Redis 
+```
+LayIM
+├─ .gitattributes                                         - Git仓库显示语言的配置
+├─ .gitignore                                             - Git忽略文件的配置
+├─ .scalafmt.conf                                         - Scala代码格式化的配置
+├─ README.md
+├─ build.gradle
+├─ deploy.sh                                              - 部署脚本
+├─ settings.gradle
+└─ src
+       ├─ main
+       │    ├─ resources
+       │    │    ├─ application.conf                      - Websocket配置：基于Akka实现
+       │    │    ├─ application.properties                - Springboot程序配置
+       │    │    ├─ data.sql                              - 初始化数据
+       │    │    ├─ favicon.ico
+       │    │    ├─ layim.png
+       │    │    ├─ mapper                                - mybatis mapper文件
+       │    │    └─ schema.sql                            - 初始化表结构
+       │    ├─ scala
+       │    │    └─ io.github.dreamylost                  - 代码实现   
+       │    └─ webapp
+       │           ├─ WEB-INF                             - 聊天记录和背景页
+       │           ├─ index.html                          - 首页  
+       │           └─ static                              - 静态资源文件
+       └─ test
+```
 
-### 使用 
+### 本地调试 
 
 配置Mysql数据库，Redis以及邮件服务器，如果不需要邮件相关服务，可以在UserService.scala中注释掉相关的代码
 
 1. 创建MySQL库 `websocket`
 2. `schema.sql` 和 `data.sql` 初始化表结构和数据，如需要自己mock数据，参考 `RandomData.scala` 构造
-3. 查看 `application.conf` 默认可不修改
+3. 查看 `application.conf` WebSocket配置
 4. 启动 `Application.scala`
 5. 访问 `http://localhost`
 6. 登录 
-```
-选取t_user表中的任意一条数据，如：
-邮箱 15906184943@sina.com
-密码 123456（所有mock数据都是一个密码）
-激活 将status状态改为 nonactivated（需要激活才能登录，要配置JavaMail）
 
-随机的5个测试账号 密码
-15803194907@yeah.net 123456
-13501161119@263.net 123456
-15104496675@3721.net 123456
-13603931551@gmail.com 123456
-15507700151@hotmail.com 123456
-```
+选取t_user表中的任意一条数据，如：
+邮箱 `15906184943@sina.com`
+密码 `123456`（所有mock数据都是一个密码）
+激活 将`status`状态改为`nonactivated`（需要激活才能登录，要配置JavaMail）
 
 ### 部署
 
-预览 http://im.dreamylost.cn
-
-邮箱：13706055022@googlemail.com
-密码：123456
-
-1. cd LayIM
-2. gradle bootRepackage
-3. java -jar dist/LayIM-1.2.1.jar
-
-### 示例
-
-![基于Akka HTTP的LayIM](https://github.com/jxnu-liguobin/LayIM/blob/v1.2/src/main/resources/layim.png)
-
-### v1.3.0 版本
-
-* 函数式重构
-
-### v1.2.1 版本
-
-* 增加scalafmt格式化
-* 打包并发布
-* 修复建群后不刷新看不到群
-* 修复同一个人的多个加群的消息被覆盖
-* 修复个人资料和查看资料性别显示不同问题
-* 新增修改个人信息时可选择是否修改密码
-* 修复收到消息时没有声音
-* 支持获取离线消息和提醒「打开会话框时将对方发给我的所有消息置为已读」
-* 支持持久化状态，打开会话框时检测对方状态「刷新会导致自己状态被置为在线，因为旧连接被关闭新连接又被打开了」
-* 新增创建好友分组
-* 修复创建群组的表单tips不准问题、支持重置表单
-
-### v1.2 版本
-
-* 简单使用Base64编码支持cookie
-* 实时输出在线用户数量
-* 使用Akka HTTP重构WebSocket通信
-* 升级Scala版本至2.12.8
-
-
-### TODO
-
-1. 使用Playframework、play-ws重构LayIM后端
-2. 使用Akka HTTP重构LayIM后端
-3. 升级LayIM到3.x
-
-### V1.1 版本
-
-* 查询我创建的群接口 
-* 退群接口完善 
-* 创建群组接口 
-* 更新个人信息接口 
-* 加入群组接口 
-* 删除群组接口 
-* 修复分页查询bug 
-* 修复Redis缓存bug 
-* 管理群组接口 【重命名群、修改群信息】 
-* 管理好友列表接口【重命名、删除、新增】
-* 若干前端问题或bug
-* 代码优化
-
-创建新的群，默认将创建者加入群中。退群的操作可能有以下情况：
-
-1. 不允许创建者退群。  √
-2. 允许创建者退群，但在退出时默认删除群。需要重置回话并发送所有提醒给群内人。感觉不太好。
-3. 创建者退群时，将群中创建者【群主】，更改为最早加入者，不影响会话，只需要发送系统提示【群主已变更】。
-4. 群组列表的删除和增加只能通过刷新才能显示最新数据
-
-参考[scalad](https://github.com/scalad/LayIM)，并二次开发，是为1.1版本，还存在许多bug！！
-
-原项目命令式风格很重，改动很多，本次没有进行重构。
-
-包括但不限增加、修改、删除、完善代码等
\ No newline at end of file
+```shell
+# 里面的jar包版本号需要改
+bash deploy.sh
+```