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

app/assets/javascripts/forums.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/memos.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/stylesheets/forums.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the forums controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/concerns/paginate_helper.rb

@@ -1,7 +1,7 @@
 module PaginateHelper
   def paginate(objs, **opts)
     page     = params[:page].to_i <= 0 ? 1 : params[:page].to_i
-    per_page = params[:per_page].to_i > 0 ? params[:per_page].to_i : opts[:per_page] || 20
+    per_page = params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : opts[:per_page] || 20
 
     Kaminari.paginate_array(objs).page(page).per(per_page)
   end

app/controllers/exercises_controller.rb

@@ -1256,13 +1256,15 @@ class ExercisesController < ApplicationController
             normal_status(-1,"试卷未发布")
           elsif (@exercise_users_size == 0) || ( @export_ex_users&.exercise_user_committed.size == 0)
             normal_status(-1,"暂无用户提交")
+          elsif params[:export].present? && params[:export]
+            normal_status(0,"正在下载中")
           else
             respond_to do |format|
               format.xlsx{
                 get_export_users(@exercise,@course,@export_ex_users)
                 exercise_export_name_ =
                     "#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
-                render xlsx: "#{exercise_export_name_.strip}",template: "exercises/exercise_lists.xlsx.axlsx",locals: {table_columns:@table_columns,exercise_users:@user_columns}
+                render xlsx: "#{exercise_export_name_.strip}",template: "exercises/exercise_lists.xlsx.axlsx",locals: {table_columns:@table_columns,exercise_users:@user_columns},cookies:{fileDownload:true,HttpOnly:false}
               }
             end
           end
@@ -1281,7 +1283,11 @@ class ExercisesController < ApplicationController
     @exercise_questions = @exercise.exercise_questions.includes(:exercise_choices).order("question_number ASC")
     filename_ = "#{@exercise.user.real_name}_#{@course.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
     stylesheets = "#{Rails.root}/app/templates/exercise_export/exercise_export.css"
-    render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets
+    if params[:export].present? && params[:export]
+      normal_status(0,"正在下载中")
+    else
+      render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets,cookies:{fileDownload:true,HttpOnly:false}
+    end
   end
 
   #空白试卷预览页面,仅供测试使用，无其他任何用途

app/controllers/forums_controller.rb

@@ -0,0 +1,2 @@
+class ForumsController < ApplicationController
+end

app/controllers/homework_commons_controller.rb

@@ -207,19 +207,23 @@ class HomeworkCommonsController < ApplicationController
           tip_exception(403, "无权限操作")
         elsif @work_excel.blank? || @work_excel.size == 0
           normal_status(-1,"暂无用户提交！")
+        elsif params[:export].present? && params[:export]
+          normal_status(0,"正在下载中")
         else
           respond_to do |format|
             format.xlsx{
               student_work_to_xlsx(@work_excel,@homework)
               exercise_export_name = "#{current_user.real_name}_#{@course.name}_#{@homework.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
               render xlsx: "#{exercise_export_name.strip}",template: "homework_commons/works_list.xlsx.axlsx",locals:
-                  {table_columns: @work_head_cells,task_users: @work_cells_column}
+                  {table_columns: @work_head_cells,task_users: @work_cells_column},cookies:{fileDownload:true,HttpOnly:false}
             }
           end
         end
       elsif params[:format] == "zip"
         if @user_course_identity >= Course::STUDENT
           tip_exception(403, "无权限操作")
+        elsif params[:export].present? && params[:export]
+          normal_status(0,"正在下载中")
         else
           if @work_excel.present?
             zip_works = @work_excel&.where("work_status > 0")
@@ -233,7 +237,7 @@ class HomeworkCommonsController < ApplicationController
               format.zip{
                 zipfile = zip_homework_common @homework, zip_works
                 file = decode64(zipfile[0][:base64file])
-                send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
+                send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip',cookies:{fileDownload:true,HttpOnly:false}
               }
             end
           else

app/controllers/memos_controller.rb

@@ -66,9 +66,7 @@ class MemosController < ApplicationController
 
   # GET /memos/new
   def new
-    @csrf_token = session[:_csrf_toke] ||= SecureRandom.base64(32)
     @tag_list = TagRepertoire.field_for_list.order("name asc")
-
   end
 
   # GET /memos/1/edit

app/controllers/shixuns_controller.rb

@@ -714,6 +714,7 @@ class ShixunsController < ApplicationController
 					end
 				end
 			rescue Exception => e
+				logger.info("shixun_exec error: #{e.message}")
 				if e.message != "ActiveRecord::RecordInvalid"
 					logger.error("##########project_fork error #{e.message}")
 					@myshixun.destroy!

