From d9e031c314426c1c8e10b473db0183af557ba5be Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 14:34:42 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 619c0f586..a4797d82c 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -423,7 +423,7 @@ class WechatsController < ActionController::Base
         if !(session["login"] != nil && session["login"] == false)
           @path = '/login'
         end
-        session["login"] = nil
+        session.delete("login")
       else
         if params[:state] == 'myclass'
           @course_id = params[:id];

From 0c381ad53d2424c34f8b9c9e36796debbb539b3b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 14:42:04 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index a4797d82c..9fb6d0376 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -420,7 +420,7 @@ class WechatsController < ActionController::Base
       logger.info params
       
       unless (user_binded?(open_id) || params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
-        if !(session["login"] != nil && session["login"] == false)
+        if !(session["login"] != nil && session["login"] == false) || session["login"] == nil
           @path = '/login'
         end
         session.delete("login")

From 9e4aaa767ce24d15ea4183fadcd2c349ea575e6b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 14:57:28 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 9fb6d0376..174a3041a 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -434,7 +434,9 @@ class WechatsController < ActionController::Base
         session[:wechat_openid] = open_id
         if params[:code]
           #不跳转至绑定界面的标志
-          session["login"] = false
+          if params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message"
+            session["login"] = false
+          end
           if params[:userid]
             redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
           elsif params[:id]

From d5a7d10f5dca93d5123f1d59eb39c09955870e6b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 14:59:50 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 174a3041a..461cc7225 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -434,6 +434,7 @@ class WechatsController < ActionController::Base
         session[:wechat_openid] = open_id
         if params[:code]
           #不跳转至绑定界面的标志
+          session.delete("login")
           if params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message"
             session["login"] = false
           end

From 7f8a6f931b090844b16b8190ff23c0e615ae04fe Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 15:23:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 461cc7225..ebfd15057 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -404,6 +404,10 @@ class WechatsController < ActionController::Base
 
     def user_activities
 
+      if params[:state] == nil
+        return
+      end
+
       @appid = Wechat.config.appid
       ## sign
 
@@ -420,10 +424,7 @@ class WechatsController < ActionController::Base
       logger.info params
       
       unless (user_binded?(open_id) || params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
-        if !(session["login"] != nil && session["login"] == false) || session["login"] == nil
-          @path = '/login'
-        end
-        session.delete("login")
+        @path = '/login'
       else
         if params[:state] == 'myclass'
           @course_id = params[:id];
@@ -433,11 +434,6 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
-          #不跳转至绑定界面的标志
-          session.delete("login")
-          if params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message"
-            session["login"] = false
-          end
           if params[:userid]
             redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
           elsif params[:id]

From c275557fa73158891992aeb7724ce86ade9e1690 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 15:44:20 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index ebfd15057..cfa5f4414 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -404,10 +404,6 @@ class WechatsController < ActionController::Base
 
     def user_activities
 
-      if params[:state] == nil
-        return
-      end
-
       @appid = Wechat.config.appid
       ## sign
 
@@ -422,6 +418,11 @@ class WechatsController < ActionController::Base
 
       logger.info "user_activities!!!!!!!!!!!!!!"
       logger.info params
+
+      #保证下面的redirect_to "/wechat/user_activities##{@path}?id=...不会往下走
+      if params[:state] == nil
+        return
+      end
       
       unless (user_binded?(open_id) || params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
         @path = '/login'