update

tools/build_out/application/__init__.py

+#!/usr/bin/env python
+# -*- coding: utf_8 -*-
+
+from controllers import initConnect
+
+initConnect()
\ No newline at end of file

tools/build_out/controllers/__init__.py

 #!/usr/bin/env python
 # -*- coding: utf_8 -*-
 
-from application.app import signalManager
+from application.signal_manager import signalManager
 from .area import areaManager
 from .app import appManager
 from .package import packageManager
@@ -29,5 +29,3 @@ def initConnect():
     signalManager.actionPostLogin.connect(loginManager.post)
     signalManager.actionGetListLogin.connect(loginManager.getList)
     signalManager.actionGetLogin.connect(loginManager.get)
\ No newline at end of file
-
-initConnect()
\ No newline at end of file

tools/build_out/controllers/app.py

 from datetime import datetime
 from application.app import db
 from models.app import AppModel
-from webcreator.utils import ResponseCode, response_result
+from webcreator.log import logger
+from webcreator.response import ResponseCode, response_result
 
 class AppResource(object):
     def __init__(self):
@@ -9,6 +10,15 @@ class AppResource(object):
 
     def get(self, params):
         # handle business
+        logger.warn(params)
+        filters = []
+        result = AppModel.query.filter(*filters).order_by(AppModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
+
+        return result
+
+    def getList(self, params):
+        # handle business
+        logger.warn(params)
         filters = []
         result = AppModel.query.filter(*filters).order_by(AppModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
 

tools/build_out/controllers/area.py

 from datetime import datetime
 from application.app import db
 from models.area import AreaModel
-from webcreator.utils import ResponseCode, response_result
+from webcreator.log import logger
+from webcreator.response import ResponseCode, response_result
 
 class AreaResource(object):
     def __init__(self):
@@ -9,6 +10,15 @@ class AreaResource(object):
 
     def get(self, params):
         # handle business
+        logger.warn(params)
+        filters = []
+        result = AreaModel.query.filter(*filters).order_by(AreaModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
+
+        return result
+
+    def getList(self, params):
+        # handle business
+        logger.warn(params)
         filters = []
         result = AreaModel.query.filter(*filters).order_by(AreaModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
 

tools/build_out/controllers/login.20210615193736.py

-from datetime import datetime
-from application.app import db
-from models.login import LoginModel
-from webcreator.utils import ResponseCode, response_result
-
-class LoginResource(object):
-    def __init__(self):
-        super().__init__()
-
-    def get(self, params):
-        # handle business
-        filters = []
-        result = LoginModel.query.filter(*filters).order_by(LoginModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
-
-        return result
-
-    def post(self, params, jwt=None):
-        # handle business
-        result = LoginModel.query.filter(LoginModel.user == params.get('user')).first()
-        if result and result.is_delete:
-            result.is_delete = False
-            result.update_by = jwt['id']
-            result.update_date = datetime.now()
-            db.session.commit()
-            print(params.get("account"), params.get("password"))
-            return response_result(ResponseCode.OK)
-        elif result and result.is_delete == False:
-            return response_result(ResponseCode.EXISTS_ERROR)
-
-        result = LoginModel(**params)
-        db.session.add(result)
-        db.session.commit()
-        return response_result(ResponseCode.OK)
-
-    def put(self, id, params, jwt=None):
-        # handle business
-        result = LoginModel.query.get(id)
-        if not result: return response_result(ResponseCode.NO_DATA)
-        if params:
-            for key, value in params.items():
-                if value != None: setattr(result, key, value)
-            result.update_by = jwt['id']
-            result.update_date = datetime.now()
-            db.session.commit()
-        else:
-            return response_result(ResponseCode.PARAM_NULL)
-
-    def delete(self, id, jwt=None):
-        # handle business
-        result = LoginModel.query.get(id)
-        if not result: return response_result(ResponseCode.NO_DATA_FOUND)
-        else:
-            result.update_by = jwt['id']
-            result.update_date = datetime.now()
-            result.is_delete = True
-            db.session.delete(result)
-            db.session.commit()
-
-loginManager = LoginResource()
\ No newline at end of file

tools/build_out/controllers/login.py

 from datetime import datetime
 from application.app import db
 from models.login import LoginModel
-from webcreator.utils import ResponseCode, response_result
+from webcreator.log import logger
+from webcreator.response import ResponseCode, response_result
 
 class LoginResource(object):
     def __init__(self):
@@ -9,6 +10,15 @@ class LoginResource(object):
 
     def get(self, params):
         # handle business
+        logger.warn(params)
+        filters = []
+        result = LoginModel.query.filter(*filters).order_by(LoginModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
+
+        return result
+
+    def getList(self, params):
+        # handle business
+        logger.warn(params)
         filters = []
         result = LoginModel.query.filter(*filters).order_by(LoginModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
 

tools/build_out/controllers/package.py

 from datetime import datetime
 from application.app import db
 from models.package import PackageModel
-from webcreator.utils import ResponseCode, response_result
+from webcreator.log import logger
+from webcreator.response import ResponseCode, response_result
 
 class PackageResource(object):
     def __init__(self):
@@ -9,6 +10,15 @@ class PackageResource(object):
 
     def get(self, params):
         # handle business
+        logger.warn(params)
+        filters = []
+        result = PackageModel.query.filter(*filters).order_by(PackageModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
+
+        return result
+
+    def getList(self, params):
+        # handle business
+        logger.warn(params)
         filters = []
         result = PackageModel.query.filter(*filters).order_by(PackageModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
 

tools/build_out/controllers/user.py

 from datetime import datetime
 from application.app import db
 from models.user import UserModel
-from webcreator.utils import ResponseCode, response_result
+from webcreator.log import logger
+from webcreator.response import ResponseCode, response_result
 
 class UserResource(object):
     def __init__(self):
@@ -9,6 +10,15 @@ class UserResource(object):
 
     def get(self, params):
         # handle business
+        logger.warn(params)
+        filters = []
+        result = UserModel.query.filter(*filters).order_by(UserModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
+
+        return result
+
+    def getList(self, params):
+        # handle business
+        logger.warn(params)
         filters = []
         result = UserModel.query.filter(*filters).order_by(UserModel.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
 

tools/build_out/manager.py

@@ -37,12 +37,6 @@ def run():
 
     http_server = HTTPServer(WSGIContainer(app))
     http_server.listen(3000, address='127.0.0.1')
-
-    # wsgi_app = WSGIContainer(app)
-    # application = Application([
-    #     (r'.*', FallbackHandler, dict(fallback=wsgi_app))
-    # ], **service_config)
-    # application.listen(3000)
     IOLoop.instance().start()
 
 
@@ -53,7 +47,6 @@ def debug():
     To use: python3 manager.py debug
     """
     # app.logger.setLevel(logging.DEBUG)
-    print("start from here......")
     app.run(debug=True, port=3000, host='127.0.0.1')
 
 if __name__ == '__main__':

tools/build_out/models/app.py

@@ -58,7 +58,7 @@ class AppModel(PrimaryModel):
 class PostAppSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AppModel
 
     app_name = ma.auto_field()
@@ -77,7 +77,7 @@ postAppsSchema = PostAppSchema(many=True)
 class DeleteAppSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AppModel
 
 
@@ -86,7 +86,7 @@ deleteAppSchema = DeleteAppSchema()
 class GetListAppSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AppModel
 
     page = fields.Integer(required=False)
@@ -102,7 +102,7 @@ getListAppSchema = GetListAppSchema()
 class GetAppSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AppModel
 
     app_name = ma.auto_field()
@@ -116,7 +116,7 @@ getAppSchema = GetAppSchema()
 class PutAppSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AppModel
 
     app_name = ma.auto_field()

tools/build_out/models/area.py

@@ -46,7 +46,7 @@ class AreaModel(PrimaryModel):
 class PostAreaSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AreaModel
 
     areaCode = ma.auto_field()
@@ -61,7 +61,7 @@ postAreasSchema = PostAreaSchema(many=True)
 class DeleteAreaSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AreaModel
 
 
@@ -70,7 +70,7 @@ deleteAreaSchema = DeleteAreaSchema()
 class GetListAreaSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AreaModel
 
     page = fields.Integer(required=False)
@@ -86,7 +86,7 @@ getListAreaSchema = GetListAreaSchema()
 class GetAreaSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AreaModel
 
     areaName = ma.auto_field()
@@ -100,7 +100,7 @@ getAreaSchema = GetAreaSchema()
 class PutAreaSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = AreaModel
 
     areaName = ma.auto_field()

tools/build_out/models/login.py

@@ -42,7 +42,7 @@ class LoginModel(PrimaryModel):
 class PostLoginSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = LoginModel
 
     account = fields.String(required=True, length=64)
@@ -54,7 +54,7 @@ postLoginsSchema = PostLoginSchema(many=True)
 class GetListLoginSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = LoginModel
 
     page = fields.Integer(required=False)
@@ -71,7 +71,7 @@ getListLoginSchema = GetListLoginSchema()
 class GetLoginSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = LoginModel
 
     user = ma.auto_field()

tools/build_out/models/package.py

@@ -54,7 +54,7 @@ class PackageModel(PrimaryModel):
 class GetListPackageSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = PackageModel
 
     page = fields.Integer(required=False)
@@ -75,7 +75,7 @@ getListPackageSchema = GetListPackageSchema()
 class GetPackageSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = PackageModel
 
     app = ma.auto_field()

tools/build_out/models/user.py

@@ -58,7 +58,7 @@ class UserModel(PrimaryModel):
 class PostUserSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = UserModel
 
     app_name = ma.auto_field()
@@ -77,7 +77,7 @@ postUsersSchema = PostUserSchema(many=True)
 class DeleteUserSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = UserModel
 
 
@@ -86,7 +86,7 @@ deleteUserSchema = DeleteUserSchema()
 class GetListUserSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = UserModel
 
     page = fields.Integer(required=False)
@@ -102,7 +102,7 @@ getListUserSchema = GetListUserSchema()
 class GetUserSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = UserModel
 
     app_name = ma.auto_field()
@@ -116,7 +116,7 @@ getUserSchema = GetUserSchema()
 class PutUserSchema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = UserModel
 
     app_name = ma.auto_field()

tools/build_out/views/app.py

@@ -4,6 +4,7 @@ from flask_restful.reqparse import RequestParser
 from flask_jwt_extended import ( jwt_required, get_jwt_identity )
 from application.signal_manager import signalManager
 from models.app import postAppSchema,deleteAppSchema,getListAppSchema,getAppSchema,putAppSchema
+from webcreator.log import logger
 from webcreator.response import ResponseCode, response_result
 
 class AppResourceList(Resource):
@@ -20,9 +21,9 @@ class AppResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            logger.warn(json_payload)
             data = getListAppSchema.load(json_payload)
-            result = signalManager.actionGetApp.emit(**data)
+            result = signalManager.actionGetApp.emit(data)
             json_dumps = getListAppSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -34,7 +35,7 @@ class AppResourceList(Resource):
         try:
             json_payload = request.json
             data = postAppSchema.load(json_payload)
-            result = signalManager.actionPostApp.emit(**data)
+            result = signalManager.actionPostApp.emit(data)
             json_dumps = postAppSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -59,7 +60,7 @@ class AppResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = getAppSchema.load(json_payload)
-            result = signalManager.actionGetApp.emit(**data)
+            result = signalManager.actionGetApp.emit(data)
             json_dumps = getAppSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -73,7 +74,7 @@ class AppResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = putAppSchema.load(json_payload)
-            result = signalManager.actionPutApp.emit(**data)
+            result = signalManager.actionPutApp.emit(data)
             json_dumps = putAppSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -87,7 +88,7 @@ class AppResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = deleteAppSchema.load(json_payload)
-            result = signalManager.actionDeleteApp.emit(**data)
+            result = signalManager.actionDeleteApp.emit(data)
             json_dumps = deleteAppSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:

tools/build_out/views/area.py

@@ -4,6 +4,7 @@ from flask_restful.reqparse import RequestParser
 from flask_jwt_extended import ( jwt_required, get_jwt_identity )
 from application.signal_manager import signalManager
 from models.area import postAreaSchema,deleteAreaSchema,getListAreaSchema,getAreaSchema,putAreaSchema
+from webcreator.log import logger
 from webcreator.response import ResponseCode, response_result
 
 class AreaResourceList(Resource):
@@ -20,9 +21,9 @@ class AreaResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            logger.warn(json_payload)
             data = getListAreaSchema.load(json_payload)
-            result = signalManager.actionGetArea.emit(**data)
+            result = signalManager.actionGetArea.emit(data)
             json_dumps = getListAreaSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -34,7 +35,7 @@ class AreaResourceList(Resource):
         try:
             json_payload = request.json
             data = postAreaSchema.load(json_payload)
-            result = signalManager.actionPostArea.emit(**data)
+            result = signalManager.actionPostArea.emit(data)
             json_dumps = postAreaSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -59,7 +60,7 @@ class AreaResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = getAreaSchema.load(json_payload)
-            result = signalManager.actionGetArea.emit(**data)
+            result = signalManager.actionGetArea.emit(data)
             json_dumps = getAreaSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -73,7 +74,7 @@ class AreaResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = putAreaSchema.load(json_payload)
-            result = signalManager.actionPutArea.emit(**data)
+            result = signalManager.actionPutArea.emit(data)
             json_dumps = putAreaSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -87,7 +88,7 @@ class AreaResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = deleteAreaSchema.load(json_payload)
-            result = signalManager.actionDeleteArea.emit(**data)
+            result = signalManager.actionDeleteArea.emit(data)
             json_dumps = deleteAreaSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:

tools/build_out/views/login.py

@@ -4,6 +4,7 @@ from flask_restful.reqparse import RequestParser
 from flask_jwt_extended import ( jwt_required, get_jwt_identity )
 from application.signal_manager import signalManager
 from models.login import postLoginSchema,getListLoginSchema,getLoginSchema
+from webcreator.log import logger
 from webcreator.response import ResponseCode, response_result
 
 class LoginResourceList(Resource):
@@ -20,9 +21,9 @@ class LoginResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            logger.warn(json_payload)
             data = getListLoginSchema.load(json_payload)
-            result = signalManager.actionGetLogin.emit(**data)
+            result = signalManager.actionGetLogin.emit(data)
             json_dumps = getListLoginSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -33,7 +34,7 @@ class LoginResourceList(Resource):
         try:
             json_payload = request.json
             data = postLoginSchema.load(json_payload)
-            result = signalManager.actionPostLogin.emit(**data)
+            result = signalManager.actionPostLogin.emit(data)
             json_dumps = postLoginSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -58,7 +59,7 @@ class LoginResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = getLoginSchema.load(json_payload)
-            result = signalManager.actionGetLogin.emit(**data)
+            result = signalManager.actionGetLogin.emit(data)
             json_dumps = getLoginSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:

tools/build_out/views/package.py

@@ -4,6 +4,7 @@ from flask_restful.reqparse import RequestParser
 from flask_jwt_extended import ( jwt_required, get_jwt_identity )
 from application.signal_manager import signalManager
 from models.package import getListPackageSchema,getPackageSchema
+from webcreator.log import logger
 from webcreator.response import ResponseCode, response_result
 
 class PackageResourceList(Resource):
@@ -20,9 +21,9 @@ class PackageResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            logger.warn(json_payload)
             data = getListPackageSchema.load(json_payload)
-            result = signalManager.actionGetPackage.emit(**data)
+            result = signalManager.actionGetPackage.emit(data)
             json_dumps = getListPackageSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -46,7 +47,7 @@ class PackageResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = getPackageSchema.load(json_payload)
-            result = signalManager.actionGetPackage.emit(**data)
+            result = signalManager.actionGetPackage.emit(data)
             json_dumps = getPackageSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:

tools/build_out/views/user.py

@@ -4,6 +4,7 @@ from flask_restful.reqparse import RequestParser
 from flask_jwt_extended import ( jwt_required, get_jwt_identity )
 from application.signal_manager import signalManager
 from models.user import postUserSchema,deleteUserSchema,getListUserSchema,getUserSchema,putUserSchema
+from webcreator.log import logger
 from webcreator.response import ResponseCode, response_result
 
 class UserResourceList(Resource):
@@ -20,9 +21,9 @@ class UserResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            logger.warn(json_payload)
             data = getListUserSchema.load(json_payload)
-            result = signalManager.actionGetUser.emit(**data)
+            result = signalManager.actionGetUser.emit(data)
             json_dumps = getListUserSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -34,7 +35,7 @@ class UserResourceList(Resource):
         try:
             json_payload = request.json
             data = postUserSchema.load(json_payload)
-            result = signalManager.actionPostUser.emit(**data)
+            result = signalManager.actionPostUser.emit(data)
             json_dumps = postUserSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -59,7 +60,7 @@ class UserResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = getUserSchema.load(json_payload)
-            result = signalManager.actionGetUser.emit(**data)
+            result = signalManager.actionGetUser.emit(data)
             json_dumps = getUserSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -73,7 +74,7 @@ class UserResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = putUserSchema.load(json_payload)
-            result = signalManager.actionPutUser.emit(**data)
+            result = signalManager.actionPutUser.emit(data)
             json_dumps = putUserSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -87,7 +88,7 @@ class UserResource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = deleteUserSchema.load(json_payload)
-            result = signalManager.actionDeleteUser.emit(**data)
+            result = signalManager.actionDeleteUser.emit(data)
             json_dumps = deleteUserSchema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:

tools/build_out/webcreator/event.py

 # -*- coding: utf_8 -*-
 
 ############################
-#   Signals-Slots
 #   信号槽
 ############################
 
@@ -43,6 +42,7 @@ class PySignal(object):
 
     def emit(self, *args, **kwargs):
         rets = {}
+
         for handler in self._handlers:
             ret = handler(*args, **kwargs)
             rets[handler.__name__] = ret

tools/build_out/webcreator/log.py

@@ -16,12 +16,10 @@ if not os.path.exists(logPath):
 fh = RotatingFileHandler("logs/running.log", maxBytes=10 * 1024 * 1024, backupCount=100)
 fh.setLevel(logging.DEBUG)
 
-# log write in console
 ch = logging.StreamHandler()
 ch.setLevel(logging.WARNING)
 
-# log formatter
-formatter = logging.Formatter('[%(asctime)s][%(levelname)7s] [%(filename)15s%(funcName)15s%(lineno)06s] %(message)s')
+formatter = logging.Formatter('[%(asctime)s][%(levelname)7s] [in %(pathname)s -> %(funcName)s line:%(lineno)s] %(message)s')
 fh.setFormatter(formatter)
 ch.setFormatter(formatter)
 

tools/resources/application/__init__.py

+#!/usr/bin/env python
+# -*- coding: utf_8 -*-
+
+from controllers import initConnect
+
+initConnect()
\ No newline at end of file

tools/resources/manager.py

@@ -37,12 +37,6 @@ def run():
 
     http_server = HTTPServer(WSGIContainer(app))
     http_server.listen(3000, address='127.0.0.1')
-
-    # wsgi_app = WSGIContainer(app)
-    # application = Application([
-    #     (r'.*', FallbackHandler, dict(fallback=wsgi_app))
-    # ], **service_config)
-    # application.listen(3000)
     IOLoop.instance().start()
 
 
@@ -53,7 +47,6 @@ def debug():
     To use: python3 manager.py debug
     """
     # app.logger.setLevel(logging.DEBUG)
-    print("start from here......")
     app.run(debug=True, port=3000, host='127.0.0.1')
 
 if __name__ == '__main__':

tools/resources/webcreator/event.py

 # -*- coding: utf_8 -*-
 
 ############################
-#   Signals-Slots
 #   信号槽
 ############################
 
@@ -43,6 +42,7 @@ class PySignal(object):
 
     def emit(self, *args, **kwargs):
         rets = {}
+
         for handler in self._handlers:
             ret = handler(*args, **kwargs)
             rets[handler.__name__] = ret

tools/resources/webcreator/log.py

@@ -16,12 +16,10 @@ if not os.path.exists(logPath):
 fh = RotatingFileHandler("logs/running.log", maxBytes=10 * 1024 * 1024, backupCount=100)
 fh.setLevel(logging.DEBUG)
 
-# log write in console
 ch = logging.StreamHandler()
 ch.setLevel(logging.WARNING)
 
-# log formatter
-formatter = logging.Formatter('[%(asctime)s][%(levelname)7s] [%(filename)15s%(funcName)15s%(lineno)06s] %(message)s')
+formatter = logging.Formatter('[%(asctime)s][%(levelname)7s] [in %(pathname)s -> %(funcName)s line:%(lineno)s] %(message)s')
 fh.setFormatter(formatter)
 ch.setFormatter(formatter)
 

tools/templates/controller.tpl

 from datetime import datetime
 from application.app import db
 from models.{{ config['name'] }} import {{ config['name'] | letterUpper }}Model
-from webcreator.utils import ResponseCode, response_result
+from webcreator.log import logger
+from webcreator.response import ResponseCode, response_result
 
 class {{ config['name'] | letterUpper }}Resource(object):
     def __init__(self):
@@ -9,6 +10,15 @@ class {{ config['name'] | letterUpper }}Resource(object):
 
     def get(self, params):
         # handle business
+        logger.warn(params)
+        filters = []
+        result = {{ config['name'] | letterUpper }}Model.query.filter(*filters).order_by({{ config['name'] | letterUpper }}Model.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
+
+        return result
+
+    def getList(self, params):
+        # handle business
+        logger.warn(params)
         filters = []
         result = {{ config['name'] | letterUpper }}Model.query.filter(*filters).order_by({{ config['name'] | letterUpper }}Model.areaId).paginate(params.get('page', 1), params.get('pageSize', 10), error_out=False)
 

tools/templates/model.tpl

@@ -43,7 +43,7 @@ class {{ config['name'] | letterUpper }}Model(PrimaryModel):
 class {{ key | letterUpper }}{{ config['name'] | letterUpper }}Schema(ma.SQLAlchemySchema):
     class Meta:
         # unknown = INCLUDE # 未知字段默认包含
-        # unknown = EXCLUDE # 未知字段默认排除
+        unknown = EXCLUDE # 未知字段默认排除
         model = {{ config['name'] | letterUpper }}Model
 {%- if config['model']['foreignKey'] %}
         include_fk = {{ config['model']['foreignKey'] }}

tools/templates/signal_manager_init.tpl

 #!/usr/bin/env python
 # -*- coding: utf_8 -*-
 
-from application.app import signalManager
+from application.signal_manager import signalManager
 {%- for api in config %}
 from .{{ api['name'] }} import {{ api["name"] }}Manager
 {%- endfor %}
@@ -12,5 +12,3 @@ def initConnect():
     signalManager.action{{ key | letterUpper }}{{ api.get("name") | letterUpper }}.connect({{ api.get("name") }}Manager.{{ key }})
     {%- endfor %}
 {%- endfor %}
-
-initConnect()

tools/templates/view.tpl

@@ -7,6 +7,7 @@ from application.signal_manager import signalManager
 from models.{{ config['name'] }} import {% for k, v in config["view"].items() -%}
 {{ pipe() }}{{ k }}{{ config['name'] | letterUpper }}Schema
 {%- endfor %}
+from webcreator.log import logger
 from webcreator.response import ResponseCode, response_result
 
 class {{ config['name'] | letterUpper }}ResourceList(Resource):
@@ -27,9 +28,9 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            logger.warn(json_payload)
             data = getList{{ config['name'] | letterUpper }}Schema.load(json_payload)
-            result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(**data)
+            result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(data)
             json_dumps = getList{{ config['name'] | letterUpper }}Schema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -45,7 +46,7 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
         try:
             json_payload = request.json
             data = post{{ config['name'] | letterUpper }}Schema.load(json_payload)
-            result = signalManager.actionPost{{ config["name"] | letterUpper }}.emit(**data)
+            result = signalManager.actionPost{{ config["name"] | letterUpper }}.emit(data)
             json_dumps = post{{ config['name'] | letterUpper }}Schema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -73,7 +74,7 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = get{{ config['name'] | letterUpper }}Schema.load(json_payload)
-            result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(**data)
+            result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(data)
             json_dumps = get{{ config['name'] | letterUpper }}Schema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -90,7 +91,7 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = put{{ config['name'] | letterUpper }}Schema.load(json_payload)
-            result = signalManager.actionPut{{ config["name"] | letterUpper }}.emit(**data)
+            result = signalManager.actionPut{{ config["name"] | letterUpper }}.emit(data)
             json_dumps = put{{ config['name'] | letterUpper }}Schema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e:
@@ -107,7 +108,7 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
             json_payload = request.json
             print("========>", uuid, json_payload)
             data = delete{{ config['name'] | letterUpper }}Schema.load(json_payload)
-            result = signalManager.actionDelete{{ config["name"] | letterUpper }}.emit(**data)
+            result = signalManager.actionDelete{{ config["name"] | letterUpper }}.emit(data)
             json_dumps = delete{{ config['name'] | letterUpper }}Schema.dump(result)
             return jsonify(json_dumps), 200
         except Exception as e: