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

app/controllers/courses_controller.rb

@@ -13,7 +13,7 @@ class CoursesController < ApplicationController
   end
 
   before_action :require_login, except: [:index, :show, :students, :teachers, :board_list, :mine, :all_course_groups,
-                                                      :left_banner, :top_banner, :informs, :online_learning, :course_groups]
+                                         :left_banner, :top_banner, :informs, :online_learning, :course_groups, :search_slim]
   before_action :check_account, only: [:new, :create, :apply_to_join_course, :join_excellent_course]
   before_action :check_auth, except: [:index, :show, :students, :teachers, :board_list, :mine, :all_course_groups,
                                                       :left_banner, :top_banner, :apply_to_join_course, :exit_course, :course_groups]

app/controllers/main_controller.rb

@@ -20,11 +20,8 @@ class MainController < ApplicationController
       uid_logger("main start is #{cookies[:_educoder_session]}")
     end
 
-
-    if params[:path] && params[:path]&.include?("educoderh5") && params[:path].split("/").first == "educoderh5"
-      render file: 'public/h5build/index.html', :layout => false
-      # TODO: 这块之后需要整合，到上面去，或者架构重新变化，统一跳转到index后再路由分发
-    elsif params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
+    # TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发
+    if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
       render file: 'public/h5educoderbuild/index.html', :layout => false
     else
       render file: 'public/react/build/index.html', :layout => false

app/controllers/weapps/shixun_lists_controller.rb

@@ -1,5 +1,4 @@
 class Weapps::ShixunListsController < ApplicationController
-  before_action :require_login
 
   def index
     results = Weapps::ShixunSearchService.call(search_params, current_laboratory)

app/controllers/weapps/subjects_controller.rb

@@ -1,5 +1,5 @@
 class Weapps::SubjectsController < Weapps::BaseController
-  before_action :require_login
+  before_action :require_login, except: [:index, :show]
   before_action :find_subject, except: [:index]
 
   # 首页