mirror of
https://github.com/chatopera/cosin.git
synced 2025-08-01 16:38:02 +08:00
Merge branch 'develop'
This commit is contained in:
Hai Liang Wang
commit
4bd04b8655
@ -321,6 +321,15 @@
|
||||
"contributions": [
|
||||
"bug"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "kely33",
|
||||
"name": "kely33",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/134681303?v=4",
|
||||
"profile": "https://github.com/kely33",
|
||||
"contributions": [
|
||||
"bug"
|
||||
]
|
||||
}
|
||||
],
|
||||
"projectName": "cskefu",
|
||||
@ -328,5 +337,6 @@
|
||||
"repoType": "github",
|
||||
"repoHost": "https://github.com",
|
||||
"skipCi": true,
|
||||
"commitConvention": "angular"
|
||||
"commitConvention": "angular",
|
||||
"commitType": "docs"
|
||||
}
|
||||
|
||||
8
.github/CODEOWNERS
vendored
8
.github/CODEOWNERS
vendored
@ -1,7 +1,7 @@
|
||||
# https://github.com/cskefu/cskefu/issues/758
|
||||
|
||||
# defaults
|
||||
* @cskefu/reviewers
|
||||
* @lecjy
|
||||
|
||||
# Order is important; the last matching pattern takes the most
|
||||
# precedence. When someone opens a pull request that only
|
||||
@ -12,7 +12,7 @@
|
||||
*.pug @lecjy
|
||||
*.java @lecjy
|
||||
*.sql @lecjy
|
||||
pom.xml @lecjy
|
||||
pom.xml @hailiang-wang
|
||||
|
||||
docs/* @SAMZONG
|
||||
README* @SAMZONG
|
||||
docs/* @cskefu/reviewers
|
||||
README* @cskefu/reviewers
|
||||
42
README.md
42
README.md
@ -7,7 +7,7 @@
|
||||
# 春松客服
|
||||
|
||||
[](https://github.com/cskefu/cskefu/stargazers) [](https://github.com/cskefu/cskefu/network/members) [](https://www.cskefu.com/licenses/v1.html "开源许可协议") [](https://github.com/cskefu/cskefu/issues) [](https://github.com/cskefu/cskefu/issues?q=is%3Aissue+is%3Aclosed) [](https://hub.docker.com/r/chatopera/contact-center/) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
||||
[](#contributors-)
|
||||
[](#contributors-)
|
||||
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
||||
|
||||
[https://www.cskefu.com](https://www.cskefu.com/)
|
||||
@ -92,10 +92,13 @@
|
||||
<td align="center" valign="top" width="11.11%"><a href="https://github.com/zhangchanglong"><img src="https://avatars.githubusercontent.com/u/3481828?v=4?s=50" width="50px;" alt="zhangchanglong"/><br /><sub><b>zhangchanglong</b></sub></a><br /><a href="#eventOrganizing-zhangchanglong" title="Event Organizing">📋</a></td>
|
||||
<td align="center" valign="top" width="11.11%"><a href="https://samzong.me"><img src="https://avatars.githubusercontent.com/u/13782141?v=4?s=50" width="50px;" alt="Samzong Lu"/><br /><sub><b>Samzong Lu</b></sub></a><br /><a href="#eventOrganizing-SAMZONG" title="Event Organizing">📋</a> <a href="#projectManagement-SAMZONG" title="Project Management">📆</a> <a href="#design-SAMZONG" title="Design">🎨</a></td>
|
||||
<td align="center" valign="top" width="11.11%"><a href="https://github.com/halfray"><img src="https://avatars.githubusercontent.com/u/8181982?v=4?s=50" width="50px;" alt="halfray"/><br /><sub><b>halfray</b></sub></a><br /><a href="https://github.com/cskefu/cskefu/issues?q=author%3Ahalfray" title="Bug reports">🐛</a></td>
|
||||
<td align="center" valign="top" width="11.11%"><a href="https://github.com/kely33"><img src="https://avatars.githubusercontent.com/u/134681303?v=4?s=50" width="50px;" alt="kely33"/><br /><sub><b>kely33</b></sub></a><br /><a href="https://github.com/cskefu/cskefu/issues?q=author%3Akely33" title="Bug reports">🐛</a></td>
|
||||
<td align="center" valign="top" width="11.11%"><a href="https://github.com/lecjy"><img src="https://avatars.githubusercontent.com/u/9280760?v=4?s=50" width="50px;" alt="lecjy"/><br /><sub><b>lecjy</b></sub></a><br /></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
<!-- prettier-ignore-end -->
|
||||
|
||||
@ -131,7 +134,7 @@
|
||||
|
||||
<p align="center">
|
||||
<b>欢迎页</b><br>
|
||||
<img src="https://static-public.chatopera.com/assets/images/cskefu/cskefu-screen-1.jpg" width="900">
|
||||
<img src="./public/assets/cskefu/cskefu-screen-1.jpg" width="900">
|
||||
</p>
|
||||
|
||||
<details>
|
||||
@ -140,46 +143,27 @@
|
||||
|
||||
<p align="center">
|
||||
<b>坐席工作台</b><br>
|
||||
<img src="https://static-public.chatopera.com/assets/images/44915582-eb8d2c80-ad65-11e8-8876-86c8b5bb5cc7.png" width="900">
|
||||
<img src="./public/assets/44915582-eb8d2c80-ad65-11e8-8876-86c8b5bb5cc7.png" width="900">
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<b>坐席监控</b><br>
|
||||
<img src="https://static-public.chatopera.com/assets/images/44915711-432b9800-ad66-11e8-899b-1ea02244925d.png" width="900">
|
||||
<img src="./public/assets/44915711-432b9800-ad66-11e8-899b-1ea02244925d.png" width="900">
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<b>集成客服机器人</b><br>
|
||||
<img src="https://static-public.chatopera.com/assets/images/51080565-4b82df00-1719-11e9-8cc4-dbbec0459224.png" width="900">
|
||||
<img src="./public/assets/51080565-4b82df00-1719-11e9-8cc4-dbbec0459224.png" width="900">
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<b>客服机器人应答</b><br>
|
||||
<img src="https://static-public.chatopera.com/assets/images/51080567-50479300-1719-11e9-85d8-d209370c9d10.png" width="900">
|
||||
<img src="./public/assets/51080567-50479300-1719-11e9-85d8-d209370c9d10.png" width="900">
|
||||
</p>
|
||||
|
||||
</p>
|
||||
</details>
|
||||
|
||||
### 坐席工作台
|
||||
|
||||
[https://demo.cskefu.com/](https://demo.cskefu.com/)
|
||||
|
||||
| **登录账号** | **密码** | **角色** |
|
||||
| ------------ | --------- | -------------- |
|
||||
| admin | admin1234 | 系统超级管理员 |
|
||||
| zhangsan | agent1234 | 客服坐席人员 |
|
||||
|
||||
### 网页端访客示例
|
||||
|
||||
[https://demo.cskefu.com/testclient.html](http://demo.cskefu.com/testclient.html)
|
||||
|
||||
- 登录张三后可接待访客，否则显示没有客服人员在线
|
||||
|
||||
### 机器人客服示例
|
||||
|
||||
[https://oh-my.cskefu.com/im/text/0nhckh.html](https://oh-my.cskefu.com/im/text/0nhckh.html)
|
||||
|
||||
## 快速开始
|
||||
|
||||
### 春松客服用户使用指南
|
||||
@ -218,7 +202,7 @@
|
||||
|
||||
<p align="center">
|
||||
<b>应用场景示例</b><br>
|
||||
<img src="https://github.com/cskefu/cskefu/raw/osc/public/assets/screenshot-20210908-184522.png" width="800">
|
||||
<img src="https://github.com/cskefu/cskefu/raw/develop/public/assets/screenshot-20210908-184522.png" width="800">
|
||||
</p>
|
||||
|
||||
支持企业 OA 智能问答、HR 智能问答、智能客服和网络营销等场景。企业 IT 部门、业务部门借助 Chatopera 云服务快速让聊天机器人上线！
|
||||
@ -262,7 +246,7 @@
|
||||
- 开发环境搭建
|
||||
- [安装依赖和启动数据库等](https://docs.cskefu.com/docs/osc/engineering)
|
||||
- [IDE 配置和使用之 IntelliJ IDEA](https://docs.cskefu.com/docs/osc/ide_intelij_idea)
|
||||
- [IDE 配置和使用之 Eclipse IDE](https://docs.cskefu.com/docs/osc/ide_eclipse)
|
||||
- [IDE 配置和使用之 VSCode](https://docs.cskefu.com/docs/osc/ide_vscode)
|
||||
- 定制开发技能
|
||||
- [系统集成之 RestAPIs](https://docs.cskefu.com/docs/osc/restapi)
|
||||
- [从零开始学习定制春松客服技能：春松客服大讲堂 PPT 课件及视频](https://github.com/cskefu/cskefu.djt)
|
||||
@ -271,6 +255,8 @@
|
||||
|
||||
## 微信
|
||||
|
||||
* 如以下图片无法浏览，可能是网络原因，请打开 [Gitee](https://gitee.com/cskefu/cskefu#%E5%BE%AE%E4%BF%A1) 查看二维码。
|
||||
|
||||
### 微信群
|
||||
|
||||
春松客服用户和开发者交流群。
|
||||
@ -281,7 +267,7 @@
|
||||
|
||||
及时获得产品更新、活动分享等信息，关注春松客服公众号。
|
||||
|
||||
|
||||
|
||||
|
||||
## 鸣谢
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ public class ApplicationController extends Handler {
|
||||
@Autowired
|
||||
private ACDWorkMonitor acdWorkMonitor;
|
||||
|
||||
@Value("${git.build.version}")
|
||||
@Value("${cskefu.build.version}")
|
||||
private String appVersionNumber;
|
||||
|
||||
@Value("${git.commit.id.abbrev}")
|
||||
|
||||
@ -1020,12 +1020,14 @@
|
||||
map.addAttribute("summary", summaries.get(0));
|
||||
}
|
||||
}
|
||||
AgentService service = agentServiceRes.findById(agentserviceid).orElse(null);
|
||||
if (service != null) {
|
||||
Organ currentOrgan = super.getOrgan(request);
|
||||
if(null!=currentOrgan){
|
||||
map.addAttribute(
|
||||
"tags", tagRes.findByTagtypeAndSkill(
|
||||
MainContext.ModelType.SUMMARY.toString(), service.getSkill()));
|
||||
MainContext.ModelType.CCSUMMARY.toString(), currentOrgan.getParent()));
|
||||
}
|
||||
|
||||
|
||||
map.addAttribute("userid", userid);
|
||||
map.addAttribute("agentserviceid", agentserviceid);
|
||||
map.addAttribute("agentuserid", agentuserid);
|
||||
|
||||
@ -69,26 +69,26 @@ public interface AgentUserRepository extends JpaRepository<AgentUser, String> {
|
||||
|
||||
AgentUser findOneByAgentnoAndStatus(String id, String status);
|
||||
|
||||
@Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " +
|
||||
@Query(nativeQuery = true, value = "SELECT u.* FROM uk_agentuser AS u " +
|
||||
"LEFT JOIN uk_agentuser_contacts AS c " +
|
||||
"ON u.userid = c.userid WHERE c.id = ?1 AND NOT u.status = ?2 LIMIT 1")
|
||||
AgentUser findOneByContactIdAndStatusNot(final String contactid, final String status);
|
||||
|
||||
@Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " +
|
||||
@Query(nativeQuery = true, value = "SELECT u.* FROM uk_agentuser AS u " +
|
||||
"LEFT JOIN uk_agentuser_contacts AS c " +
|
||||
"ON u.userid = c.userid WHERE c.contactsid = ?1 " +
|
||||
"AND c.channeltype = ?3 AND NOT u.status = ?2 " +
|
||||
"ORDER BY u.createtime DESC LIMIT 1")
|
||||
Optional<AgentUser> findOneByContactIdAndStatusNotAndChanneltype(final String contactid, final String status, final String channeltype);
|
||||
|
||||
@Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " +
|
||||
@Query(nativeQuery = true, value = "SELECT u.* FROM uk_agentuser AS u " +
|
||||
"LEFT JOIN uk_agentuser_contacts AS c " +
|
||||
"ON u.userid = c.userid WHERE c.contactsid = ?1 " +
|
||||
"AND c.channeltype = ?2 " +
|
||||
"ORDER BY u.createtime DESC LIMIT 1")
|
||||
Optional<AgentUser> findOneByContactIdAndChanneltype(final String contactid, final String channeltype);
|
||||
|
||||
@Query(nativeQuery = true, value = "SELECT * FROM uk_agentuser AS u " +
|
||||
@Query(nativeQuery = true, value = "SELECT u.* FROM uk_agentuser AS u " +
|
||||
"WHERE u.userid = ?1 " +
|
||||
"AND u.channeltype = ?3 AND NOT u.status = ?2 " +
|
||||
"ORDER BY u.createtime DESC LIMIT 1")
|
||||
|
||||
@ -128,7 +128,8 @@ public class ChatbotEventSubscription {
|
||||
JSONObject data = (JSONObject) result.getData();
|
||||
if (data.has("logic_is_fallback")) {
|
||||
ChatMessage resp = creatChatMessage(request, c);
|
||||
resp.setMessage(data.getString("string"));
|
||||
String htmlMessage = data.getString("string").replaceAll("(\r\n|\n)", "<br />");
|
||||
resp.setMessage(htmlMessage);
|
||||
ChatMessage respHelp = new ChatMessage();
|
||||
JSONArray respParams = new JSONArray();
|
||||
if (!StringUtils.equals(MainContext.ChannelType.WEBIM.toString(), c.getChannel())) {
|
||||
|
||||
@ -146,6 +146,7 @@ cskefu.callout.watch.interval=60000
|
||||
##############################################
|
||||
# Modules
|
||||
##############################################
|
||||
cskefu.build.version=v8
|
||||
cskefu.modules.contacts=true
|
||||
cskefu.modules.cca=true
|
||||
cskefu.modules.entim=false
|
||||
|
||||
@ -305,7 +305,7 @@ html(xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xm
|
||||
});
|
||||
// 展示系统构建信息
|
||||
function showSystemBuildInfo() {
|
||||
layer.confirm('<div style="text-align:center;"> <img src="/images/favicon.ico" width="50px" height="50px"><p>春松客服<span>®</span> Release: #{appVersionNumber}</p></div>Build: #{appBuildDate}.<a href="https://github.com/cskefu/cskefu/commit/#{appVersionAbbrev}" target="_blank">#{appVersionAbbrev}</a> <br> Copyright (2018-2023) <a href="https://www.chatopera.com" target="_blank">Beijing Huaxia Chunsong Technology Co., Ltd.</a>, 开源许可协议: <a href="https://docs.cskefu.com/licenses/v1.html" target="_blank">Chunsong Public License, version 1.0</a> <br> <a href="https://docs.cskefu.com" target="_blank">文档中心</a> | <a href="https://www.cskefu.com/join-us/" target="_blank">加入开源社区</a> | <a href="https://www.chatopera.com/price.html" target="_blank">购买企业服务</a>',
|
||||
layer.confirm('<div style="text-align:center;"> <img src="/images/favicon.ico" width="50px" height="50px"><p>春松客服<span>®</span> Release #{appVersionNumber}</p></div>Build: #{appBuildDate}.<a href="https://github.com/cskefu/cskefu/commit/#{appVersionAbbrev}" target="_blank">#{appVersionAbbrev}</a> <br> Copyright (2018-2023) <a href="https://www.chatopera.com" target="_blank">Beijing Huaxia Chunsong Technology Co., Ltd.</a>, 开源许可协议: <a href="https://docs.cskefu.com/licenses/v1.html" target="_blank">Chunsong Public License, version 1.0</a> <br> <a href="https://docs.cskefu.com" target="_blank">文档中心</a> | <a href="https://www.cskefu.com/join-us/" target="_blank">加入开源社区</a> | <a href="https://www.chatopera.com/price.html" target="_blank">购买企业服务</a>',
|
||||
{icon: -1, title: '关于产品', btn: ["关闭"]}, function (index, layero) {
|
||||
//do something
|
||||
layer.close(index);
|
||||
|
||||
BIN
public/assets/44915582-eb8d2c80-ad65-11e8-8876-86c8b5bb5cc7.png
Normal file
BIN
public/assets/44915582-eb8d2c80-ad65-11e8-8876-86c8b5bb5cc7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 320 KiB |
BIN
public/assets/44915711-432b9800-ad66-11e8-899b-1ea02244925d.png
Normal file
BIN
public/assets/44915711-432b9800-ad66-11e8-899b-1ea02244925d.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 192 KiB |
BIN
public/assets/51080565-4b82df00-1719-11e9-8cc4-dbbec0459224.png
Normal file
BIN
public/assets/51080565-4b82df00-1719-11e9-8cc4-dbbec0459224.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 315 KiB |
BIN
public/assets/51080567-50479300-1719-11e9-85d8-d209370c9d10.png
Normal file
BIN
public/assets/51080567-50479300-1719-11e9-85d8-d209370c9d10.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 840 KiB |
BIN
public/assets/cskefu-wechat-gzh.jpg
Normal file
BIN
public/assets/cskefu-wechat-gzh.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 20 KiB |
2
public/pr1st.md
Normal file
2
public/pr1st.md
Normal file
@ -0,0 +1,2 @@
|
||||
# 第一个 PR 改动文件，新手任务，添加一行：昵称 @ 日期，e.g.
|
||||
Hai Liang W. @ 2023-09-11
|
||||
Loading…
x
Reference in New Issue
Block a user