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

app/controllers/users/private_message_details_controller.rb

@@ -7,7 +7,7 @@ class Users::PrivateMessageDetailsController < Users::BaseController
     messages = observed_user.private_messages.without_deleted.where(target: target_user)
 
     @count    = messages.count
-    @messages = messages.order(send_time: :asc).includes(sender: :user_extension)
+    @messages = paginate messages.order(send_time: :desc).includes(sender: :user_extension)
   end
 
   private

app/services/search_shixun_service.rb

@@ -1,96 +0,0 @@
-class SearchShixunService < ApplicationService
-  include ElasticsearchAble
-
-  attr_reader :user, :params
-
-  def initialize(user, params)
-    @user   = user
-    @params = params
-  end
-
-  def call
-    Shixun.search(keyword,
-                  fields: search_fields,
-                  where: where_clauses,
-                  order: order_clauses,
-                  includes: includes_clauses,
-                  page: page,
-                  per_page: per_page)
-  end
-
-  private
-
-  def tag_filter_shixun_ids
-    return [] if params[:tag_level].to_i == 0 || params[:tag_id].blank?
-
-    case params[:tag_level].to_i
-    when 1 then
-      Repertoire.find(params[:tag_id]).tag_repertoires.joins(:shixun_tag_repertoires)
-        .pluck('shixun_tag_repertoires.shixun_id')
-    when 2 then
-      SubRepertoire.find(params[:tag_id]).tag_repertoires.joins(:shixun_tag_repertoires)
-        .pluck('shixun_tag_repertoires.shixun_id')
-    when 3 then
-      TagRepertoire.find(params[:tag_id]).shixun_tag_repertoires.pluck(:shixun_id)
-    else
-      []
-    end
-  end
-
-  def user_filter_shixun_ids
-    return [] if params[:order_by] != 'mine'
-
-    user.shixun_members.pluck(:shixun_id) + user.myshixuns.pluck(:shixun_id)
-  end
-
-  def keyword
-    params[:keyword].to_s.strip.presence || '*'
-  end
-
-  def search_fields
-    %w(name^10 author_name challenge_names description challenge_tag_names)
-  end
-
-  def where_clauses
-    hash = {}
-
-    ids = user_filter_shixun_ids + tag_filter_shixun_ids
-    hash[:id] = ids if ids.present?
-
-    if params[:order_by] == 'mine'
-      hash[:status] = { not: -1 }
-    else
-      hash.merge!(hidden: false, status: 2)
-    end
-
-    unless params[:status].to_i.zero?
-      params[:status] = [0, 1] if params[:status].to_i == 1
-      hash[:status] = params[:status]
-    end
-
-    hash[:trainee] = params[:diff].to_i unless params[:diff].to_i.zero?
-
-    hash
-  end
-
-  def includes_clauses
-    []
-  end
-
-  def order_clauses
-    hash = { _score: :desc }
-    publish_order = { type: 'number', order: :desc, script: 'doc["status"].value=="2" ? 1 : 0' }
-
-    sort = params[:sort].to_s.strip == 'asc' ? 'asc' : 'desc'
-    clauses =
-      case params[:order_by].presence
-      when 'new'  then { _script: publish_order, created_at: sort }
-      when 'hot'  then { _script: publish_order, myshixuns_count: sort }
-      when 'mine' then { created_at: sort }
-      else { _script: publish_order, publish_time: sort }
-      end
-    hash.merge!(clauses)
-
-    hash
-  end
-end

app/services/users/update_account_service.rb

@@ -52,7 +52,7 @@ class Users::UpdateAccountService < ApplicationService
     if first_full_reward
       RewardGradeService.call(user, container_id: user.id, container_type: 'Account', score: 500)
 
-      sms_notify_admin if extension.teacher?
+      sms_notify_admin(user.lastname) if user.user_extension.teacher?
     end
 
     user
@@ -68,8 +68,8 @@ class Users::UpdateAccountService < ApplicationService
     params.slice(*%i[location location_city identity student_id technical_title school_id department_id])
   end
 
-  def sms_notify_admin
+  def sms_notify_admin name
-    Educoder::Sms.send(mobile:'18182021083', send_type:'teacher_register', name:'管理员')
+    Educoder::Sms.send(mobile:'18182021083', send_type:'teacher_register', name: name, user_name:'管理员')
   rescue => ex
     Util.logger_error(ex)
   end

public/react/public/css/edu-all.css

@@ -3416,3 +3416,7 @@ a.singlepublishtwo{
 .shaiContent li.shaiItem:hover i.iconfont{
     color: #4CACFF!important
 }
+
+.detail_for_paragraph p{
+    white-space: pre-wrap;
+}

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -32,14 +32,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?7`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?7`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?7`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')

public/stylesheets/educoder/edu-all.css

@@ -3712,3 +3712,7 @@ a.singlepublishtwo{
 .shaiContent li.shaiItem:hover i.iconfont{
     color: #4CACFF!important
 }
+
+.detail_for_paragraph p{
+    white-space: pre-wrap;
+}