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

app/controllers/users_controller.rb

@@ -51,6 +51,13 @@ class UsersController < ApplicationController
               :disposition => 'attachment' #inline can open in browser
   end
 
+  def html_show
+    @contents = File.read("#{params[:path]}")
+    respond_to do |format|
+      format.html {render :layout => false}
+    end
+  end
+
   # Redo: 消息总数缓存
   def get_navigation_info
     @old_domain = edu_setting('old_edu_host')

app/views/users/html_show.html.erb

@@ -0,0 +1 @@
+<%= @contents.html_safe %>

config/routes.rb

@@ -58,6 +58,7 @@ Rails.application.routes.draw do
         post :unfollow
         get :get_user_info
         get :attachment_show
+        get :html_show
         get :get_navigation_info
         post :reply_message
         get :search_user_projects