From 636d3eecd2f40f97334ce118723c85c9f2e539c8 Mon Sep 17 00:00:00 2001
From: Hai Liang Wang <hailiang.hl.wang@gmail.com>
Date: Thu, 18 Oct 2018 19:40:33 +0800
Subject: [PATCH] =?UTF-8?q?Closed=20#103=20iconstr=E4=BD=BF=E7=94=A8null?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/config/index.html         | 58 +++++++++----------
 .../templates/admin/include/left.html         |  2 +
 .../config/sql/cskefu-MySQL-slim.sql          |  2 +-
 3 files changed, 32 insertions(+), 30 deletions(-)

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 e022d220..584f7494 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
@@ -11,7 +11,7 @@
 						<div class="row">
 							<div class="col-lg-8">
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">1、系统颜色风格选择</div>
+									<div class="ukefu-webim-tl" style="clear:both;">系统颜色风格选择</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -29,8 +29,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">2、请填写服务器的访问地址</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">请填写服务器的访问地址</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -39,7 +39,7 @@
 											</div>
 											<div class="col-lg-4" style="text-align:right;">
 												<div class="layui-input-block">
-												     <input type="text" name="iconstr" value="<#if systemConfig.iconstr?? && systemConfig.iconstr!= ''>${systemConfig.iconstr!''}<#else>www.chatopera.com</#if>" autocomplete="off" class="layui-input">
+												     <input type="text" name="iconstr" value="<#if systemConfig.iconstr?? && systemConfig.iconstr!= ''>${systemConfig.iconstr!''}</#if>" autocomplete="off" class="layui-input">
 												</div>	
 											</div>
 										</div>
@@ -47,7 +47,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">3、产品登录界面和后台管理界面标题</div>
+									<div class="ukefu-webim-tl" style="clear:both;">产品登录界面和后台管理界面标题</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -62,7 +62,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">4、登录页欢迎Logo图片</div>
+									<div class="ukefu-webim-tl" style="clear:both;">登录页欢迎Logo图片</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -87,7 +87,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">5、产品后台管理界面Logo图片</div>
+									<div class="ukefu-webim-tl" style="clear:both;">产品后台管理界面Logo图片</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -112,7 +112,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">6、产品标题栏缩略小图</div>
+									<div class="ukefu-webim-tl" style="clear:both;">产品标题栏缩略小图</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -137,7 +137,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">7、重启或停止对话服务</div>
+									<div class="ukefu-webim-tl" style="clear:both;">重启或停止对话服务</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -153,8 +153,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">8、启用EntIM内部IM功能</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">启用EntIM内部IM功能</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -174,7 +174,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">9、启用权限数据采集功能功能</div>
+									<div class="ukefu-webim-tl" style="clear:both;">启用权限数据采集功能功能</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -192,8 +192,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">10、停止春松客服系统</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">停止春松客服系统</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -208,7 +208,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">11、修改微信接收消息的日志级别</div>
+									<div class="ukefu-webim-tl" style="clear:both;">修改微信接收消息的日志级别</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -224,8 +224,8 @@
 										</div>
 									</div>
 								</div>
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">12、启用服务SSL安全访问</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">启用服务SSL安全访问</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -266,8 +266,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">13、启用涉及重要操作的二次验证密码</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">启用涉及重要操作的二次验证密码</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -310,7 +310,7 @@
 									</div>
 								</div>
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">14、百度地图的Key代码（AK）</div>
+									<div class="ukefu-webim-tl" style="clear:both;">百度地图的Key代码（AK）</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -324,8 +324,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">15、工单系统布局方式</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">工单系统布局方式</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -340,7 +340,7 @@
 								</div>
 								
 								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">16、启用权限控制</div>
+									<div class="ukefu-webim-tl" style="clear:both;">启用权限控制</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -354,8 +354,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">17、启用语音平台模板配置</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">启用语音平台模板配置</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -493,8 +493,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">18、启用工单系统的邮件通知</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">启用工单系统的邮件通知</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
@@ -628,8 +628,8 @@
 									</div>
 								</div>
 								
-								<div class="ukefu-webim-prop">
-									<div class="ukefu-webim-tl" style="clear:both;">19、启用多${systemConfig.namealias!'租户'}管理模式</div>
+								<div class="ukefu-webim-prop" hidden>
+									<div class="ukefu-webim-tl" style="clear:both;">启用多${systemConfig.namealias!'租户'}管理模式</div>
 									<div class="box-item">
 										<div class="row">
 											<div class="col-lg-8">
diff --git a/contact-center/app/src/main/resources/templates/admin/include/left.html b/contact-center/app/src/main/resources/templates/admin/include/left.html
index f680c0e2..f7cce5aa 100644
--- a/contact-center/app/src/main/resources/templates/admin/include/left.html
+++ b/contact-center/app/src/main/resources/templates/admin/include/left.html
@@ -24,9 +24,11 @@
 			<dd <#if subtype?? && (maintype == 'webim' || subtype == 'im')>class="layui-this"</#if>>
 				<a href="/admin/im/index.html">网站列表</a>
 			</dd>
+		    <#if models?? && models["callout"]?? && models["callout"] == true>
 			<dd <#if subtype?? && (maintype == 'callout' || subtype == 'channel')>class="layui-this"</#if>>
 				<a href="/admin/callout/index.html">语音渠道</a>
 			</dd>
+            </#if>
 		</dl>
 	</li>
 	
diff --git a/contact-center/config/sql/cskefu-MySQL-slim.sql b/contact-center/config/sql/cskefu-MySQL-slim.sql
index 51765cbb..c212fc83 100644
--- a/contact-center/config/sql/cskefu-MySQL-slim.sql
+++ b/contact-center/config/sql/cskefu-MySQL-slim.sql
@@ -7834,7 +7834,7 @@ CREATE TABLE `uk_systemconfig` (
 -- Records of uk_systemconfig
 -- ----------------------------
 BEGIN;
-INSERT INTO `uk_systemconfig` VALUES ('2c93809364e0a6d00164ef6722270582', NULL, '春松客服-全渠道智能客服', NULL, 'cskefu', NULL, NULL, NULL, NULL, 'www.chatopera.com', NULL, NULL, '4028cac3614cd2f901614cf8be1f0324', '2018-07-31 08:14:30', NULL, NULL, NULL, NULL, NULL, '01', 'info', 0, NULL, NULL, '', 0, 0, '', '', '', '', '', '', NULL, 0, 0, 0, 0, '', '', NULL, NULL, '', '', NULL, 0, 0, NULL, NULL, NULL, 0, '', NULL, 0, 0, '租户', 0, 0, NULL, NULL, NULL);
+INSERT INTO `uk_systemconfig` VALUES ('2c93809364e0a6d00164ef6722270582', NULL, '春松客服-全渠道智能客服', NULL, 'cskefu', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '4028cac3614cd2f901614cf8be1f0324', '2018-07-31 08:14:30', NULL, NULL, NULL, NULL, NULL, '01', 'info', 0, NULL, NULL, '', 0, 0, '', '', '', '', '', '', NULL, 0, 0, 0, 0, '', '', NULL, NULL, '', '', NULL, 0, 0, NULL, NULL, NULL, 0, '', NULL, 0, 0, '租户', 0, 0, NULL, NULL, NULL);
 COMMIT;
 
 -- ----------------------------