Merge branch 'master' of http://git.sotype.com/chenxiqiang/houseworking

manage-server/app/Http/Controllers/CommonController.php

@@ -30,15 +30,16 @@ class CommonController extends Controller
             return response()->json([
                 "status" => 0,
                 "data" => [
-                    "token" => sha1($auth->openid . $auth->access_token)
+                    "openid" => $auth["openid"],
+                    "token" => sha1($auth["openid"] . $auth["session_key"])
                 ]]);
         } else if(array_key_exists("errcode", $auth)){
             return response()->json([
-                "status" => $auth->errcode,
-                "message" => $auth->errmsg]);
+                "status" => $auth["errcode"],
+                "message" => $auth["errmsg"]]);
         } else {
             return response()->json([
-                "status" => -1, 
+                "status" => -1,
                 "data" => $auth
             ]);
         }