app/controllers/users/base_controller.rb

@@ -26,9 +26,22 @@ class Users::BaseController < ApplicationController
     render_forbidden
   end
 
+  def page_value
+    params[:page].to_i <= 0 ? 1 : params[:page].to_i
+  end
+
+  def per_page_value
+    params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : 20
+  end
+  alias_method :limit_value, :per_page_value
+
+  def offset_value
+    (page_value - 1) * limit_value
+  end
+
   def paginate(objs, **opts)
-    page     = params[:page].to_i <= 0 ? 1 : params[:page].to_i
+    page     = page_value
-    per_page = params[:per_page].to_i > 0 ? params[:per_page].to_i : 20
+    per_page = per_page_value
 
     return Kaminari.paginate_array(objs).page(page).per(per_page) unless observed_logged_user? && opts[:special]
 

app/controllers/users/private_message_details_controller.rb

@@ -0,0 +1,23 @@
+class Users::PrivateMessageDetailsController < Users::BaseController
+  before_action :private_user_resources!
+
+  after_action :update_message_status, only: [:show]
+
+  def show
+    messages = observed_user.private_messages.without_deleted.where(target: target_user)
+
+    @count    = messages.count
+    @messages = messages.order(send_time: :asc).includes(sender: :user_extension)
+  end
+
+  private
+
+  def target_user
+    @_target_user ||= User.find(params[:target_id])
+  end
+
+  # 置为已读
+  def update_message_status
+    observed_user.private_messages.only_unread.where(target: target_user).update_all(status: 1)
+  end
+end

app/controllers/users/private_messages_controller.rb

@@ -0,0 +1,39 @@
+class Users::PrivateMessagesController < Users::BaseController
+  before_action :private_user_resources!
+  after_action :update_onclick_time!, only: [:index]
+
+  def index
+    @count = observed_user.private_messages.without_deleted.group(:target_id).count.count
+
+    subquery = observed_user.private_messages.without_deleted.order(send_time: :desc).to_sql
+    query = "SELECT subquery.*, COUNT(*) message_count FROM (#{subquery}) subquery "\
+            "GROUP BY subquery.target_id ORDER BY subquery.send_time desc LIMIT #{limit_value} OFFSET #{offset_value}"
+    @messages = PrivateMessage.select('*').from("(#{query}) AS query").includes(target: :user_extension)
+  end
+
+  def create
+    receiver = User.find_by(id: params[:target_id])
+    return render_error('用户未找到') if receiver.blank?
+
+    @message = PrivateMessages::CreateService.call(observed_user, receiver, create_params)
+  rescue PrivateMessages::CreateService::Error => ex
+    render_error(ex.message)
+  end
+
+  def destroy
+    message = observed_user.private_messages.without_deleted.find(params[:id])
+    message.destroy!
+
+    render_ok
+  end
+
+  private
+
+  def update_onclick_time!
+    current_user.onclick_time.touch(:onclick_time)
+  end
+
+  def create_params
+    params.permit(:content)
+  end
+end

app/controllers/users/recent_contacts_controller.rb

@@ -0,0 +1,8 @@
+class Users::RecentContactsController < Users::BaseController
+  before_action :private_user_resources!
+
+  def index
+    contacts  = observed_user.recent_contacts.distinct
+    @contacts = contacts.order('private_messages.created_at DESC').limit(10).includes(:user_extension)
+  end
+end

app/controllers/users/unread_message_infos_controller.rb

@@ -0,0 +1,12 @@
+class Users::UnreadMessageInfosController < Users::BaseController
+  before_action :private_user_resources!
+
+  def show
+    click_time = observed_user.click_time
+
+    unread_tiding_count  = observed_user.tidings.where('created_at > ?', click_time).count
+    unread_message_count = observed_user.private_messages.only_unread.group(:target_id).count.count
+
+    render_ok(unread_tiding_count: unread_tiding_count, unread_message_count: unread_message_count)
+  end
+end

app/controllers/users_for_private_messages_controller.rb

@@ -0,0 +1,17 @@
+class UsersForPrivateMessagesController < ApplicationController
+  before_action :require_login, :check_auth
+
+  def index
+    users = User.active.where.not(id: current_user.id)
+
+    keyword = params[:keyword].to_s.strip
+    if keyword.blank?
+      @users = []
+      return
+    end
+
+    users = users.where('LOWER(concat(lastname, firstname, nickname)) LIKE ?', "%#{keyword}%")
+
+    @users = users.limit(10).includes(:user_extension)
+  end
+end

