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

config/initializers/session_extenstions.rb

@@ -0,0 +1,33 @@
+#coding=utf-8
+
+module  SessionExtenstions
+
+  module EntryExtension
+    def compressed?
+      @compressed
+    end
+
+    def value
+      if @value
+        begin
+          Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
+        rescue TypeError
+          compressed? ? Zlib::Inflate.inflate(@value) : @value
+        end
+      end
+    end
+
+    def size
+      if @value.nil?
+        0
+      else
+        @value.bytesize
+      end
+    end
+  end
+
+
+end
+
+ActiveSupport::Cache::Entry.const_set("DEFAULT_COMPRESS_LIMIT", 1)
+ActiveSupport::Cache::Entry.send(:prepend, SessionExtenstions::EntryExtension)

public/react/src/modules/courses/gradinforms/Bullsubdirectory.js

@@ -216,9 +216,9 @@ class Bullsubdirectory extends Component{
 		let{description,whethertoeditysl,addonAfter,eduintits,informs,isSpinysl} =this.state;
 		let{myname,mydescription,id}=this.props;
 		const {getFieldDecorator} = this.props.form;
-		console.log("Bullsubdirectory");
+		// console.log("Bullsubdirectory");
-		console.log(this.props.isAdmin());
+		// console.log(this.props.isAdmin());
-		console.log(this.props.yslbool);
+		// console.log(this.props.yslbool);
 		return(
 			<React.Fragment  >
 				<div >
@@ -241,7 +241,7 @@ class Bullsubdirectory extends Component{
 																<div>
 																	<span className="fr yslbianji" style={{marginRight:"17px"}}>
 																	{
-																		this.props.isAdmin() === true ?
+																		this.props.isClassManagement() === true ?
 																			(this.props.yslbool===false?
 																				<Tooltip  placement="bottom" title={<div>
 																					编辑
@@ -256,7 +256,7 @@ class Bullsubdirectory extends Component{
 																</span>
 																	<span className="fr yslbianji" style={{marginRight:"22px"}}>
 																	{
-																		this.props.isAdmin() === true ?
+																		this.props.isClassManagement() === true ?
 																			(this.props.yslbool===false?
 																				<Tooltip  placement="bottom" title={<div>
 																					删除

public/react/src/modules/courses/gradinforms/Eduinforms.js

@@ -231,7 +231,7 @@ class Eduinforms extends Component{
 							<p style={{height: '20px'}}>
 								<span className="font-18 fl color-dark-21">公告栏</span>
 								{
-									this.props.isAdmin()===true?
+									this.props.isClassManagement()===true?
 										(this.state.yslbool===false?
 											<li className="btn colorblue font-16 fr bluebkbk pointer"
 													onClick={() => this.bianji(true)}>