From 275b8f9170982126bee2050bcefff4894c92cd32 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 11:48:22 +0800
Subject: [PATCH 01/27] domain test

---
 app/controllers/application_controller.rb |  6 ++++--
 app/controllers/concerns/login_helper.rb  | 12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1bc2bad7d..32714bf87 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -292,9 +292,11 @@ class ApplicationController < ActionController::Base
 	# and starts a session if needed
 	def find_current_user
 		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
-		if session[:user_id]
+
+		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{request.subdomain}_user_id"]}")
+		if session[:"#{request.subdomain}_user_id"]
 			# existing session
-			(User.active.find(session[:user_id]) rescue nil)
+			(User.active.find(session[:"#{request.subdomain}_user_id"]) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index e94cf8a21..a95723690 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -62,7 +62,17 @@ module LoginHelper
   end
 
   def start_user_session(user)
-    session[:user_id] = user.id
+    session[:"#{request.subdomain}_user_id"] = user.id
+    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+    Rails.logger.info("user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+
+    # if current_laboratory.main_site?
+    #   session[:user_id] = user.id
+    # else
+    #   session[:"#{request.subdomain}_user_id"] = user.id
+    # end
+
+    # session[:user_id] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end

From e64cdfb171c74133537e4e83e9eff7e6b4b86b45 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 14:21:28 +0800
Subject: [PATCH 02/27] test

---
 app/controllers/application_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 32714bf87..10a326fef 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -292,6 +292,8 @@ class ApplicationController < ActionController::Base
 	# and starts a session if needed
 	def find_current_user
 		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
+		uid_logger("user setup start2: session[:user_aa_id] is #{session[:user_aa_id]}")
+		uid_logger("user setup start3: session[:user_aa_id] is #{session[:aa.pre_aa_id]}")
 
 		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{request.subdomain}_user_id"]}")
 		if session[:"#{request.subdomain}_user_id"]

From c8888bc0fedf20f8982357230460def60d313125 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 14:24:02 +0800
Subject: [PATCH 03/27] ..

---
 app/controllers/application_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 10a326fef..25e658c53 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -293,7 +293,8 @@ class ApplicationController < ActionController::Base
 	def find_current_user
 		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
 		uid_logger("user setup start2: session[:user_aa_id] is #{session[:user_aa_id]}")
-		uid_logger("user setup start3: session[:user_aa_id] is #{session[:aa.pre_aa_id]}")
+		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain}"]}")
+		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain}_user_id"]}")
 
 		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{request.subdomain}_user_id"]}")
 		if session[:"#{request.subdomain}_user_id"]

From c9b746c1bd0688d9c6e75ca34eb1010aa3a09c27 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 14:28:34 +0800
Subject: [PATCH 04/27] test

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 25e658c53..9d0a0e44a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -294,7 +294,7 @@ class ApplicationController < ActionController::Base
 		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
 		uid_logger("user setup start2: session[:user_aa_id] is #{session[:user_aa_id]}")
 		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain}"]}")
-		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain}_user_id"]}")
+		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain.split('.').first}_user_id"]}")
 
 		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{request.subdomain}_user_id"]}")
 		if session[:"#{request.subdomain}_user_id"]

From e8f0b07b927ad8348c804c3202854318399e8df9 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 14:36:23 +0800
Subject: [PATCH 05/27] session id

---
 app/controllers/application_controller.rb | 11 ++++-------
 app/controllers/concerns/login_helper.rb  |  7 ++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9d0a0e44a..6721d7445 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -291,15 +291,12 @@ class ApplicationController < ActionController::Base
 	# Returns the current user or nil if no user is logged in
 	# and starts a session if needed
 	def find_current_user
-		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
-		uid_logger("user setup start2: session[:user_aa_id] is #{session[:user_aa_id]}")
-		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain}"]}")
-		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain.split('.').first}_user_id"]}")
+		re_subdomain = "#{request.subdomain.split('.').first}_user_id"
 
