From 1882cd8f4f8ab28e91efd9603fdfc856008f8b2a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 12 Apr 2016 15:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A7=93=E5=90=8D=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/user.rb  | 4 +++-
 app/helpers/api_helper.rb        | 4 ++++
 public/javascripts/wechat/app.js | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb
index 16048c61a..e33c6a845 100644
--- a/app/api/mobile/entities/user.rb
+++ b/app/api/mobile/entities/user.rb
@@ -24,6 +24,8 @@ module Mobile
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.brief_introduction
                 when :student_num
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.student_id
+                when :realname
+                  u.nil? ? "" : get_user_realname(u)
               end
             end
           end
@@ -37,7 +39,7 @@ module Mobile
       #昵称
       expose :nickname
       #真名
-      expose :realname
+      user_expose :realname
       #性别
       user_expose :gender
       #我的二维码
diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb
index bd7ba8751..274bfc552 100644
--- a/app/helpers/api_helper.rb
+++ b/app/helpers/api_helper.rb
@@ -27,6 +27,10 @@ module ApiHelper
     location
   end
 
+  def get_user_realname user
+    name = user.lastname + user.firstname
+    name.empty? || name.nil? ? user.login : name
+  end
 
   def get_assigned_homeworks(homeworks, n, index)
     homeworks += homeworks
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index ddfede164..713c98863 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,6 +1,6 @@
 var app = angular.module('wechat', ['ngRoute','ngCookies']);
 var apiUrl = '/api/v1/';
-var debug = true; //调试标志,如果在本地请置为true
+var debug = false; //调试标志,如果在本地请置为true
 
 if(debug===true){
     apiUrl = 'http://localhost:3000/api/v1/';
@@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
     var _openid = '';
 
     if(debug===true){
-        _openid = "1";
+        _openid = "2";
     }
 
     var getOpenId = function() {