github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-07-24 08:31:45 +08:00
Code Issues Releases Wiki Activity

Merge branch 'osc' of github.com:chatopera/cskefu into osc

Browse Source
This commit is contained in:
Hai Liang Wang 2022-05-29 10:27:03 +08:00
commit 9175c2c924
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java
View File

@ -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(

7
contact-center/app/src/main/resources/templates/apps/im/index.pug
View File

@ -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')

5
contact-center/app/src/main/resources/templates/apps/im/mobile.pug
View File

@ -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