app/controllers/zips_controller.rb

@@ -8,7 +8,12 @@ class ZipsController < ApplicationController
   def shixun_report
     service = BatchExportShixunReportService.new(@homework, @all_student_works)
     filename_ = filename_for_content_disposition(service.filename)
-    send_file service.zip, filename: filename_, type: 'application/zip'
+    if params[:export].present? && params[:export]
+      normal_status(0,"正在下载中")
+    else
+      send_file service.zip, filename: filename_, type: 'application/zip',cookies:{fileDownload:true,HttpOnly:false}
+    end
+
   rescue BatchExportShixunReportService::Error => ex
     normal_status(-1, ex.message)
   end
@@ -18,7 +23,11 @@ class ZipsController < ApplicationController
     exercises = ExportExercisesService.new(@exercise,@ex_users,@request_url)
 
     file_name_ = filename_for_content_disposition(exercises.filename)
-    send_file exercises.ex_zip, filename: file_name_, type: 'application/zip'
+    if params[:export].present? && params[:export]
+      normal_status(0,"正在下载中")
+    else
+      send_file exercises.ex_zip, filename: file_name_, type: 'application/zip', cookies:{fileDownload:true,HttpOnly:false}
+    end
   rescue Exception => e
     normal_status(-1, e.message)
   end

app/decorators/private_message_decorator.rb

@@ -0,0 +1,9 @@
+module PrivateMessageDecorator
+  extend ApplicationDecorator
+
+  display_time_method :send_time
+
+  def unread?
+    status.zero?
+  end
+end

app/helpers/export_helper.rb

@@ -497,7 +497,7 @@ module ExportHelper
   def make_zip_name(work, file_name="")
     Rails.logger.info("######################file_name: #{file_name}")
     # name = file_name === "" ? "" : (file_name[0, file_name.rindex('.')]+"_")
-    "#{work&.user&.student_id}_#{work.&user.&real_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
+    "#{work&.user&.student_id}_#{work&.user&.real_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
   end
 
   def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])

app/helpers/forums_helper.rb

@@ -0,0 +1,2 @@
+module ForumsHelper
+end

app/helpers/memos_helper.rb

@@ -1,2 +1,6 @@
 module MemosHelper
+
+  def forum_list
+    [{id: 5, name: "技术分享"}, {id: 3, name: "操作指南"}]
+  end
 end

app/models/forum.rb

@@ -0,0 +1,2 @@
+class Forum < ApplicationRecord
+end

app/models/memo.rb

@@ -1,7 +1,9 @@
 class Memo < ApplicationRecord
   include Searchable::Memo
 
-  has_many :memo_tag_repertoires, :dependent => :destroy
+  belongs_to :forum, touch: true
+
+  has_many :memo_tag_repertoires, dependent: :destroy
   has_many :tag_repertoires, :through => :memo_tag_repertoires
 
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy

app/models/private_message.rb

@@ -1,3 +1,9 @@
 class PrivateMessage < ApplicationRecord
   belongs_to :user
+  belongs_to :target, class_name: "User"
+  belongs_to :sender, class_name: "User"
+  belongs_to :receiver, class_name: "User"
+
+  scope :without_deleted, -> { where.not(status: 2) }
+  scope :only_unread, -> { where(status: 0) }
 end

app/models/tiding.rb

@@ -13,9 +13,14 @@ class Tiding < ApplicationRecord
       value = container.try(:identifier)
     end
 
+    if value.blank? && parent_container_type && Object.const_defined?(parent_container_type)
+      value = parent_container_type.try(:identifier)
+    end
+
     if value.blank? && belong_container_type && Object.const_defined?(belong_container_type)
       value = belong_container.try(:identifier)
     end
+
     value
   end
 end

app/models/user.rb

@@ -54,7 +54,8 @@ class User < ApplicationRecord
   has_one :onclick_time, :dependent => :destroy
 
   # 新版私信
-  has_many :private_messages, :dependent => :destroy
+  has_many :private_messages, dependent: :destroy
+  has_many :recent_contacts, through: :private_messages, source: :target
   has_many :tidings, :dependent => :destroy
 
   has_many :games, :dependent => :destroy

app/services/private_messages/create_service.rb

