Master

app.js

@@ -3,36 +3,52 @@ var express = require('express'),
 	path = require('path'),
 	conf = require('./conf.js'),
 	//multer  = require('multer'),
-	ejs = require('ejs');
+	ejs = require('ejs'),
+	passport = require('passport'),
+	bodyParser = require('body-parser'),
+	cookieParser = require('cookie-parser'),
+	session = require('express-session'),
+	StrategyQQ = require('passport-qq').Strategy;
 
 var app = express();
-
-var bodyParser = require('body-parser');
-
 var jsonParser = bodyParser.json();
 var urlencodedParser = bodyParser.urlencoded({ extended: false });
-
 var errorLogfile = fs.createWriteStream('error.log', {flags: 'a'});
 
 app.engine('.html', ejs.renderFile);
 app.set('etag', 'strong');
 app.set('view engine', 'html');
 app.set('views', path.join(__dirname, '/views'));
 
-app.use(express.static(path.join(__dirname, '/public')));
 
-app.use(express.static(path.join(__dirname, '/download')));
+app.use(cookieParser());
+app.use(bodyParser());
+app.use(session({ secret: 'keyboard cat' }));
 
-// app.use(multer({ dest: './uploads/'}));
+app.use(passport.initialize());
+app.use(passport.session());
+app.use(require('./route'));
 
+app.use(express.static(path.join(__dirname, '/public')));
+app.use(express.static(path.join(__dirname, '/download')));
+// app.use(multer({ dest: './uploads/'}));
 app.use(jsonParser);
 // 缺少这个，会导致 req.body = {}
 app.use(urlencodedParser);
-
 // cookie
-var cookieParser = require('cookie-parser');
-app.use(cookieParser());
-app.use(require('./routes'));
+
+
+
+
+
+// 授权成功将整个user对象存入session
+passport.serializeUser(function(user, done){
+	done(null, user);
+});
+passport.deserializeUser(function(obj, done){
+	done(null, obj);
+})
+
 
 
 // app.use(function(err, req, res, next) {

conf.js

@@ -15,6 +15,14 @@ module.exports = {
 		port: 27017,
 		dbName: 'iconfonts'
 	},
