Merge branch 'cherry-pick-9aa9f1d6' into 'feat/jiaqian'

Merge branch 'cherry-pick-4de57c87' into 'develop'

See merge request o2oa/o2oa!620

o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java

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