-		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{request.subdomain}_user_id"]}")
-		if session[:"#{request.subdomain}_user_id"]
+		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{re_subdomain}"]}")
+		if session[:"#{re_subdomain}"]
 			# existing session
-			(User.active.find(session[:"#{request.subdomain}_user_id"]) rescue nil)
+			(User.active.find(session[:"#{re_subdomain}"]) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index a95723690..4e51db9c6 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -62,9 +62,10 @@ module LoginHelper
   end
 
   def start_user_session(user)
-    session[:"#{request.subdomain}_user_id"] = user.id
-    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
-    Rails.logger.info("user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+    re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+    session[:"#{re_subdomai}"] = user.id
+    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomai}"]}")
+    Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")
 
     # if current_laboratory.main_site?
     #   session[:user_id] = user.id

From 57e8bb59d607eeac2d04280c7bee6e921b321326 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 14:38:04 +0800
Subject: [PATCH 06/27] session domain check

---
 app/controllers/concerns/login_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index 4e51db9c6..231812527 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -63,8 +63,8 @@ module LoginHelper
 
   def start_user_session(user)
     re_subdomain = "#{request.subdomain.split('.').first}_user_id"
-    session[:"#{re_subdomai}"] = user.id
-    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomai}"]}")
+    session[:"#{re_subdomain}"] = user.id
+    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomain}"]}")
     Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")
 
     # if current_laboratory.main_site?

From cc76f56969cbc45cac5fefa501ea220c719dc061 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 14:53:28 +0800
Subject: [PATCH 07/27] ..

---
 app/controllers/application_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6721d7445..adef28e03 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -293,7 +293,9 @@ class ApplicationController < ActionController::Base
 	def find_current_user
 		re_subdomain = "#{request.subdomain.split('.').first}_user_id"
 
-		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{re_subdomain}"]}")
+		Rails.logger.info("find current_user: subdomain is #{re_subdomain} and user session is #{session[:user_id]} -- #{session[:"#{re_subdomain}"]}")
+		Rails.logger.info("-----------------------------")
+		Rails.logger.info("domain session is:  #{session[:"#{request.subdomain.split('.').first}_user_id"]}")
 		if session[:"#{re_subdomain}"]
 			# existing session
 			(User.active.find(session[:"#{re_subdomain}"]) rescue nil)

From 062966313365626d945d5f3d610aa3403c244a79 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 15:20:51 +0800
Subject: [PATCH 08/27] test

---
 app/controllers/concerns/login_helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index 231812527..f9e0255d2 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -63,7 +63,9 @@ module LoginHelper
 
   def start_user_session(user)
     re_subdomain = "#{request.subdomain.split('.').first}_user_id"
-    session[:"#{re_subdomain}"] = user.id
+
+    session[:"#{re_subdomain}"] = nil
+    # session[:"#{re_subdomain}"] = user.id
     Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomain}"]}")
     Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")
 

From 3f539a90f59488494ae3d4e2e633a20b63d476a7 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 15:22:08 +0800
Subject: [PATCH 09/27] ..

---
 app/controllers/concerns/login_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index f9e0255d2..0126eb6b0 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -65,6 +65,7 @@ module LoginHelper
     re_subdomain = "#{request.subdomain.split('.').first}_user_id"
 
     session[:"#{re_subdomain}"] = nil
+    session[:user_id] = nil
     # session[:"#{re_subdomain}"] = user.id
     Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomain}"]}")
     Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")

