From d84fb8be4cf803f98b0d9953540b6891d3945bad Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Sun, 8 Dec 2019 15:00:38 +0800 Subject: [PATCH] enable performance montoring api, fix date format, api request path etc. --- contact-center/app/pom.xml | 20 ++++++++++++++- .../cc/controller/apps/AgentController.java | 2 ++ .../chatopera/cc/proxy/AgentServiceProxy.java | 4 ++- .../src/main/resources/application.properties | 25 ++++++++++++++++++- .../static/js/CSKeFu_Agent_Invite.v1.js | 2 +- .../static/js/CSKeFu_Agent_State.v1.js | 4 +-- .../templates/apps/business/customer/add.html | 4 +-- .../templates/apps/cca/mainagentuser.html | 2 ++ .../resources/templates/apps/im/mobile.html | 4 ++- .../templates/apps/service/current/index.html | 2 +- 10 files changed, 59 insertions(+), 10 deletions(-) diff --git a/contact-center/app/pom.xml b/contact-center/app/pom.xml index 93ab3eb1..21420f49 100644 --- a/contact-center/app/pom.xml +++ b/contact-center/app/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.6.RELEASE + 1.5.10.RELEASE @@ -149,6 +149,24 @@ org.springframework.boot spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-starter-hateoas + + + + + io.micrometer + micrometer-registry-prometheus + 1.1.1 + + + io.micrometer + micrometer-spring-legacy + 1.1.1 + commons-beanutils commons-beanutils diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentController.java index de0498c9..d7c509ed 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AgentController.java @@ -581,6 +581,8 @@ cache.putAgentStatusByOrgi(agentStatus, orgi); agentStatusRes.save(agentStatus); + agentStatusProxy.broadcastAgentsStatus(orgi, "agent", "notready", agentStatus.getAgentno()); + acdWorkMonitor.recordAgentStatus(agentStatus.getAgentno(), agentStatus.getUsername(), agentStatus.getAgentno(), diff --git a/contact-center/app/src/main/java/com/chatopera/cc/proxy/AgentServiceProxy.java b/contact-center/app/src/main/java/com/chatopera/cc/proxy/AgentServiceProxy.java index bb3fd4fa..5f56ace7 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/proxy/AgentServiceProxy.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/proxy/AgentServiceProxy.java @@ -227,7 +227,9 @@ public class AgentServiceProxy { /** * 获取关联数据 */ - processRelaData(logined.getId(), orgi, agentService, map); + if(agentService != null){ + processRelaData(logined.getId(), orgi, agentService, map); + } } diff --git a/contact-center/app/src/main/resources/application.properties b/contact-center/app/src/main/resources/application.properties index 13b8e68e..8b8becb2 100644 --- a/contact-center/app/src/main/resources/application.properties +++ b/contact-center/app/src/main/resources/application.properties @@ -199,4 +199,27 @@ spring.activemq.broker-url=tcp://localhost:61616 spring.activemq.user=admin spring.activemq.password=admin spring.activemq.pool.enabled=true -spring.activemq.pool.max-connections=50 \ No newline at end of file +spring.activemq.pool.max-connections=50 + + +############################################## +# Actuator 监控数据采集 +# https://docs.spring.io/spring-boot/docs/1.5.9.RELEASE/reference/html/production-ready-endpoints.html +############################################## +management.context-path=/actuator +endpoints.sensitive=true +endpoints.hypermedia.enabled=true +endpoints.prometheus.enabled=true +endpoints.metrics.enabled=true +endpoints.health.enabled=true +endpoints.info.enabled=true +endpoints.actuator.enabled=true +endpoints.beans.enabled=false +endpoints.auditevents.enabled=false +endpoints.autoconfig.enabled=false +endpoints.env.enabled=false +endpoints.loggers.enabled=false +endpoints.configprops.enabled=false +endpoints.mappings.enabled=false +endpoints.shutdown.enabled=false +endpoints.trace.enabled=false \ No newline at end of file diff --git a/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_Invite.v1.js b/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_Invite.v1.js index 94abbfa3..05052d7f 100644 --- a/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_Invite.v1.js +++ b/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_Invite.v1.js @@ -6,7 +6,7 @@ function sendInvitationToOnlineUser(onlineUserId, isFirstInvite){ if ($("#agentstatus", parent.document).hasClass('layui-form-onswitch') && $("#agentstatus_busy", parent.document).hasClass('layui-form-onswitch-notbusy') && !$("#agentstatus_busy", parent.document).hasClass('layui-form-onswitch-busy') ){ // 就绪状态 restApiRequest({ - path: "/apps", + path: "apps", silent: true, data: { ops: "invite", diff --git a/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_State.v1.js b/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_State.v1.js index 2124024f..36bc3910 100644 --- a/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_State.v1.js +++ b/contact-center/app/src/main/resources/static/js/CSKeFu_Agent_State.v1.js @@ -2,7 +2,7 @@ function checkAgentStatusData() { var payload = { silent: true, - path: '/agentuser', + path: 'agentuser', data: { ops: "inserv" }, }; return restApiRequest(payload); @@ -32,7 +32,7 @@ function handleAgentStatusData(data){ function reAllotOnlineUsers(){ var payload = { silent: true, - path: '/agentuser', + path: 'agentuser', data: { ops: "withdraw" }, }; return restApiRequest(payload); diff --git a/contact-center/app/src/main/resources/templates/apps/business/customer/add.html b/contact-center/app/src/main/resources/templates/apps/business/customer/add.html index ee37c300..ff968a80 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/customer/add.html +++ b/contact-center/app/src/main/resources/templates/apps/business/customer/add.html @@ -204,7 +204,7 @@
- +
@@ -278,7 +278,7 @@ var laydate = layui.laydate; var date = { - min : '2010-01-01 00:00:00', + min : '1950-01-01 00:00:00', max : laydate.now(), istoday : false }; diff --git a/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html b/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html index 4744f447..75de7018 100644 --- a/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html +++ b/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html @@ -170,7 +170,9 @@ word-break: break-all;"><#if curagentuser??>${curagentuser.username!''}<#if cura

访问信息
+ <#if user?? && user.admin?? && user.admin == true> +

diff --git a/contact-center/app/src/main/resources/templates/apps/im/mobile.html b/contact-center/app/src/main/resources/templates/apps/im/mobile.html index 6f100bc0..be27b67c 100644 --- a/contact-center/app/src/main/resources/templates/apps/im/mobile.html +++ b/contact-center/app/src/main/resources/templates/apps/im/mobile.html @@ -492,7 +492,9 @@ chat = data.message; if(data.msgtype == "image"){ chat = "" ; - }else if(data.msgtype == "cooperation"){ + }else if(data.msgtype == "file"){ + chat = "
"+data.filename+"
"+(data.filesize/1024).toFixed(3)+"Kb
" ; + }else if(data.msgtype == "cooperation"){ chat = "您收到一个协作邀请，点击进入协作" ; }else if(data.msgtype == "action"){ //检查访客是否在协作页面上，如果在协作页面上，就开始执行重绘，否则不做处理 diff --git a/contact-center/app/src/main/resources/templates/apps/service/current/index.html b/contact-center/app/src/main/resources/templates/apps/service/current/index.html index cce539a5..55b759c4 100644 --- a/contact-center/app/src/main/resources/templates/apps/service/current/index.html +++ b/contact-center/app/src/main/resources/templates/apps/service/current/index.html @@ -62,7 +62,7 @@ 邀请 - + 关闭