From 80d5424ff313a187476f9361aa26aee1d2e18684 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 5 Apr 2016 16:36:18 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=87=BA?=
=?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/wechat/app.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 7e5983652..68eb5ed85 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -113,7 +113,6 @@ app.controller('IssueController', function($scope, $http, $routeParams, auth){
});
}
- console.log(auth.getOpenId());
});
From afd779f2924e2674fcbf296596200019e2a367d7 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 5 Apr 2016 17:19:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8cookies=E5=AD=98=E5=82=A8?=
=?UTF-8?q?openid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/wechat/app.html | 1 +
public/javascripts/wechat/app.js | 37 ++++++++++++++++++--------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index ef8e06d64..d2eebb0b8 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -19,6 +19,7 @@
+
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 68eb5ed85..4d2d71dd7 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,18 +1,16 @@
-var app = angular.module('wechat', ['ngRoute']);
+var app = angular.module('wechat', ['ngRoute','ngCookies']);
var apiUrl = 'http://wechat.trustie.net/api/v1/';
-//var openid= "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";
-var openid = '';
var debug = false; //调试标志,如果在本地请置为true
-if(debug===true){
- openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";
-}
+app.factory('auth', function($http,$routeParams, $cookies){
+ var _openid = '';
-app.factory('auth', function($http,$routeParams){
- var _openid = openid;
+ if(debug===true){
+ _openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";
+ }
var getOpenId = function(cb) {
- if (_openid.length > 0) {
+ if (typeof _openid !== 'undefined' || _openid.length > 0) {
cb(_openid);
return;
}
@@ -23,19 +21,24 @@ app.factory('auth', function($http,$routeParams){
method: 'POST'
}).then(function successCallback(response) {
_openid = response.data.openid;
- openid = _openid;
+ if(debug !== true){ //如果是生产环境,就存到cookies中
+ $cookies.put("openid", _openid);
+ }
cb(_openid);
}, function errorCallback(response) {
- cb(null);
+ if(debug!==true){//考虑从cookies中取出
+ _openid = $cookies.get('openid');
+ }
+ cb(_openid);
});
};
- var setOpenId = function(id){
- _openid = id;
+ var openid = function(){
+ return _openid;
}
- return {getOpenId: getOpenId, setOpenId: setOpenId};
+ return {getOpenId: getOpenId, openid: openid};
});
app.controller('ActivityController',function($scope, $http, auth){
@@ -43,6 +46,8 @@ app.controller('ActivityController',function($scope, $http, auth){
return "http://www.trustie.net/" + url;
}
+ console.log("ActivityController load");
+
$scope.activities = [];
$scope.page = 1;
@@ -51,7 +56,7 @@ app.controller('ActivityController',function($scope, $http, auth){
$http({
method: 'POST',
url: apiUrl+ "activities",
- data: {openid: openid, page: page},
+ data: {openid: auth.openid(), page: page},
}).then(function successCallback(response) {
$scope.activities = $scope.activities.concat(response.data.data);
}, function errorCallback(response) {
@@ -98,7 +103,7 @@ app.controller('IssueController', function($scope, $http, $routeParams, auth){
var userInfo = {
type: "Issue",
content: data.comment,
- openid: openid,
+ openid: auth.openid(),
};
$http({
From 23ec67b2ebe34f60ea26416b7b8c944a1f30edb5 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 5 Apr 2016 17:23:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=87=BA?=
=?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/wechat/app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4d2d71dd7..119e962d1 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies){
}
var getOpenId = function(cb) {
- if (typeof _openid !== 'undefined' || _openid.length > 0) {
+ if (typeof _openid !== 'undefined' && _openid.length > 0) {
cb(_openid);
return;
}
From 606599047d5a3452290321bc1bb32de3cf65d6dd Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 5 Apr 2016 17:35:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=87=BA?=
=?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/wechat/app.js | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 119e962d1..5a18a2e35 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -21,20 +21,22 @@ app.factory('auth', function($http,$routeParams, $cookies){
method: 'POST'
}).then(function successCallback(response) {
_openid = response.data.openid;
- if(debug !== true){ //如果是生产环境,就存到cookies中
- $cookies.put("openid", _openid);
+ if(typeof _openid !== 'undefined' && _openid.length>0){
+ if(debug !== true){ //如果是生产环境,就存到cookies中
+ $cookies.put("openid", _openid);
+ }
+ } else {
+ if(debug!==true){//考虑从cookies中取出
+ _openid = $cookies.get('openid');
+ }
}
+
cb(_openid);
}, function errorCallback(response) {
- if(debug!==true){//考虑从cookies中取出
- _openid = $cookies.get('openid');
- }
- cb(_openid);
+ cb(null);
});
};
-
-
var openid = function(){
return _openid;
}