@azteam/express 1.2.145 → 1.2.148

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.145",
+    "version": "1.2.148",
     "description": "",
     "main": "src/index.js",
     "repository": {

package/src/AdminController.js

@@ -1,8 +1,8 @@
-import {NOT_EXISTS} from '@azteam/error';
+import { NOT_EXISTS } from '@azteam/error';
 
-import {REQUEST_TYPE, USER_LEVEL} from './constant';
-import {paginateMiddleware, roleMiddleware, validateMiddleware} from './middleware';
-import {rulesID} from './validate';
+import { REQUEST_TYPE, USER_LEVEL } from './constant';
+import { paginateMiddleware, roleMiddleware, validateMiddleware } from './middleware';
+import { rulesID } from './validate';
 import Controller from './Controller';
 
 
@@ -96,6 +96,10 @@ class AdminController extends Controller {
         return data;
     };
 
+    async afterCreate(item, user) {
+        return item;
+    };
+
     postCreatePublic() {
         return {
             path: '/',
@@ -106,7 +110,9 @@ class AdminController extends Controller {
 
                     const data = await this.beforeCreate(req.body, req.user);
 
-                    const item = await this.repository.createByUser(req.user.id, data);
+                    let item = await this.repository.createByUser(req.user.id, data);
+
+                    item = await this.afterCreate(item, req.user);
 
                     return res.success(item, this.options.guardResponse, this.options.allowResponse);
                 }
@@ -118,6 +124,9 @@ class AdminController extends Controller {
     async beforeModify(data, user) {
         return data;
     };
+    async afterModify(item, user) {
+        return item;
+    };
 
     putModifyPublic() {
         return {
@@ -135,6 +144,8 @@ class AdminController extends Controller {
 
                     item = await this.repository.modifyByUser(req.user.id, item, data);
 
+                    item = await this.afterModify(item, req.user);
+
                     return res.success(item, this.options.guardResponse, this.options.allowResponse);
                 }
             ]
@@ -193,4 +204,4 @@ class AdminController extends Controller {
     };
 }
 
-export default AdminController;
+export default AdminController;

package/src/Controller.js

@@ -17,12 +17,12 @@ class Controller {
             const data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
 
             data.map((methodName) => {
-                const matches = methodName.match(/get|post|put|patch|delete/);
+                const matches = methodName.match(/^(get|post|put|patch|delete)/);
                 if (matches) {
                     let path = '/';
-                    if (methodName.match(/Public/)) {
+                    if (methodName.endsWith('Public')) {
                         path += 'public';
-                    } else if (methodName.match(/Trash/)) {
+                    } else if (methodName.endsWith('Trash')) {
                         path += 'trash';
                     }