提交 44a20cd6 编写于 作者: Y Yu

fix #421 encode im inject url

上级 fe4ddd24
......@@ -294,4 +294,4 @@ Chatopera 机器人平台包括知识库、多轮对话、意图识别和语音
<a href="https://bot.chatopera.com" target="_blank">
<img src="https://static-public.chatopera.com/assets/images/64531083-3199aa80-d341-11e9-86cd-3a3ed860b14b.png" width="800">
</a>
</p>
</p>
\ No newline at end of file
......@@ -10,7 +10,7 @@ ENV APPLICATION_CUSTOMER_ENTITY=$APPLICATION_CUSTOMER_ENTITY
ENV APPLICATION_BUILD_DATESTR=$APPLICATION_BUILD_DATESTR
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
# install amazon jdk corretto
......@@ -47,4 +47,4 @@ RUN chmod +x /opt/chatopera/*.sh
WORKDIR /opt/chatopera
EXPOSE 8030-8050
CMD ["./docker-entrypoint.sh"]
\ No newline at end of file
CMD ["./docker-entrypoint.sh"]
......@@ -696,7 +696,7 @@ public class IMController extends Handler {
map.addAttribute("title", title);
}
if (StringUtils.isNotBlank(traceid)) {
map.addAttribute("url", url);
map.addAttribute("url", URLEncoder.encode(url,"utf-8"));
}
map.addAttribute("cskefuport", request.getServerPort());
......
......@@ -15,7 +15,6 @@ html
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/lang/zh-CN.js')
script(type='text/javascript', src='/im/js/html2canvas.js')
script(src='/im/js/socket.io.js')
script(src='/im/js/dayjs.min.js')
script(type='text/javascript').
......@@ -25,11 +24,10 @@ html
newmessage['mp3'] = '/images/message.mp3';
ring['mp3'] = '/images/ring.mp3';
KindEditor.lang({
html2canvas: '截图',
evaluation: '满意度评价'
});
KindEditor.ready(function (K) {
var items = ['emoticons', 'image', 'insertfile', 'html2canvas', 'evaluation'];
var items = ['emoticons', 'image', 'insertfile', 'evaluation'];
if (window.opener == null) {
items = ['emoticons', 'image', 'insertfile', 'evaluation'];
}
......@@ -48,7 +46,6 @@ html
filterMode: true,
items: items,
// items: ['emoticons', 'image', 'html2canvas'], //w4l客户需求,访客不允许上传文件
htmlTags: {
img: ['src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
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';}";
var R3Ajax = {
ajax: function (opt) {
......@@ -352,13 +339,6 @@ html
// kindeditor
style.
.ke-icon-html2canvas {
background-image: url(img/cutimage.png);
background-position: 0px 0px;
width: 16px;
height: 16px;
}
.ke-icon-evaluation {
background-image: url(img/evaluationa.png);
background-position: 0px 0px;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册