@@ -0,0 +1,35 @@
+class PrivateMessages::CreateService < ApplicationService
+  Error = Class.new(StandardError)
+
+  attr_reader :sender, :receiver, :params
+
+  def initialize(sender, receiver, **params)
+    @sender   = sender
+    @receiver = receiver
+    @params   = params
+  end
+
+  def call
+    validate!
+
+    same_attr = { sender: sender, receiver: receiver, content: content, send_time: Time.now }
+
+    message = nil
+    ActiveRecord::Base.transaction do
+      message = sender.private_messages.create!(same_attr.merge(target: receiver, status: 1))
+      receiver.private_messages.create!(same_attr.merge(target: sender, status: 0))
+    end
+    message
+  end
+
+  private
+
+  def content
+    @_content ||= params[:content].to_s.strip
+  end
+
+  def validate!
+    raise Error, '内容不能为空' if content.blank?
+    raise Error, '内容太长' if content.size > 255
+  end
+end

app/services/project_packages/save_service.rb

@@ -15,7 +15,7 @@ class ProjectPackages::SaveService < ApplicationService
 
     is_create = package.new_record?
     raise Error, '类型不存在' unless ProjectPackageCategory.where(id: params[:category_id]).exists?
-    params[:project_package_category_id] = params[:category_id].to_i
+    params[:project_package_category_id] = params.delete(:category_id).to_i
 
     raise Error, '竞标截止时间不能小于当前时间' if params[:deadline_at].present? && params[:deadline_at].to_time < Time.now
 
@@ -25,7 +25,9 @@ class ProjectPackages::SaveService < ApplicationService
     end
 
     ActiveRecord::Base.transaction do
-      package.assign_attributes(params)
+      columns = %i[project_package_category_id title content deadline_at
+                   min_price max_price contact_name contact_phone]
+      package.assign_attributes(params.slice(*columns))
       package.save!
 
       # 处理附件

app/views/courses/search_users.json.jbuilder

@@ -1,6 +1,7 @@
 json.users do
   json.array! @users do |user|
     json.id user.id
+    json.login user.login
     json.name user.real_name
     json.student_id user&.student_id
     json.school_name user&.school_name

app/views/memos/new.json.jbuilder

@@ -1,3 +1,3 @@
 json.tag_list @tag_list
-json.csrf_token @csrf_token
+json.forums @csrf_token
 

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

@@ -0,0 +1,11 @@
+json.count @count
+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.sender do
+      json.partial! 'users/user_simple', user: message.sender
+    end
+  end
+end

app/views/users/private_messages/create.json.jbuilder

@@ -0,0 +1,10 @@
+json.status 0
+json.message 'success'
+json.private_message do
+  json.extract! @message, :id, :user_id, :receiver_id, :sender_id, :content
+
+  json.send_time @message.display_send_time
+  json.sender do
+    json.partial! 'users/user_simple', user: @message.sender
+  end
+end

app/views/users/private_messages/index.json.jbuilder

@@ -0,0 +1,13 @@
+json.count @count
+json.private_messages do
+  json.array! @messages.each do |message|
+    json.extract! message, :id, :content, :message_count
+
+    json.unread message.unread?
+    json.send_time message.display_send_time
+
+    json.target do
+      json.partial! 'users/user_simple', user: message.target
+    end
+  end
+end

app/views/users/recent_contacts/index.json.jbuilder

@@ -0,0 +1,2 @@
+json.users @contacts, partial: 'users/user_simple', as: :user
+json.count @contacts.size

app/views/users_for_private_messages/index.json.jbuilder

@@ -0,0 +1,2 @@
+json.users @users, partial: 'users/user_simple', as: :user
+json.count @users.size

config/routes.rb

@@ -53,6 +53,11 @@ Rails.application.routes.draw do
         resource :grade_records, only: [:show]
         resource :watch, only: [:create, :destroy]
         resources :project_packages, only: [:index]
+        # 私信
+        resources :private_messages, only: [:index, :create, :destroy]
+        resources :recent_contacts, only: [:index]
+        resource :private_message_details, only: [:show]
+        resource :unread_message_info, only: [:show]
       end
 
 
@@ -91,6 +96,7 @@ Rails.application.routes.draw do
         end
       end
     end
+    resources :users_for_private_messages, only: [:index]
 
     resources :myshixuns, param: :identifier, shallow: true do
       member do

public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js

@@ -305,9 +305,6 @@ class CommonWorkDetailIndex extends Component{
                         .floatSpinParent .ant-spin-nested-loading {
                           float: right;
                         }
-                        .floatSpinParent .ant-spin-nested-loading .ant-spin-spinning{
-                          top: 10px;
-                        }
                         `}</style>
                         {this.props.isAdmin()? <Spin spinning={this.state.donwloading} style={{  }}>
                         <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>

spec/controllers/forums_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ForumsController, type: :controller do
+
+end

spec/helpers/forums_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the ForumsHelper. For example:
+#
+# describe ForumsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe ForumsHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/forum_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Forum, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end