From c6a70bd1b2e9a440005605a7121884053bff3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 16:43:03 +0800
Subject: [PATCH 10/27] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/LoginRegisterComponent.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 929b21cec..1fbfe4e35 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -154,7 +154,7 @@ class LoginRegisterComponent extends Component {
         // console.log(this.props);
         let pcipns=this.IsPC();
         if (this.props.match.url === "/login") {
-            console.log("11111111111111111111111111");
+
             // this.state = {
             //     tab:["0"],
             //
@@ -163,7 +163,7 @@ class LoginRegisterComponent extends Component {
                 tab:["0"]
             })
         } else if (this.props.match.url === "/register") {
-            console.log("11111111111111111111111111");
+
             // this.state = {
             //     tab:["1"],
             //
@@ -968,6 +968,7 @@ class LoginRegisterComponent extends Component {
             // window.location.href='http://www.cnblogs.com/a-cat/';
         }
 
+
         return (
 
           <div className="login_register_content login_register_contents"
@@ -1077,7 +1078,7 @@ class LoginRegisterComponent extends Component {
 
                           <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
                                   size={"large"}>登录</Button>
-												{this.props.user&&this.props.user.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
+												{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
 
 												<span className={"startlogin"}>————————  快速登录  ————————</span>
 													<div className={"mt10"}>
@@ -1252,7 +1253,7 @@ class LoginRegisterComponent extends Component {
                           <Button className=" font-16 mb20" type="primary" style={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?{height:"46px", width: "100%",marginTop:"26px"}:{height:"46px", width: "100%"}} onClick={() => this.postregistered()}
                                   size={"large"}>注册</Button>
 
-												{this.props.user&&this.props.user.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
+												{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
 
 													<span className={"startlogin"}>————————  快速登录  ————————</span>
 													<div className={"mt10"}>

From 64147444fd20874d762942b4359580aa4c01f768 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 16:47:52 +0800
Subject: [PATCH 11/27] =?UTF-8?q?=E7=A7=81=E5=AF=86=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/gits_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/gits_controller.rb b/app/controllers/gits_controller.rb
index c9659302e..e87f3302f 100644
--- a/app/controllers/gits_controller.rb
+++ b/app/controllers/gits_controller.rb
@@ -49,6 +49,10 @@ class GitsController < ApplicationController
             repo_name = username + "/" + shixunname
             uid_logger("git start: repo_name is #{repo_name}")
             shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).where(repo_name: repo_name).first
+            if shixun.blank?
+              shixun_id = ShixunSecretRepository.where(repo_name: repo_name).pluck(:shixun_id).first
+              shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).find_by(id: shixun_id)
+            end
             uid_logger("git start auth: shixun identifier is #{shixun.try(:identifier)}")
             uid_logger("git start auth: systemuser is #{system_user.try(:login)}")
 

From 0d54bd2325691fbe09954a75a8c29f48fed81789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 16:48:43 +0800
Subject: [PATCH 12/27] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/home/shixunsHome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 6971cf36c..2efacf29e 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -242,7 +242,7 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix" style={{width:'102%'}}>
+                                <div className="square-list clearfix" style={{width:'108%'}}>
 
 
                                     {homedatalist===undefined?"":homedatalist.subjects.map((item,key)=>{
@@ -321,7 +321,7 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix" style={{width:'102%'}}>
+                                <div className="square-list clearfix" style={{width:'108%'}}>
 																	<style>
 																		{
 																			`

From 964c6f9606b776fcf5c708595605e3a6e589a8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 16:58:40 +0800
Subject: [PATCH 13/27] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/home/shixunsHome.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 2efacf29e..68e37deb6 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -149,9 +149,9 @@ class ShixunsHome extends Component {
 													<style>
 														{
 															`
-                                                            .shixunsHome .educontent {
-                                                                width: 1223px;
-                                                            }
+															.shixunsHome .educontent {
+																	width: 1250px;
+															}
 															.banners{
 															overflow: hidden;
 															}
@@ -242,7 +242,7 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix" style={{width:'108%'}}>
+                                <div className="square-list clearfix" style={{width:'100%'}}>
 
 
                                     {homedatalist===undefined?"":homedatalist.subjects.map((item,key)=>{
@@ -321,7 +321,7 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix" style={{width:'108%'}}>
+                                <div className="square-list clearfix" style={{width:'100%'}}>
 																	<style>
 																		{
 																			`

From 0e211651d63348d960965a3357e173bc7c5a5bf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 17:07:17 +0800
Subject: [PATCH 14/27] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/shixunreport/ConclusionEvaluation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
index d5c8aa57f..5430b9e8c 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
@@ -58,7 +58,7 @@ class ConclusionEvaluation extends Component {
 					<span>
 				  <Tooltip placement="bottom" title={
 						<pre>
-							分数：{record.eff_scores.eff_score}/总分：{record.eff_score_full}
+							分数：{record.eff_scores.eff_score}/总分：{record.eff_scores.eff_score_full}
 						</pre>
 					}>
 		        <span style={{color:'#FF6800'}}>{record.eff_scores.eff_score}</span><span className={"color-grey-9"}>/{record.eff_scores.eff_score_full}</span>

From 7c24f05994715762dcdfbed987d8fade047bae89 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 17:59:41 +0800
Subject: [PATCH 15/27] 1

---
 app/controllers/gits_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/gits_controller.rb b/app/controllers/gits_controller.rb
index e87f3302f..850458e65 100644
--- a/app/controllers/gits_controller.rb
+++ b/app/controllers/gits_controller.rb
@@ -51,6 +51,8 @@ class GitsController < ApplicationController
             shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).where(repo_name: repo_name).first
             if shixun.blank?
               shixun_id = ShixunSecretRepository.where(repo_name: repo_name).pluck(:shixun_id).first
+              logger.info("####repo_name:#{repo_name}")
+              logger.info("####shixun_id:#{shixun_id}")
               shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).find_by(id: shixun_id)
             end
             uid_logger("git start auth: shixun identifier is #{shixun.try(:identifier)}")

From 4bcb66092df859e466541bc73a8a703bcc35ffcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 18:16:20 +0800
Subject: [PATCH 16/27] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=BB=91=E5=AE=A2?=
 =?UTF-8?q?=E6=9D=BE=E5=A2=9E=E5=8A=A0=20=E6=89=8B=E6=9C=BA=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/osshackathon/Osshackathon.js  |  4 +
 public/react/src/modules/tpm/TPMIndexHOC.js   | 25 +++++-
 .../src/modules/user/AccountPhoneemail.js     | 79 +++++++++++++++++++
 3 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 public/react/src/modules/user/AccountPhoneemail.js

diff --git a/public/react/src/modules/osshackathon/Osshackathon.js b/public/react/src/modules/osshackathon/Osshackathon.js
index 4fc73850f..0e175ef04 100644
--- a/public/react/src/modules/osshackathon/Osshackathon.js
+++ b/public/react/src/modules/osshackathon/Osshackathon.js
@@ -117,6 +117,10 @@ class Osshackathon extends Component {
 			this.props.showProfileCompleteDialog()
 			return
 		}
+		//判断是否绑定邮箱
+	  if(!this.props.user.email===true||!this.props.user.phone===true){
+			this.props.showhideAccountPhoneemailDialog()
+		}
 
 		this.props.confirm({
 			content: `是否确认报名?`,
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 4408265ce..64021207d 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -11,7 +11,7 @@ import { Spin } from 'antd';
 import './TPMIndex.css';
 import LoginDialog from '../login/LoginDialog';
 import AccountProfile from '../user/AccountProfile';
-
+import AccountPhoneemail from '../user/AccountPhoneemail';
 import Trialapplication from "../login/Trialapplication";
 // import "antd/dist/antd.css";
 // import '../../css/educoder/edu-common.css'
@@ -80,7 +80,7 @@ export function TPMIndexHOC(WrappedComponent) {
 
             isRender: false,
             AccountProfiletype: false,
-
+				  	AccountPhoneemailtype:false,
             globalLoading: false,
 					  dataquerys:{},
 					  isloginCancel:undefined,
@@ -532,6 +532,17 @@ export function TPMIndexHOC(WrappedComponent) {
           AccountProfiletype: true
         })
       }
+			showhideAccountPhoneemailDialog = () => {
+				this.dialogObj = {}
+				this.setState({
+					AccountPhoneemailtype: true
+				})
+			}
+      hideAccountPhoneemailtype=()=>{
+      	this.setState({
+					AccountPhoneemailtype:false
+				})
+			}
 			//验证是否完善资料
       checkIfProfileCompleted = () => {
         return this.state.current_user && this.state.current_user.profile_completed
@@ -625,7 +636,7 @@ export function TPMIndexHOC(WrappedComponent) {
 			}
 
 	  	render() {
-          let{Headertop,Footerdown, isRender, AccountProfiletype,mygetHelmetapi}=this.state;
+          let{Headertop,Footerdown, isRender, AccountProfiletype,AccountPhoneemailtype}=this.state;
           const common = {
             isSuperAdmin:this.isSuperAdmin,
             isAdminOrCreator:this.isAdminOrCreator,
@@ -645,6 +656,7 @@ export function TPMIndexHOC(WrappedComponent) {
             showLoginDialog: this.showLoginDialog,
             checkIfLogin: this.checkIfLogin,
             showProfileCompleteDialog: this.showProfileCompleteDialog,
+						showhideAccountPhoneemailDialog:this.showhideAccountPhoneemailDialog,
             checkIfProfileCompleted: this.checkIfProfileCompleted,
             checkIfProfessionalCertification: this.checkIfProfessionalCertification,
             showProfessionalCertificationDialog: this.showProfessionalCertificationDialog,
@@ -677,6 +689,13 @@ export function TPMIndexHOC(WrappedComponent) {
               {...this.state}
               {...this.dialogObj}
             />:""}
+            {/*验证是否注册手机邮箱*/}
+						{AccountPhoneemailtype===true?<AccountPhoneemail
+							hideAccountProfile={()=>this.hideAccountPhoneemailtype()}
+							{...this.props}
+							{...this.state}
+							{...this.dialogObj}
+						/>:""}
             <SiderBar
 							{...this.props}
 							{...this.state}
diff --git a/public/react/src/modules/user/AccountPhoneemail.js b/public/react/src/modules/user/AccountPhoneemail.js
new file mode 100644
index 000000000..a5e9e7652
--- /dev/null
+++ b/public/react/src/modules/user/AccountPhoneemail.js
@@ -0,0 +1,79 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import {Modal} from 'antd';
+import axios from 'axios';
+class AccountPhoneemail extends Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			AccountPhoneemailtype:false
+		}
+	}
+	componentDidMount() {
+		if(this.props.AccountPhoneemailtype!=undefined){
+			this.setState({
+				AccountPhoneemailtype:this.props.AccountPhoneemailtype
+			})
+		}
+
+		axios.interceptors.response.use((response) => {
+			if (response != undefined)
+				if (response && response.data.status === 402) {
+					this.setState({
+						AccountPhoneemailtype: true
+					})
+
+				}
+			return response;
+		}, (error) => {
+
+		});
+
+	}
+
+	gotoback=()=>{
+		if(this.props.AccountPhoneemailtype!=undefined){
+			this.setState({
+				AccountPhoneemailtype:false
+			})
+			this.props.hideAccountProfile()
+		}else{
+			window.location.href="/";
+			this.setState({
+				AccountPhoneemailtype:false
+			})
+		}
+	}
+
+
+	/**
+	 content: '您需要去完成您的职业认证，才能使用此功能',
+	 okText: '立即完成',
+	 okHref: '/account/certification'
+	 */
+	render() {
+		const { content, okText, okHref } = this.props;
+		return(
+			<Modal
+				keyboard={false}
+				title="提示"
+				visible={this.state.AccountPhoneemailtype}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				centered={true}
+				width="530px"
+			>
+				<div className="task-popup-content">
+					<p className="task-popup-text-center font-16"> 您需要完成手机号码和邮箱的绑定，才能使用此功能</p>
+					<div className="clearfix mt30 edu-txt-center">
+						<a  className="task-btn mr30" onClick={()=>this.gotoback()}>稍后完善</a>
+						<a className="task-btn task-btn-orange"  href={ "/account/secure" }> {'立即完善'}</a>
+					</div>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default AccountPhoneemail;
\ No newline at end of file

From dc1e0363dd2d102450a6e6735820b998895af368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 19:05:58 +0800
Subject: [PATCH 17/27] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/osshackathon/Osshackathon.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/osshackathon/Osshackathon.js b/public/react/src/modules/osshackathon/Osshackathon.js
index 0e175ef04..3083db8ce 100644
--- a/public/react/src/modules/osshackathon/Osshackathon.js
+++ b/public/react/src/modules/osshackathon/Osshackathon.js
@@ -118,10 +118,15 @@ class Osshackathon extends Component {
 			return
 		}
 		//判断是否绑定邮箱
-	  if(!this.props.user.email===true||!this.props.user.phone===true){
+
+	  if(this.props.user.email===null){
 			this.props.showhideAccountPhoneemailDialog()
+			return
+		}
+		if(this.props.user.phone===null){
+			this.props.showhideAccountPhoneemailDialog()
+			return
 		}
-
 		this.props.confirm({
 			content: `是否确认报名?`,
 			onOk: () => {

From b7ab32a844986ffcc945866978455dcda19462fc Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 19:11:49 +0800
Subject: [PATCH 18/27] 1

---
 app/controllers/hacks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/hacks_controller.rb b/app/controllers/hacks_controller.rb
index 9fa8e26e3..213c38c7f 100644
--- a/app/controllers/hacks_controller.rb
+++ b/app/controllers/hacks_controller.rb
@@ -27,7 +27,7 @@ class HacksController < ApplicationController
     # 筛选过滤与排序
     params_filter_or_order
     # 我解决的编程题数
-    user_codes =  HackUserLastestCode.mine(current_user).passed.joins(:hack)
+    user_codes =  HackUserLastestCode.joins(:hack).mine(current_user).passed
     @simple_count = user_codes.where(hacks: {difficult: 1}).count
     @medium_count = user_codes.where(hacks: {difficult: 2}).count
     @diff_count  = user_codes.where(hacks: {difficult: 3}).count

From 93f5c213e0054ce555fd7ec21b6c90ee42d020d7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 19:15:53 +0800
Subject: [PATCH 19/27] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/hack_user_lastest_code.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/hack_user_lastest_code.rb b/app/models/hack_user_lastest_code.rb
index 1d3e20f87..28cc62db4 100644
--- a/app/models/hack_user_lastest_code.rb
+++ b/app/models/hack_user_lastest_code.rb
@@ -8,7 +8,7 @@ class HackUserLastestCode < ApplicationRecord
   belongs_to :user
   has_many :hack_user_codes, dependent: :destroy
   has_one :hack_user_debug
-  scope :mine, ->(author_id){ find_by(user_id: author_id) }
+  scope :mine, ->(author_id){ where(user_id: author_id) }
   scope :passed, -> {where(status: 1)}
 
 end

From b1f7510608f1b54373aef820938983475f83a645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 19:15:56 +0800
Subject: [PATCH 20/27] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/osshackathon/Osshackathon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/osshackathon/Osshackathon.js b/public/react/src/modules/osshackathon/Osshackathon.js
index 3083db8ce..7edc18d63 100644
--- a/public/react/src/modules/osshackathon/Osshackathon.js
+++ b/public/react/src/modules/osshackathon/Osshackathon.js
@@ -118,7 +118,7 @@ class Osshackathon extends Component {
 			return
 		}
 		//判断是否绑定邮箱
-
+ 
 	  if(this.props.user.email===null){
 			this.props.showhideAccountPhoneemailDialog()
 			return

From 94df5f3ede109808dfa0d0bf8e97c07f33ff5d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 20 Nov 2019 19:18:01 +0800
Subject: [PATCH 21/27] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/AccountPhoneemail.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/user/AccountPhoneemail.js b/public/react/src/modules/user/AccountPhoneemail.js
index a5e9e7652..cab70205d 100644
--- a/public/react/src/modules/user/AccountPhoneemail.js
+++ b/public/react/src/modules/user/AccountPhoneemail.js
@@ -67,8 +67,8 @@ class AccountPhoneemail extends Component {
 				<div className="task-popup-content">
 					<p className="task-popup-text-center font-16"> 您需要完成手机号码和邮箱的绑定，才能使用此功能</p>
 					<div className="clearfix mt30 edu-txt-center">
-						<a  className="task-btn mr30" onClick={()=>this.gotoback()}>稍后完善</a>
-						<a className="task-btn task-btn-orange"  href={ "/account/secure" }> {'立即完善'}</a>
+						<a  className="task-btn mr30" onClick={()=>this.gotoback()}>稍后绑定</a>
+						<a className="task-btn task-btn-orange"  href={ "/account/secure" }> {'立即绑定'}</a>
 					</div>
 				</div>
 			</Modal>

From f149129f921e165a2f2ebf71f597b791a60d9b1e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 19:21:06 +0800
Subject: [PATCH 22/27] 1

---
 config/routes.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index abe31340d..81c419a7e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,7 +44,9 @@ Rails.application.routes.draw do
         get :start
         get :result
       end
-      resources :comments
+      resources :comments do
+
+      end
     end
 
     resources :hack_user_lastest_codes, path: :myproblems,  param: :identifier do

From 7e50b42b9e55bb705ae506ea8041bf02a15966bf Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 19:31:26 +0800
Subject: [PATCH 23/27] fixbug

---
 app/controllers/hacks_controller.rb  | 2 +-
 app/models/hack_user_lastest_code.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/hacks_controller.rb b/app/controllers/hacks_controller.rb
index 213c38c7f..915e58882 100644
--- a/app/controllers/hacks_controller.rb
+++ b/app/controllers/hacks_controller.rb
@@ -27,7 +27,7 @@ class HacksController < ApplicationController
     # 筛选过滤与排序
     params_filter_or_order
     # 我解决的编程题数
-    user_codes =  HackUserLastestCode.joins(:hack).mine(current_user).passed
+    user_codes =  HackUserLastestCode.joins(:hack).mine_hack(current_user).passed
     @simple_count = user_codes.where(hacks: {difficult: 1}).count
     @medium_count = user_codes.where(hacks: {difficult: 2}).count
     @diff_count  = user_codes.where(hacks: {difficult: 3}).count
diff --git a/app/models/hack_user_lastest_code.rb b/app/models/hack_user_lastest_code.rb
index 28cc62db4..b4a707603 100644
--- a/app/models/hack_user_lastest_code.rb
+++ b/app/models/hack_user_lastest_code.rb
@@ -8,7 +8,8 @@ class HackUserLastestCode < ApplicationRecord
   belongs_to :user
   has_many :hack_user_codes, dependent: :destroy
   has_one :hack_user_debug
-  scope :mine, ->(author_id){ where(user_id: author_id) }
+  scope :mine, ->(author_id){ find_by(user_id: author_id) }
+  scope :mine_hack, ->(author_id){ where(user_id: author_id) }
   scope :passed, -> {where(status: 1)}
 
 end

From 63bc151b39abcf7f74505bf259dde1272d848a48 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 19:50:18 +0800
Subject: [PATCH 24/27] reset

---
 app/controllers/application_controller.rb | 10 +++------
 app/controllers/concerns/login_helper.rb  | 25 ++++++++++-------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index adef28e03..1bc2bad7d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -291,14 +291,10 @@ class ApplicationController < ActionController::Base
 	# Returns the current user or nil if no user is logged in
 	# and starts a session if needed
 	def find_current_user
-		re_subdomain = "#{request.subdomain.split('.').first}_user_id"
-
-		Rails.logger.info("find current_user: subdomain is #{re_subdomain} and user session is #{session[:user_id]} -- #{session[:"#{re_subdomain}"]}")
-		Rails.logger.info("-----------------------------")
-		Rails.logger.info("domain session is:  #{session[:"#{request.subdomain.split('.').first}_user_id"]}")
-		if session[:"#{re_subdomain}"]
+		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
+		if session[:user_id]
 			# existing session
-			(User.active.find(session[:"#{re_subdomain}"]) rescue nil)
+			(User.active.find(session[:user_id]) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index 0126eb6b0..b3ec6da63 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -62,21 +62,18 @@ module LoginHelper
   end
 
   def start_user_session(user)
-    re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+    # re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+    # session[:"#{request.subdomain}_user_id"] = user.id
+    # Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+    # Rails.logger.info("user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+    #
+    # # if current_laboratory.main_site?
+    # #   session[:user_id] = user.id
+    # # else
+    # #   session[:"#{request.subdomain}_user_id"] = user.id
+    # # end
 
-    session[:"#{re_subdomain}"] = nil
-    session[:user_id] = nil
-    # session[:"#{re_subdomain}"] = user.id
-    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomain}"]}")
-    Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")
-
-    # if current_laboratory.main_site?
-    #   session[:user_id] = user.id
-    # else
-    #   session[:"#{request.subdomain}_user_id"] = user.id
-    # end
-
-    # session[:user_id] = user.id
+    session[:user_id] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end

From 3bc94842c32a8957e93f6b2a12d2bb8a6a2c3efb Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 20:21:44 +0800
Subject: [PATCH 25/27] 1

---
 app/controllers/hack_user_lastest_codes_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/hack_user_lastest_codes_controller.rb b/app/controllers/hack_user_lastest_codes_controller.rb
index 56cda57d7..fcbecec0d 100644
--- a/app/controllers/hack_user_lastest_codes_controller.rb
+++ b/app/controllers/hack_user_lastest_codes_controller.rb
@@ -103,7 +103,7 @@ class HackUserLastestCodesController < ApplicationController
         if exec_mode == "submit"
           @hack.hack_sets.map{|set| {input: set.input, output: set.output, caseId: set.id}}
         else
-          {input: params[:input]}
+          [{input: params[:input]}]
         end
     testCases = Base64.urlsafe_encode64(test_sets.to_json)
     #codeFileContent = Base64.urlsafe_encode64(@my_hack.code)

From c3cd7517cffb3cab9589054afe7d8b09b6ecc7be Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 20:30:42 +0800
Subject: [PATCH 26/27] 1

---
 app/controllers/hack_user_lastest_codes_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/hack_user_lastest_codes_controller.rb b/app/controllers/hack_user_lastest_codes_controller.rb
index fcbecec0d..9602673e5 100644
--- a/app/controllers/hack_user_lastest_codes_controller.rb
+++ b/app/controllers/hack_user_lastest_codes_controller.rb
@@ -136,7 +136,9 @@ class HackUserLastestCodesController < ApplicationController
     if @my_hack.hack_user_debug.present?
       @my_hack.hack_user_debug.update_attributes!(debug_params)
     else
-      @my_hack.hack_user_debug.create!(debug_params)
+      debug = HackUserDebug.new(debug_params)
+      debug.hack_user_lastest_code_id = @my_hack.id
+      debug.save!
     end
   end
 

From 1d93038691f5129147e56ae1c26c737dac449a52 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Nov 2019 20:34:49 +0800
Subject: [PATCH 27/27] 1

---
 db/migrate/20191120123353_add_code_forhack_user_debugs.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20191120123353_add_code_forhack_user_debugs.rb

diff --git a/db/migrate/20191120123353_add_code_forhack_user_debugs.rb b/db/migrate/20191120123353_add_code_forhack_user_debugs.rb
new file mode 100644
index 000000000..d3285f26b
--- /dev/null
+++ b/db/migrate/20191120123353_add_code_forhack_user_debugs.rb
@@ -0,0 +1,5 @@
+class AddCodeForhackUserDebugs < ActiveRecord::Migration[5.2]
+  def change
+    add_column :hack_user_debugs, :code, :text
+  end
+end