Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

app/helpers/application_helper.rb

@@ -258,7 +258,7 @@ module ApplicationHelper
   end
 
   def download_url attachment
-    attachment_path(attachment).gsub("/api","")
+    attachment_path(attachment)
   end
 
   # 耗时：天、小时、分、秒

app/views/games/picture_display.json.jbuilder

@@ -21,7 +21,7 @@ if @type == "image"
 elsif @type == "html"
   json.iframe_src File.read("#{@user_path}/#{@user_picture[0]}")&.html_safe
 elsif @type == "txt"
-  json.contents @contents.html_safe
+  json.contents @contents.to_s
 elsif @type =="qrcode"
   json.qrcode_str @qrcode_str
 elsif @type == "mp3" || @type == "mp4"