Merge branch 'develop' into dev_aliyun

app/controllers/concerns/controller_rescue_handler.rb

@@ -2,10 +2,10 @@ module ControllerRescueHandler
   extend ActiveSupport::Concern
 
   included do
-    rescue_from Exception do |e|
+    # rescue_from Exception do |e|
-      Util.logger_error e
+    #   Util.logger_error e
-      render json: {status: -1, message: "接口异常"}
+    #   render json: {status: -1, message: "接口异常"}
-    end
+    # end
     rescue_from Mysql2::Error do |e|
       Util.logger_error e
       render json: {status: -1, message: "接口数据异常"}
@@ -24,8 +24,9 @@ module ControllerRescueHandler
     rescue_from ActiveRecord::RecordInvalid do |ex|
       render_error(ex.record.errors.full_messages.join(','))
     end
-    rescue_from RuntimeError do |ex|
+    # rescue_from RuntimeError do |ex|
-      render_error(ex.message)
+    #   Util.logger_error "#######ex:#{ex}"
-    end
+    #   render_error(ex.message)
+    # end
   end
 end