2.2.0 pre release

1.添加团队管理的功能
2.添加项目版本和接口快照的功能
3.添加自动化测试的轮询功能

Author: sx1989827

SBDoc/app.js

@@ -26,7 +26,7 @@ app.all('*', function(req, res, next) {
 app.use(logger('dev'));
 app.use("/proxy",proxy);
 app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
+app.use(bodyParser.urlencoded({ extended: false,limit:"100000kb" }));
 app.use(cookieParser());
 app.use(session({
   cookie: {maxAge: 1000*3600*6 },
@@ -40,6 +40,9 @@ app.use("/group",checkFormDataUser(con.imgPath),checkParam("group"),checkUser);
 app.use("/interface",checkFormDataUser(con.imgPath),checkParam("interface"),checkUser);
 app.use("/status",checkFormDataUser(con.imgPath),checkParam("status"),checkUser);
 app.use("/test",checkFormDataUser(con.imgPath),checkParam("test"),checkUser);
+app.use("/team",checkFormDataUser(con.imgPath),checkParam("team"),checkUser);
+app.use("/version",checkFormDataUser(con.imgPath),checkParam("version"),checkUser);
+app.use("/poll",checkFormDataUser(con.imgPath),checkParam("poll"),checkUser);
 app.use("/mock",checkFormDataUser(con.tempPath),mock);
 app.use("/html",express.static(path.join(__dirname, '../SBDocClient')));
 app.use("/img",express.static(con.imgPath));

SBDoc/event/event.js

@@ -7,7 +7,11 @@ var await=require("asyncawait/await");
 var moment=require("moment");
 var fs=require("fs");
 var temp=require("../model/tempModel");
+var poll=require("../model/pollModel");
+var test=require("../model/testModel");
+var user=require("../model/userModel");
 var con=require("../../config.json");
+var util=require("../util/util");
 var blue=require("bluebird");
 var path = require('path');
 var rule = new schedule.RecurrenceRule();
@@ -38,3 +42,122 @@ var j = schedule.scheduleJob(rule,async (function(){
 
 
 }));
+
+var j1=schedule.scheduleJob("0 * * * *",(async (function () {
+    try
+    {
+        let date=moment();
+        let weekDay=date.weekday();
+        let hour=date.hour();
+        let arr=await (poll.findAsync({
+            date:weekDay,
+            time:hour
+        },null,{
+            populate:{
+                path:"project"
+            }
+        }));
+        arr=await (poll.populateAsync(arr,{
+            path:"version"
+        }));
+        arr=await (poll.populateAsync(arr,{
+            path:"test",
+        }));
+        for(let obj of arr)
+        {
+            let root={
+                output:"",
+                count:obj.test.length,
+                success:0,
+                fail:0,
+                unknown:0
+            };
+            for(let obj1 of obj.test)
+            {
+                obj1=await (test.populateAsync(obj1,{
+                    path:"module"
+                }))
+                obj1=await (test.populateAsync(obj1,{
+                    path:"group"
+                }))
+                let global={
+                    baseUrl:obj.baseUrl,
+                    before:obj.project.before,
+                    after:obj.project.after
+                }
+                if(typeof (obj.version)=="object")
+                {
+                    global.before=obj.version.before;
+                    global.after=obj.version.after;
+                }
+                try
+                {
+                    let ret=await (util.runTestCode(obj1.code,obj1,{},global,root))
+                    if(ret===undefined)
+                    {
+                        root.unknown++;
+                    }
+                    else if(Boolean(ret)==true)
+                    {
+                        root.success++;
+                    }
+                    else
+                    {
+                        root.fail++;
+                    }
+                }
+                catch (err)
+                {
+                    root.output+=err+"<br>"
+                }
+            }
+            var arrPollUser=obj.users.map(function (obj) {
+                return obj.toString();
+            });
+            var arrProjectUser=obj.project.users.map(function (obj) {
+                return obj.user.toString();
+            })
+            arrProjectUser.unshift(obj.project.owner.toString());
+            let arr=[];
+            for(let u of arrPollUser)
+            {
+                if(arrProjectUser.indexOf(u)>-1)
+                {
+                    let obj=await (user.findOneAsync({
+                        _id:u
+                    }));
+                    if(obj && obj.email)
+                    {
+                        arr.push(obj.email);
+                    }
+                }
+            }
+            if(arr.length>0)
+            {
+                let subject="[SBDoc]"+moment().format("YYYY-MM-DD HH:mm:ss")+" 项目"+obj.project.name+"轮询结果";
+                let content=`<h3>测试：${root.count}&nbsp;&nbsp;成功：${root.success}&nbsp;&nbsp;失败：${root.fail}&nbsp;&nbsp;未判定：${root.unknown}</h3>`+root.output;
+                util.sendMail(obj.sendInfo.smtp,obj.sendInfo.port,obj.sendInfo.user,obj.sendInfo.password,arr,subject,content);
+            }
+        }
+    }
+    catch (err)
+    {
+        console.log(err);
+    }
+})));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

SBDoc/model/applyModel.js

@@ -0,0 +1,42 @@
+/**
+ * Created by sunxin on 2017/4/13.
+ */
+var mongoose = require('mongoose');
+var mongoomise=require("mongoomise")
+var db=require("../util/db.js");
+var model=new mongoose.Schema({
+    dis:{
+        type:String,
+        default:""
+    },
+    fromType:String,    //User,Project,Team
+    from:{
+        type:mongoose.Schema.ObjectId,
+        refPath:"fromType"
+    },
+    toType:String,      //Team,User,Project
+    to:{
+        type:mongoose.Schema.ObjectId,
+        refPath:"toType"
+    },
+    type:Number,       //0 拉人  1 拉项目  2 人员申请加入  3  项目申请加入
+    state:Number,     //0 申请中  1 同意  2 拒绝  3 忽略
+    creator:{
+        type:mongoose.Schema.ObjectId,
+        ref:"User"
+    },
+    editor:{
+        type:mongoose.Schema.ObjectId,
+        ref:"User"
+    },
+    relatedData:mongoose.Schema.Types.Mixed
+},{
+    timestamps:true
+});
+model.configOutputField(null,[
+    "createdAt",
+    "updatedAt"
+]);
+var dbManage=db.model("Apply",model);
+mongoomise.promisifyAll(dbManage,require("bluebird"));
+module.exports=dbManage;

SBDoc/model/groupVersionModel.js

@@ -0,0 +1,28 @@
+/**
+ * Created by sunxin on 2016/11/17.
+ */
+var mongoose = require('mongoose');
+var mongoomise=require("mongoomise")
+var db=require("../util/db.js");
+var model=new mongoose.Schema({
+    name:String,
+    project:{
+        type:mongoose.Schema.ObjectId,
+        ref:"Project"
+    },
+    type:{
+        type:Number,
+        default:0      //0 普通 1 回收站
+    },
+    id:String,
+    version:{
+        type:mongoose.Schema.ObjectId,
+        ref:"Version"
+    }
+},{
+    timestamps:true
+});
+
+var dbManage=db.model("GroupVersion",model);
+mongoomise.promisifyAll(dbManage,require("bluebird"));
+module.exports=dbManage;

SBDoc/model/interfaceSnapshotModel.js

@@ -0,0 +1,80 @@
+/**
+ * Created by sunxin on 2017/6/23.
+ */
+var mongoose = require('mongoose');
+var mongoomise=require("mongoomise")
+var db=require("../util/db.js");
+var model=new mongoose.Schema({
+    name:String,
+    project:{
+        type:mongoose.Schema.ObjectId,
+        ref:"Project"
+    },
+    groupType:String,
+    group:{
+        type:mongoose.Schema.ObjectId,
+        refPath:"groupType"
+    },
+    url:String,
+    remark:String,
+    method:String,
+    header:{
+        type:[],
+        default:[]
+    },
+    queryParam:{
+        type:[],
+        default:[]
+    },
+    bodyParam:{
+        type:[],
+        default:[]
+    },
+    outParam:{
+        type:[],
+        default:[]
+    },
+    restParam:{
+        type:[],
+        default:[]
+    },
+    bodyInfo:Object,
+    outInfo:Object,
+    owner:{
+        type:mongoose.Schema.ObjectId,
+        ref:"User"
+    },
+    editor:{
+        type:mongoose.Schema.ObjectId,
+        ref:"User"
+    },
+    mock:String,
+    finish:{
+        type:Number,
+        default:0
+    },
+    before:Object,
+    after:Object,
+    id:String,
+    snapshot:{
+        type:String,
+        default:""
+    },
+    snapshotCreator:{
+        type:mongoose.Schema.ObjectId,
+        ref:"User"
+    },
+    version:{
+        type:mongoose.Schema.ObjectId,
+        ref:"Version"
+    }
+},{
+    timestamps:true
+});
+model.configOutputField(null,[
+    "createdAt",
+    "updatedAt"
+]);
+var dbManage=db.model("InterfaceSnapshot",model);
+mongoomise.promisifyAll(dbManage,require("bluebird"));
+module.exports=dbManage;

SBDoc/model/interfaceVersionModel.js

@@ -0,0 +1,71 @@
+/**
+ * Created by sunxin on 2016/11/17.
+ */
+var mongoose = require('mongoose');
+var mongoomise=require("mongoomise")
+var db=require("../util/db.js");
+var model=new mongoose.Schema({
+    name:String,
+    project:{
+        type:mongoose.Schema.ObjectId,
+        ref:"Project"
+    },
+    group:{
+        type:mongoose.Schema.ObjectId,
+        ref:"GroupVersion"
+    },
+    url:String,
+    remark:String,
+    method:String,
+    header:{
+        type:[],
+        default:[]
+    },
+    queryParam:{
+        type:[],
+        default:[]
+    },
+    bodyParam:{
+        type:[],
+        default:[]
+    },
+    outParam:{
+        type:[],
+        default:[]
+    },
+    restParam:{
+        type:[],
+        default:[]
+    },
+    bodyInfo:Object,
+    outInfo:Object,
+    owner:{
+        type:mongoose.Schema.ObjectId,
+        ref:"User"
+    },
+    editor:{
+        type:mongoose.Schema.ObjectId,
+        ref:"User"
+    },
+    mock:String,
+    finish:{
+        type:Number,
+        default:0
+    },
+    before:Object,
+    after:Object,
+    id:String,
+    version:{
+        type:mongoose.Schema.ObjectId,
+        ref:"Version"
+    }
+},{
+    timestamps:true
+});
+model.configOutputField(null,[
+    "createdAt",
+    "updatedAt"
+]);
+var dbManage=db.model("InterfaceVersion",model);
+mongoomise.promisifyAll(dbManage,require("bluebird"));
+module.exports=dbManage;