diff --git a/invitation.js b/invitation.js
index 6626b34..0eee304 100644
--- a/invitation.js
+++ b/invitation.js
@@ -1,5 +1,5 @@
-
var Step = require('step');
+var fs = require('fs');
var mongo = require('mongodb');
var check = require('validator').check;
var msg=require('./msg.js');
@@ -61,6 +61,7 @@ exports.welcome=function(req, res){
res.send(invitation);
});
}
+
exports.create=function(req, res){
//validateInvitation(req.body);
Step(
@@ -94,10 +95,7 @@ exports.create=function(req, res){
},
function sendNotification(err,invitation){
if (err) throw err;
- var weiboIds=[];
- for (var i = 0; i < invitation.invitees.length; i++) {
- weiboIds.push(invitation.invitees[i].user.weiboId);
- }
+ var weiboIds=getNotificationList(invitation,invitation.inviter.user.weiboId);
var msg=invitation.inviter.user.weiboName+'发起了一个活动('+invitation.shopList[0].shopName+')';
notification.send(weiboIds,msg,{});
return invitation;
@@ -176,31 +174,15 @@ exports.replyStatus= function(req, res){
{safe:true,new:true},
this);
},
- function sendMessage(err,invitation){
- if (err) throw err;
- // invitation.invitees.forEach(function(invitee){
- // msg.addMessage(invitee.user.weiboId,{type:'status',body:req.body});
- // });
- // msg.addMessage(invitation.inviter.user.weiboId,{type:'status',body:req.body});
- return invitation;
- },
function sendNotification(err,invitation){
if (err) throw err;
- var weiboIds=[];
var msg='';
if(req.body.status==='accept'){
msg=req.body.user.weiboName+'参加了活动('+invitation.shopList[0].shopName+')';
}else{
msg=req.body.user.weiboName+'拒绝了活动('+invitation.shopList[0].shopName+')';
}
- if(invitation.inviter.user.weiboId!=req.body.user.weiboId){
- weiboIds.push(invitation.inviter.user.weiboId);
- }
- for (var i = 0; i < invitation.invitees.length; i++) {
- if(invitation.invitees[i].user.weiboId!=req.body.user.weiboId){
- weiboIds.push(invitation.invitees[i].user.weiboId);
- }
- }
+ var weiboIds=getNotificationList(invitation,req.body.user.weiboId);
notification.send(weiboIds,msg,{});
return invitation;
},
@@ -222,28 +204,37 @@ exports.replyComment=function(req, res){
{$push:{'replyList':req.body}, $set:{'lastUpdateDate':new Date()}},
{safe:true,new:true},
this);
- },
- function sendMessage(err,invitation){
+ },function sendNotification(err,invitation){
if (err) throw err;
- // invitation.invitees.forEach(function(invitee){
- // msg.addMessage(invitee.user.weiboId,{type:'reply',body:req.body});
- // });
- // msg.addMessage(invitation.inviter.user.weiboId,{type:'reply',body:req.body});
+ var msg=req.body.user.weiboName+'发表了回复:'+req.body.content;
+ var weiboIds=getNotificationList(invitation,req.body.user.weiboId);
+ notification.send(weiboIds,msg,{});
return invitation;
},
+ function generateResponse(err, invitation){
+ if (err) throw err;
+ res.send(invitation);
+ });
+}
+
+exports.addPic=function(req, res){
+ Step(
+ function getCollection(){
+ db.collection('invitation', this);
+ },
+ function updateData(err,collection){
+ if (err) throw err;
+ collection.findAndModify(
+ {'_id':new BSON.ObjectID(req.params.id)},[],
+ {$push:{'picWall':req.body}, $set:{'lastUpdateDate':new Date()}},
+ {safe:true,new:true},
+ this);
+ },
function sendNotification(err,invitation){
if (err) throw err;
- var msg=req.body.user.weiboName+'发表了回复:'+req.body.content;
- var weiboIds=[];
- if(invitation.inviter.user.weiboId!=req.body.user.weiboId){
- weiboIds.push(invitation.inviter.user.weiboId);
- }
- for (var i = 0; i < invitation.invitees.length; i++) {
- if(invitation.invitees[i].user.weiboId!=req.body.user.weiboId){
- weiboIds.push(invitation.invitees[i].user.weiboId);
- }
- }
- notification.send(weiboIds,msg,{});
+ // var msg=req.body.user.weiboName+'添加了一张图片';
+ // var weiboIds=getNotificationList(invitation,req.body.user.weiboId);
+ // notification.send(weiboIds,msg,{});
return invitation;
},
function generateResponse(err, invitation){
@@ -252,6 +243,18 @@ exports.replyComment=function(req, res){
});
}
+function getNotificationList(invitation,senderId){
+ var weiboIds=[];
+ if(invitation.inviter.user.weiboId!=senderId){
+ weiboIds.push(invitation.inviter.user.weiboId);
+ }
+ for (var i = 0; i < invitation.invitees.length; i++) {
+ if(invitation.invitees[i].user.weiboId!=senderId){
+ weiboIds.push(invitation.invitees[i].user.weiboId);
+ }
+ }
+ return weiboIds
+}
function validateInvitation(invitation){
check(invitation.inviter).isNull();
diff --git a/lib/picUtils.js b/lib/picUtils.js
new file mode 100644
index 0000000..6431269
--- /dev/null
+++ b/lib/picUtils.js
@@ -0,0 +1,24 @@
+Date.prototype.format = function (fmt) { //author: meizz
+ var o = {
+ "M+": this.getMonth() + 1, //月份
+ "d+": this.getDate(), //日
+ "h+": this.getHours(), //小时
+ "m+": this.getMinutes(), //分
+ "s+": this.getSeconds(), //秒
+ "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+ "S": this.getMilliseconds() //毫秒
+ };
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ return fmt;
+}
+
+exports.generatePicPath=function () {
+ return '/user/'+ new Date().format('yyyyMMddhhmmss');
+}
+
+exports.getDomian=function () {
+ return 'http://lets-party-pic.b0.upaiyun.com';
+
+}
\ No newline at end of file
diff --git a/lib/upyun.js b/lib/upyun.js
new file mode 100644
index 0000000..c51cc6d
--- /dev/null
+++ b/lib/upyun.js
@@ -0,0 +1,338 @@
+var crypto = require('crypto');
+var http = require('http');
+
+var _apiDomain = 'v0.api.upyun.com';
+var _autoMkdir = false;
+var _contentMD5 = null;
+var _fileSecret = null;
+var _tmpInfo = {};
+
+var _bucketname, _username, _password;
+
+/**
+ * 初始化 UpYun 存储接口
+ * @param bucketname 空间名称
+ * @param username 操作员名称
+ * @param password 密码
+ * return null
+ */
+var UPYun = function (bucketname, username, password) {
+ _bucketname = bucketname;
+ _username = username;
+ _password = md5(password);
+}
+
+exports.UPYun = UPYun;
+
+UPYun.prototype.version = function(){
+ return '1.0.1';
+}
+
+/**
+ * 切换 API 接口的域名
+ * @param domain {默认 v0.api.upyun.com 自动识别, v1.api.upyun.com 电信, v2.api.upyun.com 联通, v3.api.upyun.com 移动}
+ * return null;
+ */
+UPYun.prototype.setApiDomain = function (domain) {
+ _apiDomain = domain;
+}
+
+/**
+ * 设置待上传文件的 Content-MD5 值（如又拍云服务端收到的文件MD5值与用户设置的不一致，将回报 406 Not Acceptable 错误）
+ * @param $str （文件 MD5 校验码）
+ * return null;
+ */
+UPYun.prototype.setContentMD5 = function(str){
+ _contentMD5 = str;
+}
+
+/**
+* 设置待上传文件的 访问密钥（注意：仅支持图片空！，设置密钥后，无法根据原文件URL直接访问，需带 URL 后面加上 （缩略图间隔标志符+密钥） 进行访问）
+* 如缩略图间隔标志符为 ! ，密钥为 bac，上传文件路径为 /folder/test.jpg ，那么该图片的对外访问地址为： http://空间域名/folder/test.jpg!bac
+* @param $str （文件 MD5 校验码）
+* return null;
+*/
+UPYun.prototype.setFileSecret = function(str){
+ _fileSecret = str;
+}
+
+/**
+* 获取文件信息
+* @param $file 文件路径（包含文件名）
+* return object { 'type': file | folder, 'size': file size, 'date': unix time } 或 null
+*/
+UPYun.prototype.getFileInfo = function(file, callback){
+ httpAction('HEAD', file, null, null, function(err, res){
+ if (!err) {
+ callback(err, {
+ 'type': res.headers['x-upyun-file-type'],
+ 'size': res.headers['x-upyun-file-size'],
+ 'date': res.headers['x-upyun-file-date']
+ });
+ }
+ else {
+ callback(err);
+ }
+ });
+}
+
+/**
+* 获取上传文件后的信息（仅图片空间有返回数据）
+* @param $key 信息字段名（x-upyun-width、x-upyun-height、x-upyun-frames、x-upyun-file-type）
+* return value or NULL
+*/
+UPYun.prototype.getWritedFileInfo = function(key){
+ if (!_tmpInfo[key]) return null;
+ return _tmpInfo[key];
+}
+
+
+/**
+ * 获取总体空间的占用信息
+ * @param callback 回调函数
+ */
+UPYun.prototype.getBucketUsage = function(callback){
+ this.getFolderUsage('/', callback);
+}
+
+/**
+ * 获取某个子目录的占用信息
+ * @param path 目标路径
+ * @param callback 回调函数
+ */
+UPYun.prototype.getFolderUsage = function (path, callback){
+ httpAction('GET', path + '?usage', null, null, function(err, res){
+ if (!err)
+ callback(err, res.body);
+ else
+ callback(err);
+ });
+}
+
+/**
+ * 上传文件
+ * @param file 文件路径（包含文件名）
+ * @param data 文件内容
+ * @param autoMkdir 是否自动创建父级目录
+ * @param 回调函数
+ */
+UPYun.prototype.writeFile = function (file, data, autoMkdir, callback){
+ _autoMkdir = autoMkdir;
+ httpAction('PUT', file, data, null, function(err, res){
+ if (!err)
+ callback(err, res.body);
+ else
+ callback(err);
+ });
+}
+
+/**
+* 读取文件
+* @param file 文件路径（包含文件名）
+* @param output_file 输出文件的路径（默认为 null，结果返回文件内容，如设置output_file，将返回 true or false）
+* return 文件内容 或 null
+*/
+UPYun.prototype.readFile = function (file, output_file, callback) {
+ httpAction('GET', file, null, output_file, function(err, res){
+ if (!err)
+ callback(err, res.body);
+ else
+ callback(err);
+ });
+}
+
+/**
+* 删除文件
+* @param $file 文件路径（包含文件名）
+* return true or false
+*/
+UPYun.prototype.deleteFile = function (file, callback){
+ httpAction('DELETE', file, null, null, function(err, res){
+ if (!err)
+ callback(err, res.body);
+ else
+ callback(err);
+ });
+}
+
+/**
+* 创建目录
+* @param path 目录路径
+* @param auto_mkdir 是否自动创建父级目录
+*/
+UPYun.prototype.mkDir = function (path, autoMkdir, callback) {
+ _autoMkdir = autoMkdir;
+ httpAction('PUT', path, null, null, function(err, res){
+ if (!err)
+ callback(err, res.body);
+ else
+ callback(err);
+ }, { header: { folder: true } });
+}
+
+/**
+* 删除目录
+* @param path 目录路径
+*/
+UPYun.prototype.rmDir = function (path, callback){
+ httpAction('DELETE', path, null, null, function(err, res){
+ if (!err)
+ callback(err, res.body);
+ else
+ callback(err);
+ });
+}
+
+/**
+* 读取目录列表
+* @param path 目录路径
+*/
+UPYun.prototype.readDir = function (path, callback){
+ callback = typeof callback == 'function' ? callback : function() {};
+ httpAction('GET', path, null, null, function(err, data) {
+ if (!err) {
+ var dirs = data.body.split("\n");
+ var result = [];
+
+ for (var i = 0; i < dirs.length; i++) {
+ var dir = dirs[i];
+ var attrs = dir.split("\t");
+ dir = {
+ name: attrs[0],
+ type: attrs[1],
+ size: attrs[2],
+ time: attrs[3]
+ }
+ result.push(dir);
+ }
+
+ callback(err, result);
+ }
+ else {
+ callback(err);
+ }
+ });
+}
+
+
+/**
+ * Generate md5 digest
+ * @param string a string for generate md5 digest
+ * return md5 digest of given string in hex encoding.
+ */
+function md5(string) {
+ var md5sum = crypto.createHash('md5');
+ md5sum.update(string, 'utf8');
+ return md5sum.digest('hex');
+}
+
+/**
+ * 连接签名方法
+ * @param $method 请求方式 {GET, POST, PUT, DELETE}
+ * return 签名字符串
+ */
+function sign(method, uri, date, length) {
+ var sign = method + '&' + uri + '&' + date + '&' + length +
+ '&' + _password;
+ return 'UpYun ' + _username + ':' + md5(sign);
+}
+
+function httpAction(method, uri, data, outputFile, callback, opts) {
+ callback = typeof callback == 'function' ? callback : function() {};
+
+ _tmpInfo = {};
+ uri = '/' + _bucketname + uri;
+ var options = {
+ host: _apiDomain,
+ method: method,
+ path: uri
+ };
+
+ var length = data ? data.length : 0;
+ var headers = {};
+
+ headers['Expect'] = '';
+
+ if (_contentMD5 !== null) {
+ headers['Content-MD5'] = _contentMD5;
+ }
+ _contentMD5 = null;
+
+ if (_fileSecret !== null) {
+ headers['Content-Secret'] = _fileSecret;
+ }
+ _fileSecret = null;
+
+ headers['Content-Length'] = length;
+
+ if (opts && opts.header) {
+ for (key in opts.header) {
+ headers[key] = opts.header[key];
+ }
+ }
+
+ if ((method == 'PUT' || method == 'POST') && _autoMkdir == true) {
+ headers.mkdir = 'true';
+ }
+
+ var date = (new Date()).toUTCString();
+ headers.Date = date;
+ headers.Authorization = sign(method, uri, date, length);
+
+ options.headers = headers;
+
+ var resData = '';
+
+ var req = http.request(options, function(res) {
+ // Hander request
+ res.setEncoding('utf8');
+ res.on('data', function (chunk) {
+ resData += chunk;
+ });
+ res.on('end', function() {
+ for (key in res.headers) {
+ if (key.indexOf('x-upyun') == 0) {
+ if (~['width', 'heigh', 'frame'].indexOf(key.substr(8, 5))) {
+ _tmpInfo[key] = Number(res.headers[key]);
+ }
+ else {
+ _tmpInfo[key] = res.headers[key];
+ }
+ }
+ }
+
+ if (outputFile) {
+ var fs = require('fs');
+ fs.writeFile(outputFile, resData, 'utf8', function(err) {
+ callback(err, {
+ headers: res.headers,
+ body: resData
+ });
+ })
+ }
+ else {
+ if (res.statusCode >= 400 && res.statusCode < 600) {
+ callback({
+ statusCode: res.statusCode,
+ message: resData
+ });
+ }
+ else {
+ callback(null, {
+ headers: res.headers,
+ body: resData
+ });
+ }
+ }
+ });
+ });
+
+ req.on('error', function(e) {
+ if (typeof callback == 'function') {
+ callback(e, null);
+ }
+ });
+
+ data && req.write(data);
+ req.end();
+}
\ No newline at end of file
diff --git a/pic.js b/pic.js
new file mode 100644
index 0000000..6f833ed
--- /dev/null
+++ b/pic.js
@@ -0,0 +1,32 @@
+var Step = require('step');
+var fs = require('fs');
+var UPYun = require('./lib/upyun').UPYun;
+var picUtils= require('./lib/picUtils.js');
+
+var upyun = new UPYun("lets-party-pic", "ltebean ", "yucong861186");
+
+exports.uploadPic=function(req, res){
+ var picPath=picUtils.generatePicPath();
+ Step(
+ function readPic(){
+ fs.readFile(req.files.pic.path,this);
+ },
+ function postToUPYun(err,fileContent){
+ if (err) throw err;
+ var md5Str = md5(fileContent);
+ upyun.setContentMD5(md5Str);
+ upyun.setFileSecret('bac');
+ upyun.writeFile(picUtils.generatePicPath(), fileContent, true,this);
+ },
+ function generateResponse(err, data){
+ if (err) throw err;
+ res.send({'picUrl':picUtils.getDomian()+picPath});
+ });
+}
+
+function md5(string) {
+ var crypto = require('crypto');
+ var md5sum = crypto.createHash('md5');
+ md5sum.update(string, 'utf8');
+ return md5sum.digest('hex');
+}
diff --git a/public/index.html b/public/index.html
index bf0d015..02f8aff 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,5 +11,23 @@
+