From e9ab2a482b056c8faadcf7d778b5c9fd4fff8d0d Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 8 Apr 2016 14:17:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?key3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2a429f6cd..ce9474cf0 100644
--- a/app/models/mailer.rb
+++ b/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:{

From 5241dddca2337010cde1e099f65c3d5c5d8170f5 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 8 Apr 2016 14:38:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=88=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/middleware/error_handler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/mobile/middleware/error_handler.rb b/app/api/mobile/middleware/error_handler.rb
index 018191d8d..567c4519b 100644
--- a/app/api/mobile/middleware/error_handler.rb
+++ b/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