From 95af3a4e928101bbe40962ad5590a093e88eb1a0 Mon Sep 17 00:00:00 2001
From: duke <565572696>
Date: Sat, 7 May 2022 20:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE->=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=A0=87=E9=A2=98=E6=A0=8F=E7=BC=A9=E7=95=A5=E5=B0=8F?=
 =?UTF-8?q?=E5=9B=BE=E9=85=8D=E7=BD=AE=E5=AE=8C=E5=90=8E=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BE=A7=E6=A0=87=E9=A2=98=E6=A0=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/chatopera/cc/controller/apps/IMController.java     | 1 +
 .../app/src/main/resources/templates/apps/im/index.pug     | 7 +++++--
 .../app/src/main/resources/templates/apps/im/mobile.pug    | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java
index c05c29f3..37b53167 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java
@@ -637,6 +637,7 @@ public class IMController extends Handler {
         }
 
         ModelAndView view = request(super.createView("/apps/im/index"));
+        view.addObject("systemConfig", MainUtils.getSystemConfig());
         Optional<BlackEntity> blackOpt = cache.findOneBlackEntityByUserIdAndOrgi(userid, Constants.SYSTEM_ORGI);
         CousultInvite invite = OnlineUserProxy.consult(appid, orgi);
         if (StringUtils.isNotBlank(
diff --git a/contact-center/app/src/main/resources/templates/apps/im/index.pug b/contact-center/app/src/main/resources/templates/apps/im/index.pug
index 124eb0fd..2cada0ae 100644
--- a/contact-center/app/src/main/resources/templates/apps/im/index.pug
+++ b/contact-center/app/src/main/resources/templates/apps/im/index.pug
@@ -20,10 +20,13 @@ html
         meta(name='viewport', content='width=device-width,maximum-scale=1,initial-scale=1,initial-scale=1,user-scalable=no')
         meta(name='apple-mobile-web-app-capable', content='yes')
         title 在线咨询
-        link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
+        if systemConfig != null && systemConfig.favlogo != null
+            link(rel='shortcut icon', type='image/x-icon', href='/res/image.html?id=' + systemConfig.favlogo)
+        else
+            link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
         link(rel='stylesheet', type='text/css', href='/im/css/ukefu.css')
         link#skin(rel='stylesheet', type='text/css', href='/im/css/default/ukefu.css')
-        //  kindeditor 
+        //  kindeditor
         link(rel='stylesheet', type='text/css', href='/im/js/kindeditor/themes/default/default.css')
         script(src='/js/jquery-1.10.2.min.js')
         script(type='text/javascript', src='/im/js/kindeditor/kindeditor.js')
diff --git a/contact-center/app/src/main/resources/templates/apps/im/mobile.pug b/contact-center/app/src/main/resources/templates/apps/im/mobile.pug
index 29bbad86..479a6ce2 100644
--- a/contact-center/app/src/main/resources/templates/apps/im/mobile.pug
+++ b/contact-center/app/src/main/resources/templates/apps/im/mobile.pug
@@ -19,7 +19,10 @@ html
         meta(name='viewport', content='width=device-width,maximum-scale=1,initial-scale=1,initial-scale=1,user-scalable=no')
         meta(name='apple-mobile-web-app-capable', content='yes')
         title 智能客服
-        link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
+        if systemConfig != null && systemConfig.favlogo != null
+            link(rel='shortcut icon', type='image/x-icon', href='/res/image.html?id=' + systemConfig.favlogo)
+        else
+            link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
         link(rel='stylesheet', type='text/css', href='/im/css/ukefu.css')
         link#skin(rel='stylesheet', type='text/css', href='/im/css/default/ukefu.css')
         //  kindeditor