From 771f2735463ca47c9891330b73eea03d18288b73 Mon Sep 17 00:00:00 2001 From: mukaiu Date: Mon, 24 Sep 2018 19:50:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?#70=20=E6=94=AF=E6=8C=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/chatbot/ChatbotController.java | 70 ++++++++ .../templates/apps/chatbot/edit.html | 165 ++++++++++++++++++ .../templates/apps/chatbot/index.html | 129 ++++++++++++++ .../main/resources/templates/apps/index.html | 9 + 4 files changed, 373 insertions(+) create mode 100644 contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/chatbot/ChatbotController.java create mode 100644 contact-center/app/src/main/resources/templates/apps/chatbot/edit.html create mode 100644 contact-center/app/src/main/resources/templates/apps/chatbot/index.html diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/chatbot/ChatbotController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/chatbot/ChatbotController.java new file mode 100644 index 00000000..d6959a3c --- /dev/null +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/chatbot/ChatbotController.java @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2018 Chatopera Inc, + * + * 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. + */ + +package com.chatopera.cc.app.handler.apps.chatbot; + +import com.chatopera.cc.app.handler.Handler; +import com.chatopera.cc.app.model.Chatbot; +import com.chatopera.cc.app.model.SNSAccount; +import com.chatopera.cc.app.model.User; +import com.chatopera.cc.app.persistence.repository.ChatbotRepository; +import com.chatopera.cc.app.persistence.repository.SNSAccountRepository; +import com.chatopera.cc.util.Menu; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; + +@Controller +@RequestMapping(value = "/apps/chatbot") +public class ChatbotController extends Handler { + @Autowired + private ChatbotRepository chatbotRes; + + @Autowired + private SNSAccountRepository snsAccountRes; + + @RequestMapping(value = "/index") + @Menu(type = "chatbot", subtype = "index", access = true) + public ModelAndView index(ModelMap map, HttpServletRequest request) { + + return request(super.createAppsTempletResponse("/apps/chatbot/index")); + } + + @RequestMapping(value = "/edit") + @Menu(type = "chatbot", subtype = "index", access = true) + public ModelAndView eidt(ModelMap map, HttpServletRequest request, @Valid String id) { + User curruser = super.getUser(request); + + ModelAndView view = request(super.createAppsTempletResponse("/apps/chatbot/edit")); + if (id != null) { + Chatbot c = chatbotRes.findOne(id); + SNSAccount snsAccount = snsAccountRes.findBySnsidAndOrgi(c.getSnsAccountIdentifier(), curruser.getOrgi()); + view.addObject("snsurl", snsAccount.getBaseURL()); + view.addObject("bot", c); + } + + view.addObject("id", id); + + return view; + } +} + + diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html new file mode 100644 index 00000000..bc6bcc0f --- /dev/null +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html @@ -0,0 +1,165 @@ + +
+
+

机器人列表

+
+
+
+
+
+
+ +
+ +
+ <#if id!=null> + + <#else> + + +
+
+
+ +
+ disabled> +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+
+
+ \ No newline at end of file diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/index.html b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html new file mode 100644 index 00000000..83a8a390 --- /dev/null +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html @@ -0,0 +1,129 @@ + +
+
+
+

机器人列表 +
+ +
+

