Merge branch 'dev_aliyun' into develop

app/controllers/concerns/controller_rescue_handler.rb

@@ -2,10 +2,10 @@ module ControllerRescueHandler
   extend ActiveSupport::Concern
 
   included do
-    # rescue_from Exception do |e|
-    #   Util.logger_error e
-    #   render json: {status: -1, message: "接口异常"}
-    # end
+    rescue_from Exception do |e|
+      Util.logger_error e
+      render json: {status: -1, message: e.message}
+    end
     rescue_from Mysql2::Error do |e|
       Util.logger_error e
       render json: {status: -1, message: "接口数据异常"}

app/controllers/users/authentication_applies_controller.rb

@@ -6,7 +6,7 @@ class Users::AuthenticationAppliesController < Users::BaseAccountController
     Users::ApplyAuthenticationService.call(observed_user, create_params)
     render_ok
   rescue ApplicationService::Error => ex
-    tip_exception(ex.message)
+    render_error(ex.message)
   end
 
   def destroy