From 42c6e4c5c50ac14b1ed44aa47d836ded8c14c470 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 10:26:57 +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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 2144e9c2c..1d0abac39 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -431,11 +431,11 @@ class WechatsController < ActionController::Base
         session[:wechat_openid] = open_id
         if params[:code]
           if params[:userid]
-            render "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
           elsif params[:id]
-            render "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
           else
-            render "/wechat/user_activities##{@path}" and return
+            redirect_to "/wechat/user_activities##{@path}" and return
           end
           # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end

From 2e86738fd2814244edd437187c4c8c1cc496482c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 10:42:40 +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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 1d0abac39..1deb55d63 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -431,11 +431,11 @@ class WechatsController < ActionController::Base
         session[:wechat_openid] = open_id
         if params[:code]
           if params[:userid]
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}",layout: nil and return
           elsif params[:id]
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}",layout: nil and return
           else
-            redirect_to "/wechat/user_activities##{@path}" and return
+            redirect_to "/wechat/user_activities##{@path}",layout: nil and return
           end
           # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end

From a38d4f15a6f182650b6516c27f1f47fdd991bdb1 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 10:50:22 +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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 1deb55d63..364e8f22e 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -431,11 +431,11 @@ class WechatsController < ActionController::Base
         session[:wechat_openid] = open_id
         if params[:code]
           if params[:userid]
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}",layout: nil and return
+            render "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}",layout: nil and return
           elsif params[:id]
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}",layout: nil and return
+            render "/wechat/user_activities##{@path}?id=#{params[:id]}",layout: nil and return
           else
-            redirect_to "/wechat/user_activities##{@path}",layout: nil and return
+            render "/wechat/user_activities##{@path}",layout: nil and return
           end
           # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end

From 041200918205cf87cf361816135196caa30b6985 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 11:13:14 +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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 364e8f22e..6ccfbcce1 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -419,9 +419,9 @@ class WechatsController < ActionController::Base
       logger.info "user_activities!!!!!!!!!!!!!!"
       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")
-        @path = '/login'
-      else
+      # 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'
+      # else
         if params[:state] == 'myclass'
           @course_id = params[:id];
         elsif params[:state] == 'myproject'
@@ -431,15 +431,15 @@ class WechatsController < ActionController::Base
         session[:wechat_openid] = open_id
         if params[:code]
           if params[:userid]
-            render "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}",layout: nil and return
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
           elsif params[:id]
-            render "/wechat/user_activities##{@path}?id=#{params[:id]}",layout: nil and return
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
           else
-            render "/wechat/user_activities##{@path}",layout: nil and return
+            redirect_to "/wechat/user_activities##{@path}" and return
           end
           # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end
-      end
+      # end
       render 'wechats/user_activities', layout: nil
     end
 

From 53bca5c0066f0fea50a78d3fd6aa521680758f0b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 13:52:40 +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 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 6ccfbcce1..619c0f586 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -419,9 +419,12 @@ class WechatsController < ActionController::Base
       logger.info "user_activities!!!!!!!!!!!!!!"
       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")
-      #   @path = '/login'
-      # else
+      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)
+          @path = '/login'
+        end
+        session["login"] = nil
+      else
         if params[:state] == 'myclass'
           @course_id = params[:id];
         elsif params[:state] == 'myproject'
@@ -430,6 +433,8 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
+          #不跳转至绑定界面的标志
+          session["login"] = false
           if params[:userid]
             redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
           elsif params[:id]
@@ -439,7 +444,7 @@ class WechatsController < ActionController::Base
           end
           # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end
-      # end
+      end
       render 'wechats/user_activities', layout: nil
     end
 

