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

app/controllers/attachments_controller.rb

@@ -18,9 +18,9 @@ class AttachmentsController < ApplicationController
 
     pdf_attachment = params[:disposition] || "attachment"
     if pdf_attachment == "inline"
-      send_file absolute_path(local_path(@file)),filename: @file.filename, disposition: 'inline',type: 'application/pdf'
+      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     else
-      send_file(absolute_path(local_path(@file)), filename: @file.filename,stream:false, type: @file.content_type.presence || 'application/octet-stream')
+      send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end
     update_downloads(@file)
   end

app/models/attachment.rb

@@ -27,12 +27,21 @@ class Attachment < ApplicationRecord
 
   validates_length_of :description, maximum: 100
 
+  DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
+
   def diskfile
     File.join(File.join(Rails.root, "files"), disk_directory.to_s, disk_filename.to_s)
   end
 
   def title
-    filename
+    title = filename
+    if container.is_a?(StudentWork) && author_id != User.current.id
+      course = container&.homework_common&.course
+      unless User.current.teacher_of_course?(course)
+        title = "#{Time.now.strftime('%Y%m%d%H%M%S')}_#{DCODES.sample(8).join}" + File.extname(filename)
+      end
+    end
+    title
   end
 
   def downloads_count

app/models/competition.rb

@@ -165,7 +165,7 @@ class Competition < ApplicationRecord
 
   def get_module_name type
     case type
-    when 'home'     then '首页'
+    when 'home'     then '赛制介绍'
     when 'enroll'   then '报名'
     when 'inform'   then '通知公告'
     when 'chart'    then '排行榜'

app/services/create_diff_record_service.rb

@@ -25,6 +25,7 @@ class CreateDiffRecordService < ApplicationService
     index = 0
     fragment_size = 1
     Diffy::Diff.new(before, after).each do |line|
+      unless line.include?("\\ 文件尾没有 newline 字符")
         unless line =~ /^[\+-]/
           if arr.empty? && index < fragment_size
             content += line
@@ -38,10 +39,9 @@ class CreateDiffRecordService < ApplicationService
         end
 
         content += arr.join('') if arr.present?
-      Rails.logger.info("diff_line_arr:#{arr.join('')}")
         content += line
         arr.clear
-      Rails.logger.info("diff_line:#{line}")
+      end
     end
     content
   end

app/views/student_works/show.json.jbuilder

@@ -11,7 +11,7 @@ json.update_user_name @is_evaluation ? "匿名" : @work.update_user.try(:real_na
 json.update_atta @homework.late_duration && @is_author
 
 json.attachments @attachments do |atta|
-  json.partial! "attachments/attachment_simple", locals: {attachment: atta, delete: false}
+  json.partial! "attachments/attachment_simple", locals: {attachment: atta, delete: false, }
 end
 
 unless @is_evaluation

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -413,7 +413,7 @@ class AccountBasic extends Component {
   //昵称
 	handleSubmitName(rule, value, callback){
 		if (value) {
-			let iconRule1 = /[`~!@#$%^&()\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+			let iconRule1 = /[`~!@#$%^&*()\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
 // 判断是否含有emoji表情
 			let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
 // 如果为true，字符串含有emoji表情 ，false不含
@@ -436,7 +436,7 @@ class AccountBasic extends Component {
 	// 姓名
 	handleSubmitNames(rule, value, callback){
 		if (value) {
-			let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+				let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
 // 判断是否含有emoji表情
 				let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
 // 如果为true，字符串含有emoji表情 ，false不含

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -453,7 +453,7 @@ class RealNameCertificationModal extends Component{
 	// 姓名
 	handleSubmitNames(rule, value, callback){
 		if (value) {
-			let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+				let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
 // 判断是否含有emoji表情
 				let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
 // 如果为true，字符串含有emoji表情 ，false不含