diff --git a/.gitignore b/.gitignore
index 8c077982..f3f99e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@ backups/
build.gradle
.vscode/
nohup.out
+docker-compose.dev.yml
+docker-compose.custom.yml
private
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29b..1c1f9e18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# 6.0.0
+
+- 发布全新组织机构管理模块,支持一个超级管理员和多管理员,每个管理员管理其所在组织机构的用户、坐席、对话、渠道等
+- 基于新的组织机构管理隔离数据,优化资源权限
+
+# 5.1.1
+
+- 兼容最新的 Chatopera 机器人平台(https://bot.chatopera.com)
+
+# 5.0.0
+
+- 优化服务启动速度,重写核心代码
+- Fix Bugs
diff --git a/LICENSE b/LICENSE
index a8a29d25..da1e74b7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,13 @@
-Copyright (2018-2020) Chatopera Inc. . All rights reserved.
-This software and related documentation are provided under a license agreement containing
-restrictions on use and disclosure and are protected by intellectual property laws.
-Except as expressly permitted in your license agreement or allowed by law, you may not use,
-copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform,
-publish, or display any part, in any form, or by any means. Reverse engineering, disassembly,
-or decompilation of this software, unless required by law for interoperability, is prohibited.
+Copyright (2018-2020) 北京华夏春松科技有限公司
+
+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.
diff --git a/README.md b/README.md
index f69fc380..670485f1 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,39 @@
[](https://microbadger.com/images/chatopera/contact-center:develop "Get your own image badge on microbadger.com") [](https://microbadger.com/images/chatopera/contact-center:develop "Get your own version badge on microbadger.com") [](https://hub.docker.com/r/chatopera/contact-center/) [](https://hub.docker.com/r/chatopera/contact-center/) [](https://microbadger.com/images/chatopera/contact-center:develop "Get your own commit badge on microbadger.com")
-
- 春松客服QQ交流群:185659917, 点击链接加入群聊
-
-
-
# 春松客服: 多渠道智能客服
-春松客服帮助企业快速而低成本的获得好用的智能客服系统。
+[春松客服](https://github.com/chatopera/cskefu)帮助企业快速而低成本的获得好用的智能客服系统。
-
+[CSKeFu](https://github.com/chatopera/cskefu) is a Customer Support System for Enterprises in a High Performance Low-Touch way, open source for the world by [Chatopera Inc](https://www.chatopera.com/).
+
+
春松客服是 Chatopera 自主研发以及基于且增强其它开源软件的方式实现的,春松客服会不断增强客服系统的智能化,这包括利用自然语言处理、机器学习和语音识别等技术让客服工作更有效率、客服满意度更高、成本更低。
-**开源项目地址:** [https://gitee.com/chatopera/cosin](https://gitee.com/chatopera/cosin)
+**开源项目地址:** [Gitee](https://gitee.com/chatopera/cosin) | [CodeChina](https://codechina.csdn.net/chatopera/cskefu) | [Github](https://github.com/chatopera/cskefu)
**开发环境搭建:** [https://docs.chatopera.com/products/cskefu/engineering.html](https://docs.chatopera.com/products/cskefu/engineering.html)
-**春松客服团队博客:** [https://blog.chatopera.com/](https://blog.chatopera.com/)
+**春松客服团队博客:** [https://blog.chatopera.com/](https://blog.chatopera.com/)
+
+
+ 春松客服 QQ 交流群:185659917, 点击链接加入群聊
+
+
+
+## 媒体报道
+
+- [GitHub 上获点赞最多的开源客服系统春松客服入驻 CODE CHINA](https://mp.weixin.qq.com/s/wGCFj9Hs1uVuTQCTqH0IWg)
+
+- [Coscon'19 中国开源年会春松客服主题分享](https://www.shangyexinzhi.com/article/351121.html)
+
+- [春松客服荣获 GVP 企业级开源项目认证](http://www.ctiforum.com/news/guonei/578988.html)
+
+
## 产品演示
-- 坐席工作台
+### 坐席工作台
[https://cc.chatopera.com/](https://cc.chatopera.com/)
@@ -29,10 +41,39 @@
| ------------ | --------- |
| admin | admin1234 |
-- 网页端访客程序
+### 网页端访客程序
[https://cc.chatopera.com/testclient.html](http://cc.chatopera.com/testclient.html)
+## 用户案例
+
+
+ TA们都选择春松客服
+
+
+
+
+
+## 企业用户这样评价我们
+
+```
+The collaboration is efficient, very professional. The software is steady with high quality services.
+```
+
+-- Michael, Founder & CEO, [麥睿資訊](https://www.maideax.com/)
+
+```
+系统功能强大,免费且响应及时,太赞了!贵公司是我碰到的最有爱的公司啦,这么好的产品授权竟然是Apache。
+```
+
+-- 小赵,技术员,上海某特种气体公司 IT 部客服系统负责人
+
+```
+技术支持力度大,产品更新很快!
+```
+
+-- 阿伟,电商客服技术总监,某跨境电商企业
+
## 基础模块
春松客服提供多个开箱即用的供企业免费使用的模块:
@@ -67,7 +108,16 @@
关于产品的具体使用说明,请参考[文档中心](https://docs.chatopera.com/products/cskefu/index.html)。
-## 在线培训课程
+## 开发文档
+
+
+ 开发文档
+
+
+
+
+
+## 运营及定制开发培训
[春松客服大讲堂](https://docs.chatopera.com/products/cskefu/training.html)是面向企业 CTO、客服主管、客服及客服系统开发运维人员的在线培训课程,由浅入深的介绍春松客服上线企业智能客服系统、运营客服工作和二次开发的知识。
@@ -80,44 +130,6 @@
-## 用户案例
-
-
- TA们都选择春松客服
-
-
-
-
-
-## 企业用户这样评价我们
-
-```
-The collaboration is efficient, very professional. The software is steady with high quality services.
-```
-
--- Michael, Founder & CEO, [麥睿資訊](https://www.maideax.com/)
-
-```
-系统功能强大,免费且响应及时,太赞了!贵公司是我碰到的最有爱的公司啦,这么好的产品授权竟然是Apache。
-```
-
--- 小赵,技术员,上海某特种气体公司 IT 部客服系统负责人
-
-```
-技术支持力度大,产品更新很快!
-```
-
--- 阿伟,电商客服技术总监,某跨境电商企业
-
-## 开发文档
-
-
- 开发文档
-
-
-
-
-
## 寻找开发者
寻找开发者合作智能客服项目,社区共建,携手共赢!
@@ -191,7 +203,7 @@ The collaboration is efficient, very professional. The software is steady with h
Copyright (2018-2020) 北京华夏春松科技有限公司
-[Apache License Version 2.0](https://gitee.com/chatopera/cosin/blob/master/LICENSE)
+[Apache License Version 2.0](https://github.com/chatopera/cskefu/blob/master/LICENSE)
[![chatoper banner][co-banner-image]][co-url]