From 75d81d5dba3c9ef435e2572c526ddcd0ddc6fe8c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 14:09:29 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BB=91=E5=AE=9A=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/controllers/activity.js              | 2 +-
 public/javascripts/wechat/controllers/class.js                 | 2 +-
 public/javascripts/wechat/controllers/class_list.js            | 2 +-
 public/javascripts/wechat/controllers/edit_class.js            | 2 +-
 public/javascripts/wechat/controllers/edit_class_member.js     | 2 +-
 public/javascripts/wechat/controllers/edit_project_member.js   | 2 +-
 public/javascripts/wechat/controllers/join_class.js            | 2 +-
 public/javascripts/wechat/controllers/join_project.js          | 2 +-
 public/javascripts/wechat/controllers/myresource.js            | 2 +-
 public/javascripts/wechat/controllers/new_class.js             | 2 +-
 public/javascripts/wechat/controllers/new_project.js           | 2 +-
 public/javascripts/wechat/controllers/project.js               | 2 +-
 public/javascripts/wechat/controllers/project_list.js          | 2 +-
 public/javascripts/wechat/controllers/review_class_member.js   | 2 +-
 public/javascripts/wechat/controllers/review_project_member.js | 2 +-
 public/javascripts/wechat/controllers/send_class_list.js       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 3f75d9e99..e646da5b9 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -3,7 +3,7 @@ app.controller('ActivityController',
     ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common','alertService',
     function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common, alertService){
 
-    common.checkLogin();
+//    common.checkLogin();
 
 
     $scope.replaceUrl = function(url){
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index 1e03277a2..d372f6826 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -1,5 +1,5 @@
 app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms','common', function($scope, config, $http, auth, $location, $routeParams,alertService,rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
     var courseid = $routeParams.id;
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index cc5b12ff6..cc5250970 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -5,7 +5,7 @@
 
 app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms','common',
     function ($scope, config, auth, $http, $location, alertService,rms,common) {
-        common.checkLogin();
+//        common.checkLogin();
 
         var vm = $scope;
         vm.syllabuses = rms.get('syllabuses') || [];
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
index 30c78e35a..d61c25353 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -1,7 +1,7 @@
 
 
 app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/edit_class_member.js b/public/javascripts/wechat/controllers/edit_class_member.js
index 7b28e1f4a..e00e36f20 100644
--- a/public/javascripts/wechat/controllers/edit_class_member.js
+++ b/public/javascripts/wechat/controllers/edit_class_member.js
@@ -1,7 +1,7 @@
 
 
 app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/edit_project_member.js b/public/javascripts/wechat/controllers/edit_project_member.js
index d5b8788d8..511db35bb 100644
--- a/public/javascripts/wechat/controllers/edit_project_member.js
+++ b/public/javascripts/wechat/controllers/edit_project_member.js
@@ -1,7 +1,7 @@
 
 
 app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/join_class.js b/public/javascripts/wechat/controllers/join_class.js
index 3992a8ae3..1a9710bc1 100644
--- a/public/javascripts/wechat/controllers/join_class.js
+++ b/public/javascripts/wechat/controllers/join_class.js
@@ -1,7 +1,7 @@
 
 
 app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','wx','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,wx,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/join_project.js b/public/javascripts/wechat/controllers/join_project.js
index 915277d3b..d942e8859 100644
--- a/public/javascripts/wechat/controllers/join_project.js
+++ b/public/javascripts/wechat/controllers/join_project.js
@@ -1,7 +1,7 @@
 
 
 app.controller('JoinProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','wx','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,wx,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index 706827b8e..089b63dfc 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -1,5 +1,5 @@
 app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', 'rms','common', function($scope, $http, auth, config, $location,rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 //    vm.menus = ['课件', '作业', '测验'];
diff --git a/public/javascripts/wechat/controllers/new_class.js b/public/javascripts/wechat/controllers/new_class.js
index 0a8ea25b2..54bc396b6 100644
--- a/public/javascripts/wechat/controllers/new_class.js
+++ b/public/javascripts/wechat/controllers/new_class.js
@@ -1,7 +1,7 @@
 
 
 app.controller('NewClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms','common', function($scope, $http, auth, config, alertService, $location,rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/new_project.js b/public/javascripts/wechat/controllers/new_project.js
index a73da1419..03a1b451f 100644
--- a/public/javascripts/wechat/controllers/new_project.js
+++ b/public/javascripts/wechat/controllers/new_project.js
@@ -1,7 +1,7 @@
 
 
 app.controller('NewProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms','common', function($scope, $http, auth, config, alertService, $location,rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js
index 3c487eeb5..08987e491 100644
--- a/public/javascripts/wechat/controllers/project.js
+++ b/public/javascripts/wechat/controllers/project.js
@@ -1,5 +1,5 @@
 app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'auth','$location','$routeParams','alertService','rms','common', function($scope, config, $http,$timeout, auth, $location, $routeParams,alertService,rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     $scope.replaceUrl = function(url){
         return url;
diff --git a/public/javascripts/wechat/controllers/project_list.js b/public/javascripts/wechat/controllers/project_list.js
index 395215b25..e716de0a9 100644
--- a/public/javascripts/wechat/controllers/project_list.js
+++ b/public/javascripts/wechat/controllers/project_list.js
@@ -5,7 +5,7 @@
 
 app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms','common',
     function ($scope, config, auth, $http, $location, alertService,rms,common) {
-        common.checkLogin();
+//        common.checkLogin();
 
         var vm = $scope;
 //        vm.projects = rms.get('projects') || [];
diff --git a/public/javascripts/wechat/controllers/review_class_member.js b/public/javascripts/wechat/controllers/review_class_member.js
index 5bf8a36fd..aee8d683a 100644
--- a/public/javascripts/wechat/controllers/review_class_member.js
+++ b/public/javascripts/wechat/controllers/review_class_member.js
@@ -1,7 +1,7 @@
 
 
 app.controller('ReviewClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/review_project_member.js b/public/javascripts/wechat/controllers/review_project_member.js
index 2254a8340..5c652050f 100644
--- a/public/javascripts/wechat/controllers/review_project_member.js
+++ b/public/javascripts/wechat/controllers/review_project_member.js
@@ -1,7 +1,7 @@
 
 
 app.controller('ReviewProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
 
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index 0e7b912c6..ead0860f5 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -1,5 +1,5 @@
 app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'config','auth','alertService', 'rms','common', function($scope, $http, $routeParams, config, auth, alertService,rms,common){
-    common.checkLogin();
+//    common.checkLogin();
 
     var vm = $scope;
     var send_id = $routeParams.id;