Merge branch 'xuebaoxin' of pplokijuhyg/blog-server into master

controllers/article.js

@@ -36,8 +36,8 @@ var articleupdate=async (ctx,next)=>{
     // console.log(new Date(Date.now()).getDate())
 }
 module.exports = {
-    'GET /articleadd': articleadd,
+    'POST /articleadd': articleadd,
     'GET /articlefind': articlefind,
     'GET /articledel': articledel,
-    'GET /articleupdate': articleupdate
+    'POST /articleupdate': articleupdate
 };

controllers/grouping.js

@@ -2,11 +2,13 @@
 var groupadd = async (ctx, next) => {
     await dbs.add("group", { groupname: ctx.query.groupname, fuid: ctx.query.fuid == null ? '0' : ctx.query.fuid })
     ctx.body = "添加成功"
+    next()
 }
 // 删除分组
 var groupdel = async (ctx, next) => {
     await dbs.remove("group", { num_key: parseInt(ctx.query.key) })
     ctx.body = "删除成功"
+    next()
 }
 // 获取分组
 var groupfind = async (ctx, next) => {
@@ -31,9 +33,9 @@ var groupfind = async (ctx, next) => {
             })
             return val;
         }
-        if(res.data.length == 0 ){
+        if (res.data.length == 0) {
-            ctx.body="{code:0,data:[]}"
+            ctx.body = "{code:0,data:[]}"
-        }else{
+        } else {
             ctx.body = JSON.stringify(tree(res.data))
 
         }

controllers/label.js

@@ -1,6 +1,34 @@
 // 获取标签
-var getlabel = async (ctx,next)=>{
+var getlabel = async (ctx, next) => {
-    await IDBOpenDBRequest.find('label').then((res)=>{
+    await dbs.find('label').then((res) => {
-        
+        ctx.body = JSON.stringify(res)
     })
-}
+}
+var addlabel = async (ctx, next) => {
+    //lablename 标签名
+    if(ctx.query.lablename != null){
+        await dbs.add("label",{lablename:ctx.query.lablename}).then((res)=>{
+            if(res.code == 0){
+                ctx.body="{code:0,msg:'添加成功'}"
+            }else{
+                ctx.body="{code:1,msg:'添加失败'}"
+
+            }
+        })
+
+    }else{
+        ctx.body="{code:1,msg:'添加失败'}"
+    }
+    next()
+}
+var dellabel = async (ctx, next) => {
+    await dbs.remove("group", { num_key: parseInt(ctx.query.key) })
+    ctx.body = "删除成功"
+    next()
+}
+module.exports = {
+    'GET /getlabel':getlabel,
+    'GET /addlabel':addlabel,
+    'GET /dellabel':dellabel
+}
+