Skip to content

Commit

Permalink
Update deps & Fix weibo
Browse files Browse the repository at this point in the history
  • Loading branch information
zsxsoft committed Apr 23, 2016
1 parent db84b1b commit abae898
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/http/res/*
/http/res/*
config.js
15 changes: 15 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=759670
// for the documentation about the jsconfig.json format
"compilerOptions": {
"target": "es6"
},
"exclude": [
"node_modules",
"bower_components",
"jspm_packages",
"tmp",
"temp",
"lib/http/res"
]
}
4 changes: 2 additions & 2 deletions lib/ext/ext/weibo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/* global utils */
'use strict';
let Passport = require('passport');
let PassportSina = require('passport-weibo-token');
let PassportSina = require('passport-sina');
let session = require('express-session');
let cookieParser = require('cookie-parser');
let fs = require('fs');
Expand All @@ -24,7 +24,7 @@ passport.deserializeUser(function (obj, callback) {
*/
Passport.use(new PassportSina(config.ext.weibo,
function (accessToken, refreshToken, profile, callback) {
process.nextTick(() => {
process.nextTick(function () {
return callback(null, {
accessToken: accessToken,
profile: profile,
Expand Down
2 changes: 1 addition & 1 deletion lib/ext/ext/weibo/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<div class="row">
<p>你需要先使用新浪微博账号登录才可以发送弹幕。</p>
<p>程序<span style="color:red">无法</span>获知你的密码,也不会主动发送微博。</p>
<p>你可以随时在微博管理中心 -> 我的应用处取消授权。</p>
<p>你可以随时在微博管理中心 -&gt; 我的应用处取消授权。</p>
</div>
<div class="row">
<p>
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
"start": "node app.js"
},
"dependencies": {
"async": "^1.5.2",
"body-parser": "^1.14.2",
"async": "^2.0.0-rc.3",
"body-parser": "^1.15.0",
"cookie-parser": "^1.4.1",
"ejs": "^2.3.4",
"ejs": "^2.4.1",
"errorhandler": "^1.4.3",
"express": "^4.13.4",
"express-session": "^1.13.0",
"memcached": "^2.2.1",
"morgan": "^1.6.1",
"morgan": "^1.7.0",
"mysql": "^2.10.2",
"passport": "^0.3.2",
"passport-weibo-token": "3.0.6",
"socket.io": "^1.4.4"
"passport-sina": "git+https://github.com/zsxtoys/passport-sina-fork.git",
"socket.io": "^1.4.5"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-jshint": "^0.12.0"
"grunt": "^1.0.1",
"grunt-contrib-jshint": "^1.0.0"
},
"description": "danmu-server",
"main": "app.js",
Expand Down

0 comments on commit abae898

Please sign in to comment.