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

app/controllers/accounts_controller.rb

@@ -110,9 +110,9 @@ class AccountsController < ApplicationController
       if user.save!
         sucess_status
       end
-    # rescue Exception => e
-    #   uid_logger_error(e.message)
-    #   tip_exception("密码重置失败，请稍后再试")
+    rescue Exception => e
+      uid_logger_error(e.message)
+      tip_exception("密码重置失败")
     end
   end
 

app/views/myshixuns/update_file.json.jbuilder

@@ -1,4 +1,4 @@
 json.content @content
 json.resubmit "#{@resubmit}"
 json.sec_key "#{@sec_key}"
-json.content_modified @hide_code ? false : @content_modified
+json.content_modified @hide_code ? 0 : @content_modified