From df41f7328f550e8156c2014d09d58adc4b7fee37 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 4 May 2016 17:25:24 +0800
Subject: [PATCH] =?UTF-8?q?json=E8=A7=A3=E6=9E=90=E6=8D=A2=E6=88=90rails?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/sso_controller.rb b/app/controllers/sso_controller.rb
index 23da4678f..73982ae9c 100644
--- a/app/controllers/sso_controller.rb
+++ b/app/controllers/sso_controller.rb
@@ -34,7 +34,7 @@ class SsoController < ApplicationController
     pkey = OpenSSL::PKey::RSA.new(File.new(File.join(Rails.root,"config/private.key")))
     content = pkey.private_decrypt(crypted_str,OpenSSL::PKey::RSA::PKCS1_PADDING)
     # content = pkey.private_decrypt(crypted_str)
-    JSON.parser(content)
+    ActiveSupport::JSON.decode(content)
   end
 
   def login(id)