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

app/controllers/admins/base_controller.rb

@@ -6,7 +6,6 @@ class Admins::BaseController < ApplicationController
   layout 'admin'
 
   skip_before_action :verify_authenticity_token
-
   before_action :require_login, :require_admin!
 
   after_action :rebind_event_if_ajax_render_partial

app/controllers/application_controller.rb

@@ -282,10 +282,10 @@ class ApplicationController < ActionController::Base
 	end
 
 	def user_setup
-		# reacct静态资源加载不需要走这一步
+		# # reacct静态资源加载不需要走这一步
 		return if params[:controller] == "main"
 		# Find the current user
-		Rails.logger.info("current_laboratory is #{current_laboratory} domain is #{request.subdomain}")
+		#Rails.logger.info("current_laboratory is #{current_laboratory} domain is #{request.subdomain}")
 		User.current = find_current_user
 		uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous"))
 

app/controllers/cooperative/base_controller.rb

@@ -10,6 +10,7 @@ class Cooperative::BaseController < ApplicationController
   before_action :laboratory_exist!, :require_login, :require_cooperative_manager!
 
   after_action :rebind_event_if_ajax_render_partial
+  skip_before_action :check_sign
 
   helper_method :current_laboratory, :current_setting_or_default
 

app/controllers/schools_controller.rb

@@ -15,7 +15,6 @@ class SchoolsController < ApplicationController
     schools = School.all
     keyword = params[:keyword].to_s.strip
     schools = schools.where('name LIKE ?', "%#{keyword}%") if keyword
-
     render_ok(schools: schools.select(:id, :name).as_json)
   end
 

app/views/admins/shared/_sidebar.html.erb

@@ -2,7 +2,7 @@
 <nav id="sidebar" class="<%= sidebar_collapse ? 'active' : '' %>" data-current-controller="<%= admin_sidebar_controller %>">
   <div class="sidebar-header">
     <a href="/" class="sidebar-header-logo" data-toggle="tooltip" data-title="返回主站" >
-      <img class="rounded-circle" src="/images/<%= url_to_avatar(current_user) %>" />
+<!--      <img class="rounded-circle" src="/images/<%#= url_to_avatar(current_user) %>" />-->
       <span class="logo-label">后台管理</span>
     </a>
     <div id="sidebarCollapse" class="navbar-btn <%= sidebar_collapse ? 'active' : '' %>">

public/react/src/AppConfig.js

@@ -51,7 +51,7 @@ if (isDev) {
       checkSubmitFlg=true
     window.setTimeout(function () {
       checkSubmitFlg=false;
-    }, 2500);
+    }, 2000);
   }else if(checkSubmitFlg===false){
     $.ajax({url:proxy,async:false,success:function(data){
         if(data.status===0){
@@ -61,7 +61,7 @@ if (isDev) {
     checkSubmitFlg=true
     window.setTimeout(function () {
       checkSubmitFlg=false;
-    }, 2500);
+    }, 2000);
   }
 }
 window._debugType = debugType;
@@ -224,6 +224,7 @@ export function initAxiosInterceptors(props) {
         }
 
         if (response.data.status === 501) {
+          window.location.reload()
           notification.warning({
             description:response.data.message || '访问异常，请求不合理',
           })