Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

Conflicts: public/javascripts/wechat/wechat-dev.js
10 years ago · 406bb7930c
parent a9fd79ec63 d5124e128e
commit 406bb7930c
6 changed files with 373 additions and 325 deletions
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
--- a/config/menu.yml
+++ b/config/menu.yml
@ -1,20 +1,20 @@
-button:
- -
-  type: "view"
-  name: "最新动态"
-  url: "http://wechat.trustie.net/assets/wechat/issue.html"
- -
-  type: "click"
-  name: "意见返馈"
-  key:  "FEEDBACK"
- -
-  name: "更多"
-  sub_button:
-  -
-    type: "view"
-    name: "进入网站"
-    url:  "http://www.trustie.net/"
-  -
-    type: "view"
-    name: "使用手册"
+button:
+ -
+  type: "view"
+  name: "最新动态"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://wechat.trustie.net/assets/wechat/issue.html&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+ -
+  type: "click"
+  name: "意见返馈"
+  key:  "FEEDBACK"
+ -
+  name: "更多"
+  sub_button:
+  -
+    type: "view"
+    name: "进入网站"
+    url:  "http://www.trustie.net/"
+  -
+    type: "view"
+    name: "使用手册"
    url:  "https://www.trustie.net/organizations/1/downloads"
--- a/config/routes.rb
+++ b/config/routes.rb
@ -1165,6 +1165,7 @@ RedmineApp::Application.routes.draw do
    collection do
      get :login
      post :bind
+      get :get_open_id
    end
  end

--- a/public/assets/wechat/issue.html
+++ b/public/assets/wechat/issue.html
@ -1,52 +1,50 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>react js</title>
-  <meta charset='utf-8' />
-  <meta name="keywords" content="" />
-  <meta name="description" content="" />
-  <meta name="apple-mobile-web-app-capable" content="no">
-  <meta content='True' name='HandheldFriendly' />
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-
-  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
-
-</head>
-<body>
-<div id="container"></div>
-
-
-
-
-<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<script id="t:result-list" type="text/html">
-
-  <! for(var i =0; i <issues.length; ++i){ !>
-  <div class="post-container">
-    <div class="post-wrapper">
-      <div class="post-main">
-        <div class="post-avatar fl"><img src="<!=issues[i].author.img_url!>" width="45" height="45" class="border-radius" /></div>
-        <div class="post-title hidden mb5"><span class="c-grey3 f15 fb"><!=issues[i].subject!></span></div>
-        <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10"><!=issues[i].author.nickname!></a>项目问题</div>
-        <div class="cl"></div>
-        <div class="post-content c-grey2 mt10">
-          <div class="post-all-content"><!=issues[i].description!></div>
-        </div>
-        <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more " style="text-decoration:underline">点击展开</a>
-        <div class="cl"></div>
-        <span  class="c-grey f13 mt10 fl"><!=issues[i].created_on!></span>
-        <div class="cl"></div>
-      </div>
-    </div>
-  </div>
-  <! } !>
-
-
-
-</script>
-
-<script src="/javascripts/jquery-1.3.2.js"></script>
-<script src="/javascripts/baiduTemplate.js"></script>
-<script src="/javascripts/wechat/wechat-dev.js"></script>
-</body>
+<!DOCTYPE html>
+<html>
+<head>
+  <title>react js</title>
+  <meta charset='utf-8' />
+  <meta name="keywords" content="" />
+  <meta name="description" content="" />
+  <meta name="apple-mobile-web-app-capable" content="no">
+  <meta content='True' name='HandheldFriendly' />
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+
+  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
+
+</head>
+<body>
+<div id="container"></div>
+
+<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<script id="t:result-list" type="text/html">
+
+  <! for(var i =0; i <issues.length; ++i){ !>
+  <div class="post-container">
+    <div class="post-wrapper">
+      <div class="post-main">
+        <div class="post-avatar fl"><img src="<!=issues[i].author.img_url!>" width="45" height="45" class="border-radius" /></div>
+        <div class="post-title hidden mb5"><span class="c-grey3 f15 fb"><!=issues[i].subject!></span></div>
+        <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10"><!=issues[i].author.nickname!></a>项目问题</div>
+        <div class="cl"></div>
+        <div class="post-content c-grey2 mt10">
+          <div class="post-all-content"><!=issues[i].description!></div>
+        </div>
+        <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more " style="text-decoration:underline">点击展开</a>
+        <div class="cl"></div>
+        <span  class="c-grey f13 mt10 fl"><!=issues[i].created_on!></span>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+  <! } !>
+
+
+
+</script>
+
+<script src="/javascripts/jquery-1.3.2.js"></script>
+<script src="/javascripts/baiduTemplate.js"></script>
+<script src="/javascripts/wechat/auth.js"></script>
+<script src="/javascripts/wechat/wechat-dev.js"></script>
+</body>
 </html>
--- a/public/javascripts/wechat/auth.js
+++ b/public/javascripts/wechat/auth.js
@ -0,0 +1,35 @@
+$(function(){
+    //获取url中的参数
+    function getUrlParam(name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
+        var r = window.location.search.substr(1).match(reg);  //匹配目标参数
+        if (r != null) return unescape(r[2]); return null; //返回参数值
+    }
+
+
+    var debug = false;
+
+    var g_openid = "";
+    if(debug){
+        g_openid = "填写要调试的openid即可";
+    }
+
+    window.getOpenId = function(cb){
+        if (g_openid.length>0){
+            cb(g_openid);
+        }
+        var code = getUrlParam("code");
+        $.ajax({
+            url: '/wechat/get_open_id?code='+code,
+            type: 'get',
+            dataType: 'json',
+            success: function(data){
+                g_openid = data.openid;
+                cb(g_openid);
+            },
+            error: function(xhr,err){
+                alert("认证失败: "+err);
+            }
+        });
+    }
+});
--- a/public/javascripts/wechat/wechat-dev.js
+++ b/public/javascripts/wechat/wechat-dev.js
@ -11,8 +11,6 @@ $(document).ready(function(){
    var apiUrl = '/api/v1/'
    var setTemplate = function(data){
        console.log(data);
-
-
        var html=bt('t:result-list',{issues: data});
        $('#container').prepend(html);
        descToggle();
@ -20,16 +18,20 @@ $(document).ready(function(){
    }

    var loadDataFromServer = function(page){
-        $.ajax({
-            url: apiUrl + 'activities/' + page + "?openid=",
-            dataType: 'json',
-            success: function(data){
-                setTemplate(data.data);
-            },
-            error: function(xhr,status,err){
-                console.log(err);
-            }
+        getOpenId(function(openid){
+            $.ajax({
+                url: apiUrl + 'issues/' + id + "?openid="+openid,
+                dataType: 'json',
+                success: function(data){
+                    setTemplate(data.data);
+                },
+                error: function(xhr,status,err){
+                    console.log(err);
+                }
+            });
        })
+
+
    };