From 95635d2073643b1eb990ed69f69cde31c3e063ee Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Tue, 10 Mar 2020 12:08:17 +0800
Subject: [PATCH] main

---
 app/controllers/main_controller.rb | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
index dd0b1ee97..69323bf49 100644
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -8,24 +8,24 @@ class MainController < ApplicationController
   end
 
   def index
-    # domain_session = params[:_educoder_session]
-    # if domain_session
-    #   uid_logger("main start  domain_session is #{domain_session}")
-    #   if cookies[:_educoder_session] != domain_session
-    #     cookies[:_educoder_session] = nil
-    #     cookies[:_educoder_session] = domain_session
-    #   end
-    #
-    #
-    #   uid_logger("main start is #{cookies[:_educoder_session]}")
-    # end
-    #
-    # # 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
-    # end
+    domain_session = params[:_educoder_session]
+    if domain_session
+      uid_logger("main start  domain_session is #{domain_session}")
+      if cookies[:_educoder_session] != domain_session
+        cookies[:_educoder_session] = nil
+        cookies[:_educoder_session] = domain_session
+      end
+
+
+      uid_logger("main start is #{cookies[:_educoder_session]}")
+    end
+
+    # 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
+    end
 
   end
 end
\ No newline at end of file