From 4d19ea1fde22276760a996d5f83ba44b2167defb Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 15:31:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?codepedia=E9=82=AE=E7=AE=B1=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/sources_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/services/sources_service.rb b/app/services/sources_service.rb
index aa95d382..e5857b52 100644
--- a/app/services/sources_service.rb
+++ b/app/services/sources_service.rb
@@ -171,7 +171,8 @@ class SourcesService
 
   def get_user_info params
     user = User.find params[:id]
-    {username: user.show_real_name, user_id: user.id, email: user.mail, phone: user.phone, sex: user.sex, school_name: user.school_name}
+    mail = user.mail.presence || "login@educoder.net"
+    {username: user.show_real_name, user_id: user.id, email: mail, phone: user.phone, sex: user.sex, school_name: user.school_name}
   end
 
   # courses start ############################################

From 78ed0a44516d4efdad89b8d6a97f386f6d551bb8 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 16:39:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=9B=B4=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=BF=90=E8=90=A5=E4=BA=BA=E5=91=98=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 98b58614..b1eee18d 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -3,7 +3,7 @@ class ManagementsController < ApplicationController
   before_filter :require_business
   before_filter :require_admin, :only => [:shixun_setting_list, :mirror_repository, :mirror_picture_shixuns, :editmd_template,
                                           :editmd_template, :subject_level_system, :subject_setting_list,
-                                          :shixun_authorization, :ec_template, :codemirror_template,
+                                          :shixun_authorization, :ec_template, :codemirror_template, :update_user,
                                           :course_guide_template, :shixun_quality_score, :tech_system, :update_notice, :setting_banner,
                                           :training_2018, :create_standard]
   layout 'base_management'