Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

app/api/mobile/middleware/error_handler.rb

@@ -7,7 +7,7 @@ module Mobile
           @app.call(@env)
         rescue =>e
           message = {status: 1, message: e.message }.to_json
-          puts(e.backtrace.join("\n")) if Rails.env.development?
+          Rails.logger.error e
           status = 200
           headers = { 'Content-Type' => content_type }
           Rack::Response.new([message], status, headers).finish

app/models/mailer.rb

@@ -1143,7 +1143,7 @@ class Mailer < ActionMailer::Base
                   color:"#173177"
               },
               keyword3:{
-                  value:h(truncate(key3, :length=>50, :omission=> '...')),
+                  value:key3,
                   color:"#173177"
               },
               remark:{