Merge branches 'dev_aliyun' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a

app/controllers/attachments_controller.rb

@@ -162,28 +162,30 @@ class AttachmentsController < ApplicationController
   def attachment_candown
     unless current_user.admin? || current_user.business?
       candown = true
-      if @file.container && current_user.logged?
-        # 课堂资源、作业、毕设相关资源的权限判断
-        if @file.container.is_a?(Course)
-          course = @file.container
-          candown = current_user.member_of_course?(course) || @file.is_public == 1
-        elsif @file.container.is_a?(HomeworkCommon) || @file.container.is_a?(GraduationTask) || @file.container.is_a?(GraduationTopic)
-          course = @file.container&.course
-          candown = current_user.member_of_course?(course)
-        elsif @file.container.is_a?(StudentWork)
-          course = @file.container&.homework_common&.course
-          candown = current_user.member_of_course?(course)
-        elsif @file.container.is_a?(StudentWorksScore)
-          course = @file.container&.student_work&.homework_common&.course
-          candown = current_user.member_of_course?(course)
-        elsif @file.container.is_a?(GraduationWork)
-          course = @file.container&.graduation_task&.course
-          candown = current_user.member_of_course?(course)
-        elsif @file.container.is_a?(GraduationWorkScore)
-          course = @file.container&.graduation_work&.graduation_task&.course
-          candown = current_user.member_of_course?(course)
+      unless params[:type] == 'history'
+        if @file.container && current_user.logged?
+          # 课堂资源、作业、毕设相关资源的权限判断
+          if @file.container.is_a?(Course)
+            course = @file.container
+            candown = current_user.member_of_course?(course) || @file.is_public == 1
+          elsif @file.container.is_a?(HomeworkCommon) || @file.container.is_a?(GraduationTask) || @file.container.is_a?(GraduationTopic)
+            course = @file.container&.course
+            candown = current_user.member_of_course?(course)
+          elsif @file.container.is_a?(StudentWork)
+            course = @file.container&.homework_common&.course
+            candown = current_user.member_of_course?(course)
+          elsif @file.container.is_a?(StudentWorksScore)
+            course = @file.container&.student_work&.homework_common&.course
+            candown = current_user.member_of_course?(course)
+          elsif @file.container.is_a?(GraduationWork)
+            course = @file.container&.graduation_task&.course
+            candown = current_user.member_of_course?(course)
+          elsif @file.container.is_a?(GraduationWorkScore)
+            course = @file.container&.graduation_work&.graduation_task&.course
+            candown = current_user.member_of_course?(course)
+          end
+          tip_exception(403, "您没有权限进入") if course.present? && !candown
         end
-        tip_exception(403, "您没有权限进入") if course.present? && !candown
       end
     end
   end

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -42,7 +42,7 @@ class Fileslistitem extends Component{
 								//预览pdf
 								axios({
 									method:'get',
-								  url:result.data.url,
+								  url:"http:"+window.location.host+result.data.url,
 									responseType: 'arraybuffer',
 								}).then((result)=>{
 										var binaryData = [];
@@ -53,7 +53,7 @@ class Fileslistitem extends Component{
 							}else{
 							let link = document.createElement('a');
 							document.body.appendChild(link);
-							link.href = "/api"+result.data.url;
+							link.href = result.data.url;
 							link.download = result.data.title;
 							//兼容火狐浏览器
 							let evt = document.createEvent("MouseEvents");

public/react/src/modules/courses/coursesPublic/Showoldfiles.js

@@ -45,7 +45,7 @@ class Showoldfiles extends Component{
 	showfiless=(url)=>{
 		axios({
 			method:'get',
-			url:url,
+			url:"http:"+window.location.host+url,
 			responseType: 'arraybuffer',
 		}).then((result)=>{
 			var binaryData = [];
@@ -188,7 +188,7 @@ class Showoldfiles extends Component{
 
 													<li className="fl fontlefts">
 														{allfiles.is_pdf===false?
-														<a className={"isabox"} href={"/api"+allfiles.url} >{allfiles.title}</a>:
+														<a className={"isabox"} href={allfiles.url} >{allfiles.title}</a>:
 															<a className={"isabox"} onClick={()=>this.showfiless(allfiles.url)} >{allfiles.title}</a>
 														}
 														<span className={"newcolor-orange fl"}>当前版本</span>
@@ -208,7 +208,7 @@ class Showoldfiles extends Component{
 																	<li className="fl fontlefts">
 
 																		{item.is_pdf===false?
-																			<a  className={"isabox"} href={"/api"+item.url}>{item.title}</a>:
+																			<a  className={"isabox"} href={item.url}>{item.title}</a>:
 																			<a className={"isabox"} onClick={()=>this.showfiless(item.url)} >{item.title}</a>
 																		}
 																	</li>