提交 75713571 编写于 作者: O o2null

Merge branch 'fix/loadText' into 'release'

增加loader对纯文本的判断

See merge request o2oa/o2oa!618

(cherry picked from commit 4de57c87)

dd9717a9 增加loader对纯文本的判断
上级 3fd9f3f5
......@@ -556,7 +556,13 @@ class ActionCreate extends BaseAction {
Message message = new Message();
EvalMessage evalMessage = this.v3Load(wi, consumer.getLoader());
if (null != evalMessage) {
message.setBody(gson.toJson(evalMessage.getBody()));
JsonElement jsonElement = evalMessage.getBody();
// 如果脚本直接返回HTML或者text那么直接输出
if (jsonElement.isJsonPrimitive()) {
message.setBody(jsonElement.getAsJsonPrimitive().getAsString());
} else {
message.setBody(gson.toJson(evalMessage.getBody()));
}
message.setTitle(evalMessage.getTitle());
message.setPerson(evalMessage.getPerson());
} else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册