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

app/controllers/concerns/render_expand.rb

@@ -14,7 +14,7 @@ module RenderExpand
         kit.stylesheets << Rails.root.join('app/templates', path)
       end
 
-      send_data kit.to_pdf, filename: options[:filename], type: 'application/pdf'
+      send_data kit.to_pdf, filename: options[:filename], disposition: options[:disposition] || 'attachment', type: 'application/pdf'
     end
   end
 end

app/controllers/exercises_controller.rb

@@ -1291,8 +1291,7 @@ class ExercisesController < ApplicationController
       normal_status(0,"正在下载中")
     else
       set_export_cookies
-      content[:disposition] = "inline"
+      render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets, disposition: 'inline', type:"pdf_attachment.content_type",stream:false
-      render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets, disposition: 'inline'
     end
   end
 

app/controllers/student_works_controller.rb

@@ -481,7 +481,7 @@ class StudentWorksController < ApplicationController
     filename_ = "#{@use&.student_id}_#{@use&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
     filename = Base64.urlsafe_encode64(filename_.strip)
     stylesheets = %w(shixun_work/shixun_work.css shared/codemirror.css)
-    render pdf: 'shixun_work/shixun_work', filename: filename, stylesheets: stylesheets
+    render pdf: 'shixun_work/shixun_work', filename: filename, stylesheets: stylesheets, disposition: 'inline', type:"pdf_attachment.content_type",stream:false
   end
 
   # 作品调分

app/views/users/_user_simple.json.jbuilder

@@ -1,4 +1,4 @@
 json.id user.id
-json.name user.full_name
+json.name user.real_name
 json.login user.login
 json.image_url url_to_avatar(user)

config/aliyun_vod.yml

@@ -0,0 +1,16 @@
+defaults: &defaults
+  access_key_id: 'test'
+  access_key_secret: 'test'
+  base_url: 'http://vod.cn-shanghai.aliyuncs.com'
+  cate_id: '-1'
+  callback_url: 'http://47.96.87.25:48080/api/callbacks/aliyun_vod.json'
+  signature_key: 'test12345678'
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults

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

@@ -261,7 +261,7 @@ class Fileslistitem extends Component{
 
                   </p>}
 
-                    <p className="color-grey panel-lightgrey mt8 fl ml30" style={{width:'100%'}}>
+                    <p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'100%'}}>
                       <span className="mr50">
                         <span className="mr15 color-dark">{discussMessage.author.name}</span>
                         <span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
@@ -302,7 +302,7 @@ class Fileslistitem extends Component{
 
 
 
-                    <p className="color-grey panel-lightgrey mt8 fl ml30" style={{width:'100%'}}>
+                    <p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'100%'}}>
 											<pre className="color-dark">资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}</pre>
                       {/*<span className="mr50">*/}
                           {/*/!*<span className="mr15 color-dark"></span>*!/*/}

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -686,6 +686,7 @@ class ShixunHomework extends Component{
             ModalSave:this.cancelmodel,
             Loadtype:false,
             checkBoxValues:[],
+            checkedtype:false,
           })
           this.props.showNotification(response.data.message)
           this.homeworkupdatalist(Coursename,page,order);