GM后台修改status code

gm-server/app/controller/login.ts

@@ -1,4 +1,5 @@
 import { Controller } from 'egg';
+import { STATUS } from '@consts/statusCode';
 
 export default class LoginController extends Controller {
 
@@ -10,10 +11,9 @@ export default class LoginController extends Controller {
 
   public async currentUser() {
     const { ctx } = this;
-    ctx.body = {
-      "status": "ok",
-      "data": ctx.user
-    };
+    ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, {
+      "user": ctx.user
+    });
   }
 
   public async changeMyPass() {
@@ -24,9 +24,8 @@ export default class LoginController extends Controller {
 
   public async getMenu() {
     const { ctx } = this;
-    ctx.body = {
-      "status": "ok",
-      "data": [
+    ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, {
+      "list": [
           {
             path: '/test',
             authority: ['admin'],
@@ -42,8 +41,6 @@ export default class LoginController extends Controller {
             ],
           }
         ]
-    }
-    
+    });
   }
-
 }

gm-server/app/controller/upload.ts

@@ -1,5 +1,6 @@
 import { Controller } from 'egg';
 import { Stream } from 'stream';
+import { STATUS } from '@consts/statusCode';
  const fs = require('fs');
 const unzip = require("unzip-stream");
 const temp = require('temp');
@@ -125,24 +126,15 @@ export default class UploadController extends Controller {
             fs.renameSync(dirPath, hotUpdateAddr);
 
             temp.cleanupSync();
-            return ctx.body = {
-                "status": "ok",
-                "data": "ok"
-            }
+            return ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS);
             
         } catch (err) {
             console.log(err)
-            return ctx.body = {
-             "status": "error",
-             "data": err.message
-             }
+            return ctx.body = ctx.service.utils.resResult(STATUS.GM_UPLOAD_FORMAT_ERR, null, err.message);
         }
         
     } else {
-       return ctx.body = {
-        "status": "error",
-        "data": "格式错误"
-        }
+       return ctx.body = ctx.service.utils.resResult(STATUS.GM_UPLOAD_FORMAT_ERR);
     }
   }
 
@@ -191,24 +183,16 @@ export default class UploadController extends Controller {
             }
 
             temp.cleanupSync();
-            return ctx.body = {
-                "status": "ok",
-                "data": "上传成功",
+            return ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, {
                 "files": JSON.stringify(files)
-            }
+            });
         } catch (err) {
             console.log(err)
-            return ctx.body = {
-             "status": "error",
-             "data": err.message
-             }
+            return ctx.body = ctx.service.utils.resResult(STATUS.INTERNAL_ERR);
         }
         
     } else {
-       return ctx.body = {
-        "status": "error",
-        "data": "格式错误"
-        }
+        return ctx.body = ctx.service.utils.resResult(STATUS.GM_UPLOAD_FORMAT_ERR);
     }
   }
 

gm-server/app/controller/users.ts

@@ -1,4 +1,5 @@
 import { Controller } from 'egg';
+import { STATUS } from '@consts/statusCode';
 
 export default class UserController extends Controller {
 
@@ -32,10 +33,7 @@ export default class UserController extends Controller {
     } else if (optType == 'item') {
       ctx.body = await ctx.service.users.createItem(uids, itemid, itemcount);
     } else {
-      ctx.body = {
-        status: 'error',
-        data: '参数错误'
-      }
+      ctx.body = ctx.service.utils.resResult(STATUS.WRONG_PARMS);
     }
   }
 }