github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

fix #421 encode im inject url

Browse Source
This commit is contained in:
Yu 2021-03-17 18:12:20 +08:00
parent fe4ddd2405
commit 44a20cd6b0
4 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contact-center/Dockerfile
View File

@ -10,7 +10,7 @@ ENV APPLICATION_CUSTOMER_ENTITY=$APPLICATION_CUSTOMER_ENTITY
ENV APPLICATION_BUILD_DATESTR=$APPLICATION_BUILD_DATESTR ENV APPLICATION_BUILD_DATESTR=$APPLICATION_BUILD_DATESTR
LABEL org.label-schema.vcs-ref=$VCS_REF \ LABEL org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url="https://github.com/chatopera/cosin" org.label-schema.vcs-url="https://github.com/chatopera/cskefu"
# COPY $PWD/assets/aliyun.sources.list /etc/apt/sources.list # COPY $PWD/assets/aliyun.sources.list /etc/apt/sources.list
# install amazon jdk corretto # install amazon jdk corretto

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

@ -696,7 +696,7 @@ public class IMController extends Handler {
map.addAttribute("title", title); map.addAttribute("title", title);
} }
if (StringUtils.isNotBlank(traceid)) { if (StringUtils.isNotBlank(traceid)) {
map.addAttribute("url", url); map.addAttribute("url", URLEncoder.encode(url,"utf-8"));
} }
map.addAttribute("cskefuport", request.getServerPort()); map.addAttribute("cskefuport", request.getServerPort());

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

@ -15,7 +15,6 @@ html
script(src='/js/jquery-1.10.2.min.js') script(src='/js/jquery-1.10.2.min.js')
script(type='text/javascript', src='/im/js/kindeditor/kindeditor.js') script(type='text/javascript', src='/im/js/kindeditor/kindeditor.js')
script(type='text/javascript', src='/im/js/kindeditor/lang/zh-CN.js') script(type='text/javascript', src='/im/js/kindeditor/lang/zh-CN.js')
script(type='text/javascript', src='/im/js/html2canvas.js')
script(src='/im/js/socket.io.js') script(src='/im/js/socket.io.js')
script(src='/im/js/dayjs.min.js') script(src='/im/js/dayjs.min.js')
script(type='text/javascript'). script(type='text/javascript').
@ -25,11 +24,10 @@ html
newmessage['mp3'] = '/images/message.mp3'; newmessage['mp3'] = '/images/message.mp3';
ring['mp3'] = '/images/ring.mp3'; ring['mp3'] = '/images/ring.mp3';
KindEditor.lang({ KindEditor.lang({
html2canvas: '截图',
evaluation: '满意度评价' evaluation: '满意度评价'
}); });
KindEditor.ready(function (K) { KindEditor.ready(function (K) {
var items = ['emoticons', 'image', 'insertfile', 'html2canvas', 'evaluation']; var items = ['emoticons', 'image', 'insertfile', 'evaluation'];
if (window.opener == null) { if (window.opener == null) {
items = ['emoticons', 'image', 'insertfile', 'evaluation']; items = ['emoticons', 'image', 'insertfile', 'evaluation'];
} }
@ -48,7 +46,6 @@ html
filterMode: true, filterMode: true,
items: items, items: items,
// items: ['emoticons', 'image', 'html2canvas'], //w4l客户需求，访客不允许上传文件
htmlTags: { htmlTags: {
img: ['src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'], img: ['src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
br: [] br: []
@ -159,16 +156,6 @@ html
}); });
}); });
KindEditor.plugin('html2canvas', function (K) {
var editor = this, name = 'html2canvas';
editor.clickToolbar(name, function () {
if (window.opener != null) {
window.opener.postMessage('screenshots', "*");
} else {
alert('无法截图，请打开页面')
}
});
});
KindEditor.options.cssData = "body { font-size: 15px; font-family:'Microsoft Yahei', 'Helvetica', 'Simsun', 'Arial';}"; KindEditor.options.cssData = "body { font-size: 15px; font-family:'Microsoft Yahei', 'Helvetica', 'Simsun', 'Arial';}";
var R3Ajax = { var R3Ajax = {
ajax: function (opt) { ajax: function (opt) {
@ -352,13 +339,6 @@ html
// kindeditor // kindeditor
style. style.
.ke-icon-html2canvas {
background-image: url(img/cutimage.png);
background-position: 0px 0px;
width: 16px;
height: 16px;
}
.ke-icon-evaluation { .ke-icon-evaluation {
background-image: url(img/evaluationa.png); background-image: url(img/evaluationa.png);
background-position: 0px 0px; background-position: 0px 0px;