From 7d4de365216a1a13b26cef7b84253fb00fa23708 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sat, 2 Apr 2016 07:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9openid=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb            | 6 +++---
 public/assets/wechat/blog_detail.html        | 2 +-
 public/assets/wechat/course_discussion.html  | 2 +-
 public/assets/wechat/course_notice.html      | 2 +-
 public/assets/wechat/homework_detail.html    | 2 +-
 public/assets/wechat/issue_detail.html       | 2 +-
 public/assets/wechat/message_detail.html     | 2 +-
 public/assets/wechat/project_discussion.html | 2 +-
 public/javascripts/wechat/wechat_dev.js      | 4 +++-
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 9329ea860..15f244715 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -9,10 +9,10 @@ module Mobile
 
         params do
           requires :page, type: Integer
+          requires :token, type: String
         end
-        get ':id' do
-          #uw = UserWechat.find params[:openid]
-          user = User.find params[:id]
+        post do
+          user = UserWechat.find_by_openid(params[:openid])
           shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
           page = params[:page] ? params[:page] : 0
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 8b3f44eb5..dd40df5ab 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -66,8 +66,8 @@
 
 <script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/blog_detail.js"></script>
 <script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/blog_detail.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index acef95c64..93982d70c 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -82,8 +82,8 @@
 
 <script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/course_discussion.js"></script>
 <script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/course_discussion.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 6765281fa..33ea6fe4b 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -84,8 +84,8 @@
 
 <script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/course_notice.js"></script>
 <script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/course_notice.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index c4f7b8ad2..6f7449754 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -83,8 +83,8 @@
 
 <script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/homework_detail.js"></script>
 <script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/homework_detail.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 964ea7d5b..8a3cb73b1 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -83,7 +83,7 @@
 
 <script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/issue_detail.js"></script>
 <script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/issue_detail.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/message_detail.html b/public/assets/wechat/message_detail.html
index 04563184f..3709f65cf 100644
--- a/public/assets/wechat/message_detail.html
+++ b/public/assets/wechat/message_detail.html
@@ -64,8 +64,8 @@
 
 <script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/message_detail.js"></script>
 <script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/message_detail.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 5201d8299..0c0428a03 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -66,8 +66,8 @@
 
 <script src="/javascripts/jquery-1.3.2.js"></script>
 <script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/homework-detail.js"></script>
 <script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/homework-detail.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/public/javascripts/wechat/wechat_dev.js b/public/javascripts/wechat/wechat_dev.js
index 18fe67e1f..36529e0b8 100644
--- a/public/javascripts/wechat/wechat_dev.js
+++ b/public/javascripts/wechat/wechat_dev.js
@@ -11,7 +11,9 @@ $(document).ready(function(){
     var loadDataFromServer = function(id, page){
         getOpenId(function(openid){
             $.ajax({
-                url: apiUrl + 'activities/' + openid +"?page=" + parseInt(page),
+                url: apiUrl + 'activities',
+                data: {openid: openid, page: page},
+                type: 'POST',
                 dataType: 'json',
                 success: function(data){
                     setTemplate(data.data, data.all_count, data.count, data.page);