diff --git a/.eslintignore b/.eslintignore index 1739bcf..17e65bd 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,2 @@ -/http/res/* \ No newline at end of file +/http/res/* +config.js \ No newline at end of file diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 0000000..a871498 --- /dev/null +++ b/jsconfig.json @@ -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" + ] +} diff --git a/lib/ext/ext/weibo/index.js b/lib/ext/ext/weibo/index.js index 90c74b0..20a6280 100644 --- a/lib/ext/ext/weibo/index.js +++ b/lib/ext/ext/weibo/index.js @@ -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'); @@ -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, diff --git a/lib/ext/ext/weibo/login.html b/lib/ext/ext/weibo/login.html index 7b2aae7..1a9c4e0 100644 --- a/lib/ext/ext/weibo/login.html +++ b/lib/ext/ext/weibo/login.html @@ -41,7 +41,7 @@
你需要先使用新浪微博账号登录才可以发送弹幕。
程序无法获知你的密码,也不会主动发送微博。
-你可以随时在微博管理中心 -> 我的应用处取消授权。
+你可以随时在微博管理中心 -> 我的应用处取消授权。
diff --git a/package.json b/package.json index d4f7cbe..1cd7536 100644 --- a/package.json +++ b/package.json @@ -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",