+
+	// QQ互联应用信息
+	appId: 101334858,
+	appKey: '6db56cd9b88dc0074cc468d0c444cd0a',
+	origin: 'http://iconfont.imweb.io',
+
+	userID: '833D4B884C0D1DAD412680DDA3031F6B',
+
     diff: 32,
 	auth: {
 		upload: 1,

midware/addUserToMongo.js

@@ -0,0 +1,46 @@
+var User = require('../model/user.js');
+
+
+
+function addUserToMongo(req, res, next){
+	var user = req.user;
+	if (!user) {
+		return res.redirect('http://iconfont.imweb.io/user/auth/qq');
+	}
+
+
+	User.find({
+		id: req.user.id
+	}).exec(function(err, user){
+		// console.log(user);
+		if (err) {
+			return console.log("find user出错")
+		}
+		var newuser = {
+			user: req.user.nickname,
+			id: req.user.id,
+			img: req.user._json.figureurl_qq_1
+		};
+
+		// if (user.length === 0) {
+		// 	User.create(newuser, function(err){
+		// 		if (err) return console.log(err);
+		// 	});
+		// }
+
+		User.update({
+			id: req.user.id
+		},{
+			$set: newuser
+		}).exec(function(err){
+			if (err) {
+				return console.log(err)
+			}
+		})
+
+
+		next();
+	})
+}
+
+module.exports = addUserToMongo;

midware/auth.js

@@ -14,7 +14,8 @@ var authOptions = {
 };
 
 function authCheck(req, res, next) {
-    if (req.cookies.accessToken) {
+    if (req.user.accessToken) {
+        console.log(req.user);
         authOptions.path = AUTH_URL;
         ['uin', 'skey', 'accessToken'].forEach(function(key) {
             authOptions.path += '/' + req.cookies[key];
@@ -28,7 +29,7 @@ function authCheck(req, res, next) {
             res.on('end', function () {
                 var d = JSON.parse(data);
                 if(d.retcode !== 200) {
-                    return res.redirect('http://imweb.io');
+                    return res.redirect('http://iconfont.imweb.io/intro');
                 }
                 next();
             });
@@ -38,7 +39,8 @@ function authCheck(req, res, next) {
         });
         return authReq.end();
     }
-    res.redirect('http://imweb.io');
+    console.log(req.user);
+    res.redirect('http://iconfont.imweb.io/intro');
 }
 
 module.exports = authCheck;

models/business.js → model/business.js

@@ -1,24 +1,23 @@
 /*
-* @author helondeng
+* @author junmo
  */
 var mongoose = require('mongoose'),
-    autoIncrement = require('mongoose-auto-increment');
-    db = require('../utils/db.js');
+	autoIncrement = require('mongoose-auto-increment'),
+	db = require('../utils/db.js');
 
 var BusinessSchema = mongoose.Schema({
     name: String,
-    pm: String
+    pm: String,
+    id: String
 });
 
+
 BusinessSchema.plugin(autoIncrement.plugin, {
     model: 'Business',
     field: 'bid', 
     startAt: 1,
     incrementBy: 1
 });
 
-
-
-var Business = mongoose.model('Business', BusinessSchema);
-
-module.exports = Business;
+var Business = mongoose.model('newbusinesses', BusinessSchema)
+module.exports = Business;

models/icon.js → model/icon.js

@@ -1,5 +1,5 @@
 /*
- * @author moxhe
+ * @author junmo
  */
 var EventEmitter = require('eventemitter2').EventEmitter2,
     emitter = new EventEmitter();
@@ -14,7 +14,8 @@ var IconSchema = mongoose.Schema({
     //content: String, // content 根据 iconId生成，不需要存储
     business: String, // 业务相关，方便后续分类
     author: String,
-    path: String // 文件路径
+    path: String, // 文件路径
+    id: String
 });
 
 // iconId 自增，确保唯一性
@@ -63,15 +64,18 @@ IconSchema.statics.insertByOrder = function (icons, finishCb) {
 
 IconSchema.statics.insertOne = function (obj) {
     this.find({
-        name: obj.name
+        name: obj.name,
+        id: obj.id
     }).exec(function (err, icons) {
+        // console.log('obj是这个:',obj);
         if (!icons.length) {
             var icon = new Icon({
                 name: obj.name,
                 business: obj.business,
                 path: obj.path,
                 author: obj.author,
-                className: 'i-' + obj.name
+                className: 'i-' + obj.name,
+                id: obj.id
             });
             icon.save(function (err, icon) {
                 emitter.emit('insert_success', err, obj);
@@ -82,6 +86,6 @@ IconSchema.statics.insertOne = function (obj) {
     });
 };
 
-var Icon = mongoose.model('Icon', IconSchema);
+var Icon = mongoose.model('newicons', IconSchema);
 
-module.exports = Icon;
+module.exports = Icon;

models/tag.js → model/tag.js

@@ -1,5 +1,5 @@
 /*
-* @author helondeng
+* @author junmo
  */
 var mongoose = require('mongoose'),
     autoIncrement = require('mongoose-auto-increment');
@@ -19,9 +19,9 @@ TagSchema.plugin(autoIncrement.plugin, {
 });
 
 
-var Tag = mongoose.model('Tag', TagSchema);
+var Tag = mongoose.model('newtags', TagSchema);
 
 
 
 
-module.exports = Tag;
+module.exports = Tag;

model/user.js

@@ -0,0 +1,24 @@
+/*
+* @author junmo
+ */
+var mongoose = require('mongoose'),
+    // autoIncrement = require('mongoose-auto-increment');
+    db = require('../utils/db.js');
+
+var UserSchema =new mongoose.Schema({
+	// imweb.io cookie user's name
+    user: String,
+    id: String,
+    img: String,
+    // 有无更新权限
+    auth: {
+    	type: Number,
+    	default: 0
+    }
+});
+
+
+
+var User = mongoose.model('newUsers', UserSchema);
+
+module.exports = User;

package.json

@@ -21,14 +21,17 @@
     "body-parser": "^1.13.1",
     "cookie-parser": "^1.3.5",
     "ejs": "~2.3.2",
+    "eventemitter2": "^0.4.14",
     "express": "~4.13.0",
+    "express-session": "^1.14.0",
     "font-carrier": "0.0.4",
     "mongoose": "^4.1.1",
+    "mongoose-auto-increment": "^5.0.1",
     "multer": "^0.1.8",
+    "passport": "^0.3.2",
+    "passport-qq": "0.0.3",
     "q": "^1.4.1",
-    "unzip": "^0.1.11",
-    "mongoose-auto-increment": "^4.0.0",
-    "eventemitter2": "^0.4.14"
+    "unzip": "^0.1.11"
   },
   "devDependencies": {
     "pm2": "*"