+
+
+
+
+ + + + + + + + + + + +
机器人名称网站渠道是否开启操作
+
+
+
+ \ No newline at end of file diff --git a/contact-center/app/src/main/resources/templates/apps/index.html b/contact-center/app/src/main/resources/templates/apps/index.html index 02e8234a..7898d9b7 100644 --- a/contact-center/app/src/main/resources/templates/apps/index.html +++ b/contact-center/app/src/main/resources/templates/apps/index.html @@ -317,6 +317,15 @@ + <#if models?? && models["sales"]?? && models["sales"] == true> + <#if user?? &&( user.roleAuthMap["A11"]?? || user.usertype == "0") > +
+ + + +
+ + <#if models?? && models["callcenter"]?? && models["callcenter"] == true> <#if user?? && (user.roleAuthMap["A10"]?? || user.usertype == "0") >
From e580345063e6ec1a7bb58527ad519f681abd7fdc Mon Sep 17 00:00:00 2001 From: mukaiu Date: Mon, 24 Sep 2018 22:13:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?#70=20fix=20=E6=96=B0=E5=BB=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/apps/chatbot/edit.html | 2 +- .../templates/apps/chatbot/index.html | 153 +++++++++--------- 2 files changed, 76 insertions(+), 79 deletions(-) diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html index bc6bcc0f..6d57dcdb 100644 --- a/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html @@ -119,7 +119,7 @@ layui.use(['form'], function () { var form = layui.form(); form.on('submit(save)', function (data) { - let field = data.field; + var field = data.field; var submitFinish = function (err, bot) { if (err) { diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/index.html b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html index 83a8a390..34d17d5d 100644 --- a/contact-center/app/src/main/resources/templates/apps/chatbot/index.html +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html @@ -35,95 +35,92 @@ \ No newline at end of file From 4e6cd93cbdb0277304a2c60536a48d08d4307b3b Mon Sep 17 00:00:00 2001 From: mukaiu Date: Tue, 25 Sep 2018 15:25:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?#70=20=E8=B0=83=E6=95=B4=20=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E4=BA=BA=E7=BC=96=E8=BE=91=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/apps/chatbot/edit.html | 9 +++----- .../templates/apps/chatbot/index.html | 23 +++++++++++++++---- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html index 6d57dcdb..22a9a8d5 100644 --- a/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html @@ -9,11 +9,6 @@ width: 400px; } -
-
-

机器人列表

