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

app/controllers/admins/base_controller.rb

@@ -6,7 +6,6 @@ class Admins::BaseController < ApplicationController
   layout 'admin'
 
   skip_before_action :verify_authenticity_token
-  skip_before_action :setup_laboratory
 
   before_action :require_login, :require_admin!
 
@@ -38,4 +37,9 @@ class Admins::BaseController < ApplicationController
     append_js = ERB.new(File.open(path).read).result
     response.body += append_js
   end
+
+  # 重写此方法，防止影响超级管理员端云上实验室功能，因为那里重写了:current_laboratory方法
+  def setup_laboratory
+    Laboratory.current = Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)
+  end
 end

app/views/settings/show.json.jbuilder

@@ -14,4 +14,6 @@ json.setting do
   json.navbar setting.navbar || default_setting.navbar
 
   json.footer setting.footer || default_setting.footer
+
+  json.main_site current_laboratory.main_site?
 end

public/react/src/modules/login/EducoderLogin.js

@@ -196,13 +196,30 @@ class EducoderLogin extends Component {
                               </div>
                           </div>
                     }
-                    <div style={{
-                        display: "flex",
-                        justifyContent: "center",
-                        width: "100%",
-                    }}>
-                        <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-                    </div>
+									{this.props.mygetHelmetapi === null ? 	<div style={{
+										display: "flex",
+										justifyContent: "center",
+										width: "100%",
+									}}>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+									</div>:
+									this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?	<div style={{
+										display: "flex",
+										justifyContent: "center",
+										width: "100%",
+									}}>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+									</div>:this.props.mygetHelmetapi.main_site===true?
+										<div style={{
+											display: "flex",
+											justifyContent: "center",
+											width: "100%",
+										}}>
+											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+										</div>
+										:""
+									}
+
                 </div>
             </div>
         )
@@ -221,4 +238,4 @@ export default  EducoderLogin ;
 //       <InterestpageComponent {...this.props} {...this.state}>
 //       </InterestpageComponent>
 //   </div>
-//   :
+//   :