Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/users/private_message_details_controller.rb

@@ -3,6 +3,8 @@ class Users::PrivateMessageDetailsController < Users::BaseController
 
   after_action :update_message_status, only: [:show]
 
+  helper_method :target_user
+
   def show
     messages = observed_user.private_messages.without_deleted.where(target: target_user)
 

app/services/users/update_account_service.rb

@@ -69,7 +69,7 @@ class Users::UpdateAccountService < ApplicationService
   end
 
   def sms_notify_admin name
-    Educoder::Sms.send(mobile:'18182021083', send_type:'teacher_register', name: name, user_name:'管理员')
+    Educoder::Sms.send(mobile:'18175896138', send_type:'teacher_register', name: name, user_name:'管理员')
   rescue => ex
     Util.logger_error(ex)
   end

app/views/users/private_message_details/show.json.jbuilder

@@ -1,9 +1,13 @@
 json.count @count
+json.target do
+  json.partial! 'users/user_simple', user: target_user
+end
 json.messages do
   json.array! @messages.each do |message|
     json.extract! message, :id, :user_id, :receiver_id, :sender_id, :content
 
     json.send_time message.display_send_time
+    json.send_day message.send_time.strftime('%Y-%m-%d')
     json.sender do
       json.partial! 'users/user_simple', user: message.sender
     end

lib/educoder/sms.rb

@@ -21,7 +21,7 @@ module  Educoder
 
     def self.notify_admin(opt)
       opt[:name]   = '管理员'
-      opt[:mobile] = ENV['NOTIFY_ADMIN_PHONE'] || EduSetting.get('notify_admin_phone') || '18182021083'
+      opt[:mobile] = ENV['NOTIFY_ADMIN_PHONE'] || EduSetting.get('notify_admin_phone') || '18711085785'
       send(opt)
     end