-
-
@@ -129,7 +124,9 @@ title: '提示' , content: '保存成功' }); - location.href = '/apps/chatbot/index.html'; + parent.init(); + var index = parent.layer.getFrameIndex(window.name); + parent.layer.close(index); } } diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/index.html b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html index 34d17d5d..c36e9904 100644 --- a/contact-center/app/src/main/resources/templates/apps/chatbot/index.html +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html @@ -67,7 +67,15 @@ function query(p, ps) { request('chatbot?p=' + (p || 1) + '&ps=' + (ps || 10), { ops: 'fetch' }).then(function (rows) { var tds = $.map(rows, function (r) { - var edit = $('编辑'); + var edit = $('编辑'); + edit.click(function () { + layer.open({ + title: '编辑机器人', + type: 2, + area: ['800px', '450px'], + content: 'edit.html?id=' + r.id + }) + }); var remove = $('ဆ删除').click(function () { var lindex = layer.confirm('请确认是否删除？', { @@ -75,7 +83,7 @@ }, function () { console.log('ok', r.id) window.remove(r.id); - window.init(); + layer.close(lindex); }, function () { console.log('cancel', r.id) @@ -105,7 +113,9 @@ } function remove(id) { - return request('chatbot', { ops: 'delete', id: id }) + return request('chatbot', { ops: 'delete', id: id }).then(function () { + window.init(); + }) } function change(id, isEnabled) { @@ -113,7 +123,12 @@ } function showCreate() { - location.href = '/apps/chatbot/edit.html'; + layer.open({ + title: '新建机器人', + type: 2, + area: ['800px', '450px'], + content: 'edit.html' + }) } function init() { From 89f0fc2105db242627e65bf892fbddf892db3c8b Mon Sep 17 00:00:00 2001 From: mukaiu Date: Tue, 25 Sep 2018 15:35:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?#70=20AUTH=20=E9=94=99=E8=AF=AF=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/apps/chatbot/edit.html | 13 +++++++++++++ .../resources/templates/apps/chatbot/index.html | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html index 22a9a8d5..adbe5be2 100644 --- a/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/edit.html @@ -99,6 +99,19 @@ $.ajax(payload) .done(function (data) { console.log('Rest api 返回的值：', data); + if (data.status && data.status === "AUTH_ERROR") { + layer.confirm('会话过期，请重新登录！', { + btn: ['是', '否'], + icon: 2, + title: '提示' + }, function (index, layero) { + layer.close(index) + top.location.href = '/logout.html' + }, function (index) { + // 取消方法 + }); + return; + } if (data.rc == 0) { cb(null, data.data); } else { diff --git a/contact-center/app/src/main/resources/templates/apps/chatbot/index.html b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html index c36e9904..8b67d65b 100644 --- a/contact-center/app/src/main/resources/templates/apps/chatbot/index.html +++ b/contact-center/app/src/main/resources/templates/apps/chatbot/index.html @@ -51,6 +51,20 @@ $.ajax(payload) .done(function (data) { console.log('Rest api 返回的值：', data); + if (data.status && data.status === "AUTH_ERROR") { + layer.confirm('会话过期，请重新登录！', { + btn: ['是', '否'], + icon: 2, + title: '提示' + }, function (index, layero) { + layer.close(index) + top.location.href = '/logout.html' + }, function (index) { + // 取消方法 + }); + return; + } + if (data.rc == 0) { resolve(data.data); } else { From 96cd164c690d185586dcbafb903caeff60487791 Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 26 Sep 2018 16:31:59 +0800 Subject: [PATCH 5/7] Closed #69 set chatbot menu --- .../main/resources/templates/apps/index.html | 26 +++++++++---------- .../config/sql/cskefu-MySQL-slim.sql | 4 +-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/contact-center/app/src/main/resources/templates/apps/index.html b/contact-center/app/src/main/resources/templates/apps/index.html index 7898d9b7..b821d1f6 100644 --- a/contact-center/app/src/main/resources/templates/apps/index.html +++ b/contact-center/app/src/main/resources/templates/apps/index.html @@ -299,15 +299,15 @@ --> - <#if models?? && models["xiaoe"]?? && models["xiaoe"] == true> - <#if user?? &&( user.roleAuthMap["A09"]?? || user.usertype == "0") > -
- - - -
- - + + + + + + + + + <#if models?? && models["sales"]?? && models["sales"] == true> <#if user?? &&( user.roleAuthMap["A11"]?? || user.usertype == "0") >
@@ -318,10 +318,10 @@ <#if models?? && models["sales"]?? && models["sales"] == true> - <#if user?? &&( user.roleAuthMap["A11"]?? || user.usertype == "0") > -
- - + <#if user?? &&( user.roleAuthMap["A09"]?? || user.usertype == "0") > +
+ +
diff --git a/contact-center/config/sql/cskefu-MySQL-slim.sql b/contact-center/config/sql/cskefu-MySQL-slim.sql index 073b31c6..e577ed8e 100644 --- a/contact-center/config/sql/cskefu-MySQL-slim.sql +++ b/contact-center/config/sql/cskefu-MySQL-slim.sql @@ -7130,9 +7130,7 @@ INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ce8b990057e', '在线坐 INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ce8e6a2057f', '全部坐席', 'pub', 'A08_A04_A02', NULL, 'auth', '402881ef612b1f5b01612cdd1e930570', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:41:56', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/service/user/index.html', 'webim', '3', NULL, 'left'); INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ce964ae0580', '智能机器人', 'pub', 'A09_A01', NULL, 'auth', '402881ef612b1f5b01612cc602450546', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:42:28', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, 'javascript:;', 'webim', '2', NULL, 'left'); INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ce996f80581', '语料库配置', 'pub', 'A09_A02', NULL, 'auth', '402881ef612b1f5b01612cc602450546', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:42:41', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, 'javascript:;', 'webim', '2', NULL, 'left'); -INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ce9d8150582', '机器人选项', 'pub', 'A09_A01_A01', NULL, 'auth', '402881ef612b1f5b01612ce964ae0580', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:42:58', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/apps/xiaoe/index.html', 'webim', '3', NULL, 'left'); -INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612cea04810583', '对话测试', 'pub', 'A09_A01_A02', NULL, 'auth', '402881ef612b1f5b01612ce964ae0580', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:43:09', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/apps/xiaoe/chat.html', 'webim', '3', NULL, 'left'); -INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612cea430f0584', '用户提问历史', 'pub', 'A09_A01_A03', NULL, 'auth', '402881ef612b1f5b01612ce964ae0580', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:43:25', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/apps/xiaoe/history.html', 'webim', '3', NULL, 'left'); +INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ce9d8150582', '机器人管理', 'pub', 'A09_A01_A01', NULL, 'auth', '402881ef612b1f5b01612ce964ae0580', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:42:58', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/apps/xiaoe/index.html', 'webim', '3', NULL, 'left'); INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ceaff050587', '对话场景', 'pub', 'A09_A02_A03', NULL, 'auth', '402881ef612b1f5b01612ce996f80581', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:44:13', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/apps/xiaoe/scene.html', 'webim', '3', NULL, 'left'); INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612ced9d5f0588', '知识维护', 'pub', 'A09_A02_A01', NULL, 'auth', '402881ef612b1f5b01612ce996f80581', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:47:05', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/apps/xiaoe/knowledge.html', 'webim', '3', NULL, 'left'); INSERT INTO `uk_sysdic` VALUES ('402881ef612b1f5b01612cedca5e0589', '词库配置', 'pub', 'A09_A02_A02', NULL, 'auth', '402881ef612b1f5b01612ce996f80581', NULL, NULL, '�', NULL, NULL, '297e8c7b455798280145579c73e501c1', '2018-01-25 18:47:16', NULL, 0, 0, '402888815d2fe37f015d2fe75cc80002', 0, 0, '/apps/xiaoe/words.html', 'webim', '3', NULL, 'left'); From 5ccbcda3ffb193c21c7bdd00d47728065d7463c9 Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 26 Sep 2018 17:15:57 +0800 Subject: [PATCH 6/7] Closed #20 --- contact-center/app/pom.xml | 2 +- .../cc/app/handler/apps/test/TestController.java | 2 +- .../templates/admin/callcenter/extention/ivr.html | 2 +- .../src/main/resources/templates/admin/config/index.html | 6 +++--- .../src/main/resources/templates/admin/webim/profile.html | 8 ++++---- .../main/resources/templates/apps/business/kbs/index.html | 8 ++++---- .../resources/templates/apps/business/kbs/typelist.html | 8 ++++---- .../app/src/main/resources/templates/apps/entim/chat.html | 8 ++++---- .../src/main/resources/templates/apps/entim/index.html | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contact-center/app/pom.xml b/contact-center/app/pom.xml index e21195a8..2eb18f9c 100644 --- a/contact-center/app/pom.xml +++ b/contact-center/app/pom.xml @@ -384,7 +384,7 @@ hailiang.hl.wang@gmail.com https://github.com/Samurais Chatopera Inc. - http://www.chatopera.com + https://www.chatopera.com architect developer diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/test/TestController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/test/TestController.java index f5da9d6c..1acaa38d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/test/TestController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/test/TestController.java @@ -38,7 +38,7 @@ public class TestController extends Handler { for(int i=0 ; i<500; i++){ String user = MainUtils.getUUID(); try { - OnlineUserUtils.newRequestMessage(user, "ukewo", "user", "system", "localhost" , "win10", "test" , MainContext.ChannelTypeEnum.WEBIM.toString() , null , null , "admin" , "标题" , "http://www.ukewo.cn" , "12434" , MainContext.ChatInitiatorType.USER.toString()) ; + OnlineUserUtils.newRequestMessage(user, "ukewo", "user", "system", "localhost" , "win10", "test" , MainContext.ChannelTypeEnum.WEBIM.toString() , null , null , "admin" , "标题" , "https://www.chatopera.com" , "12434" , MainContext.ChatInitiatorType.USER.toString()) ; } catch (Exception e) { e.printStackTrace(); } diff --git a/contact-center/app/src/main/resources/templates/admin/callcenter/extention/ivr.html b/contact-center/app/src/main/resources/templates/admin/callcenter/extention/ivr.html index 20e81757..7984cb65 100644 --- a/contact-center/app/src/main/resources/templates/admin/callcenter/extention/ivr.html +++ b/contact-center/app/src/main/resources/templates/admin/callcenter/extention/ivr.html @@ -32,7 +32,7 @@
- +
diff --git a/contact-center/app/src/main/resources/templates/admin/config/index.html b/contact-center/app/src/main/resources/templates/admin/config/index.html index 90d665bc..0c0b2e8b 100644 --- a/contact-center/app/src/main/resources/templates/admin/config/index.html +++ b/contact-center/app/src/main/resources/templates/admin/config/index.html @@ -15,7 +15,7 @@
-

优客服系统界面颜色风格

+

春松客服系统界面颜色风格

默认的配色是绿色，选择颜色可以在右侧预览风格，点击保存即可生效

@@ -178,7 +178,7 @@

启用权限数据采集功能后，会进入数据采集模式,当前状态：<#if infoace?? && infoace == true>已启用<#else>已关闭

-

启用后，在优客服界面上的任何链接点击操作都会触发数据收集功能

+

启用后，在春松客服界面上的任何链接点击操作都会触发数据收集功能

<#if infoace?? && infoace == true> @@ -192,7 +192,7 @@
-
10、停止优客服系统
+
10、停止春松客服系统
diff --git a/contact-center/app/src/main/resources/templates/admin/webim/profile.html b/contact-center/app/src/main/resources/templates/admin/webim/profile.html index bb2fcab2..4ddbcb2f 100644 --- a/contact-center/app/src/main/resources/templates/admin/webim/profile.html +++ b/contact-center/app/src/main/resources/templates/admin/webim/profile.html @@ -50,7 +50,7 @@

默认显示信息 企业名称

- +
@@ -205,7 +205,7 @@
- +
@@ -472,7 +472,7 @@
- +
@@ -584,7 +584,7 @@
信息提示
- 名称： + 名称：
地址： diff --git a/contact-center/app/src/main/resources/templates/apps/business/kbs/index.html b/contact-center/app/src/main/resources/templates/apps/business/kbs/index.html index c408907c..7409442b 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/kbs/index.html +++ b/contact-center/app/src/main/resources/templates/apps/business/kbs/index.html @@ -193,7 +193,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件
@@ -233,7 +233,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件
@@ -273,7 +273,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件
@@ -311,7 +311,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件 diff --git a/contact-center/app/src/main/resources/templates/apps/business/kbs/typelist.html b/contact-center/app/src/main/resources/templates/apps/business/kbs/typelist.html index 0cbff68c..46574ba6 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/kbs/typelist.html +++ b/contact-center/app/src/main/resources/templates/apps/business/kbs/typelist.html @@ -94,7 +94,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件 @@ -134,7 +134,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件 @@ -174,7 +174,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件 @@ -212,7 +212,7 @@ [知识概况] 45 浏览 ， 15收藏 ， 5评论 ， 2017-10-02 15:40:33前有效 - 优客服v3.1.0 产品说明书.pdf 等3个附件 + 春松客服v3.1.0 产品说明书.pdf 等3个附件 diff --git a/contact-center/app/src/main/resources/templates/apps/entim/chat.html b/contact-center/app/src/main/resources/templates/apps/entim/chat.html index c598d2eb..ce997988 100644 --- a/contact-center/app/src/main/resources/templates/apps/entim/chat.html +++ b/contact-center/app/src/main/resources/templates/apps/entim/chat.html @@ -77,10 +77,10 @@
-

欢迎使用优客服企业IM

-

QQ群：优客服开源项目

-

优客服企业IM为收费产品

-

详情请咨询：优客服

+

欢迎使用春松客服企业IM

+

QQ群：春松客服开源社区

+

春松客服企业IM为收费产品

+

详情请咨询：春松客服
diff --git a/contact-center/app/src/main/resources/templates/apps/entim/index.html b/contact-center/app/src/main/resources/templates/apps/entim/index.html index 819cb81f..808774b3 100644 --- a/contact-center/app/src/main/resources/templates/apps/entim/index.html +++ b/contact-center/app/src/main/resources/templates/apps/entim/index.html @@ -172,7 +172,7 @@ title: '关于' , btn: '关闭' , shade: 0 , - content : '

欢迎使用优客服企业IM

QQ群：优客服开源项目

优客服企业IM为收费产品

详情请咨询：优客服

'}); + content : '

欢迎使用春松客服企业IM

QQ群：春松客服开源社区

春松客服企业IM为收费产品

详情请咨询：春松客服

'}); } function search(){ layer.open({ From cffdcc2b850564f79b17681289acb3d28ddf90f0 Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 26 Sep 2018 17:51:19 +0800 Subject: [PATCH 7/7] #20 --- .../app/src/main/resources/templates/admin/config/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contact-center/app/src/main/resources/templates/admin/config/index.html b/contact-center/app/src/main/resources/templates/admin/config/index.html index 0c0b2e8b..e022d220 100644 --- a/contact-center/app/src/main/resources/templates/admin/config/index.html +++ b/contact-center/app/src/main/resources/templates/admin/config/index.html @@ -165,7 +165,8 @@ <#if entim?? && entim == true> 关闭EntIM功能 <#else> - 启用EntIM功能 + + 启用EntIM功能