Merge branch 'release' of ssh://47.105.117.50:2224/wanli/evm-store into release

backend/model/__init__.py

@@ -9,6 +9,7 @@ from pony.flask import Pony
 
 logger = logging.getLogger(__name__)
 
+
 class FullStackDB(object):
 
     def __init__(self):

backend/model/build_logs.py

@@ -16,6 +16,7 @@ class BuildLogs(db.Entity):
     app = Required("Apps", reverse="app_build_log")
     app_path = Optional(str, default="")
     app_info = Optional(Json, default={})
+    source = Optional(int, default=0) # 打包来源 1管理中心 2后端接口
     create_at = Required(datetime, default=datetime.now)
     create_by = Required("User", reverse='build_logs_creator') # BuildLogs与User一对一关系
     update_at = Required(datetime, default=datetime.now)

backend/schema/apps.py

@@ -31,6 +31,7 @@ class DeleteSchema(BaseSchema):
 class QuerySchema(BaseSchema):
     uuid = fields.UUID(required=False)
     app_name = fields.String(required=False)
+    category = fields.String(required=False)
     scope_type = fields.String(required=False)
     pagenum = fields.Int(required=False)
     pagesize = fields.Int(required=False, max=50) # 防止用户传特别大的数，导致数据库查询阻塞

backend/schema/system.py

@@ -2,38 +2,6 @@ from datetime import datetime
 from . import BaseSchema
 from marshmallow import fields, validate, RAISE, INCLUDE, EXCLUDE
 
-class AddProjectSchema(BaseSchema):
-    type = fields.String(required=False, allow_none=True)
-    title = fields.String(required=True, validate=validate.Length(min=2, max=50))
-    code = fields.String(required=False, allow_none=True)
-    amount = fields.Decimal(required=False, default=0, allow_none=True) # 总金额
-    consult_type = fields.String(required=False, allow_none=True) # 咨询项目类型
-    contract_sign_at = fields.String(required=False, allow_none=True) # 项目签订日期
-    party_a = fields.String(required=False, allow_none=True) # 项目甲方
-    party_b = fields.String(required=False, allow_none=True) # 项目乙方
-    leader = fields.String(required=False, allow_none=True) # 项目开发人
-    level = fields.String(required=False, allow_none=True) # 项目开发级别
-    source = fields.String(required=False, allow_none=True) # 项目来源
-    introducer = fields.String(required=False, allow_none=True) # 同业引进人
-    standard_type = fields.String(required=False, allow_none=True) # 体系类型
-    review_type = fields.String(required=False, allow_none=True) # 审核类型
-    customer_addr = fields.String(required=False, allow_none=True) # 客户地址
-    customer_contact = fields.String(required=False, allow_none=True) # 客户联系人
-    customer_phone = fields.String(required=False, allow_none=True) # 客户联系电话
-    ascription = fields.String(required=False, allow_none=True) # 项目归属
-    risk = fields.String(required=False, allow_none=True) # 风险级别
-    people_nums = fields.Int(required=False, allow_none=True) # 人数
-    start_time = fields.DateTime(required=True, default=datetime.now) # 项目开始时间
-    end_time = fields.DateTime(required=True, default=datetime.now) # 项目结束时间
-    users = fields.List(fields.String(), required=True) # 项目参与者
-    flow = fields.List(fields.Dict(), required=False, allow_none=True) # 流程节点列表
-    payback = fields.List(fields.Dict(), required=False, allow_none=True) # 回款计划列表
-    production = fields.Dict(required=False, allow_none=True)  # 项目费用相关
-    remarks = fields.String(required=False, allow_none=True) # 备注
-
-    class Meta:
-        unknown = EXCLUDE
-
 class QuerySchema(BaseSchema):
     project = fields.UUID(required=True)
 

backend/view/__init__.py

@@ -18,9 +18,7 @@ from .app_logs import appLogs_api
 from .ws import NotifyHandler, ThreadNotifyHandler
 from model import fullStackDB
 from fullstack.response import ResponseCode, response_result
-
-from app import config, signalManager
-from flask_login import LoginManager
+from app import config
 
 logger = logging.getLogger(__name__)
 

backend/view/api.py

@@ -5,6 +5,7 @@ import json
 import logging
 import traceback
 import uuid
+import sqlite3
 from datetime import datetime
 
 from flask import Blueprint, request, redirect, url_for, json, Response, send_file, make_response, send_from_directory
@@ -98,6 +99,18 @@ def update_db():
         print(index)
         result.append(str(uuid.uuid1()))
 
+    # conn = sqlite3.connect('./app-store.db')
+    # cur = conn.cursor()
+    # update_sql = """update test set name = 'noname' where id = ?"""
+    # x = (1, )
+    # cur.execute(update_sql, x)
+    # # commit()提交事务
+    # conn.commit()
+    # # 关闭游标
+    # cur.close()
+    # # 关闭连接
+    # conn.close()
+
     return response_result(ResponseCode.OK, data=result)
 
 @api.route("/system/convertString", methods=['POST'])

tools/build_out/views/app.py

@@ -6,7 +6,7 @@ from application.signal_manager import signalManager
 from models.app import postAppSchema,deleteAppSchema,getListAppSchema,getAppSchema,putAppSchema
 from webcreator.response import ResponseCode, response_result
 
-class AppResource(Resource):
+class AppResourceList(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
@@ -42,14 +42,14 @@ class AppResource(Resource):
             return response_result(ResponseCode.DB_ERROR)
 
 
-class AppResourceList(Resource):
+class AppResource(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser = RequestParser()
 
     @jwt_required
-    def get(self):
+    def get(self, uuid):
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser.add_argument("page", type=int, location="args", default=1)
         # self.parser.add_argument("pageSize", type=int, location="args", default=15)
@@ -57,7 +57,7 @@ class AppResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            print("========>", uuid, json_payload)
             data = getAppSchema.load(json_payload)
             result = signalManager.actionGetApp.emit(**data)
             json_dumps = getAppSchema.dump(result)
@@ -68,9 +68,10 @@ class AppResourceList(Resource):
 
 
     @jwt_required
-    def put(self):
+    def put(self, uuid):
         try:
             json_payload = request.json
+            print("========>", uuid, json_payload)
             data = putAppSchema.load(json_payload)
             result = signalManager.actionPutApp.emit(**data)
             json_dumps = putAppSchema.dump(result)
@@ -81,9 +82,10 @@ class AppResourceList(Resource):
 
 
     @jwt_required
-    def delete(self):
+    def delete(self, uuid):
         try:
             json_payload = request.json
+            print("========>", uuid, json_payload)
             data = deleteAppSchema.load(json_payload)
             result = signalManager.actionDeleteApp.emit(**data)
             json_dumps = deleteAppSchema.dump(result)

tools/build_out/views/area.py

@@ -6,7 +6,7 @@ from application.signal_manager import signalManager
 from models.area import postAreaSchema,deleteAreaSchema,getListAreaSchema,getAreaSchema,putAreaSchema
 from webcreator.response import ResponseCode, response_result
 
-class AreaResource(Resource):
+class AreaResourceList(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
@@ -42,14 +42,14 @@ class AreaResource(Resource):
             return response_result(ResponseCode.DB_ERROR)
 
 
-class AreaResourceList(Resource):
+class AreaResource(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser = RequestParser()
 
     @jwt_required
-    def get(self):
+    def get(self, uuid):
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser.add_argument("page", type=int, location="args", default=1)
         # self.parser.add_argument("pageSize", type=int, location="args", default=15)
@@ -57,7 +57,7 @@ class AreaResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            print("========>", uuid, json_payload)
             data = getAreaSchema.load(json_payload)
             result = signalManager.actionGetArea.emit(**data)
             json_dumps = getAreaSchema.dump(result)
@@ -68,9 +68,10 @@ class AreaResourceList(Resource):
 
 
     @jwt_required
-    def put(self):
+    def put(self, uuid):
         try:
             json_payload = request.json
+            print("========>", uuid, json_payload)
             data = putAreaSchema.load(json_payload)
             result = signalManager.actionPutArea.emit(**data)
             json_dumps = putAreaSchema.dump(result)
@@ -81,9 +82,10 @@ class AreaResourceList(Resource):
 
 
     @jwt_required
-    def delete(self):
+    def delete(self, uuid):
         try:
             json_payload = request.json
+            print("========>", uuid, json_payload)
             data = deleteAreaSchema.load(json_payload)
             result = signalManager.actionDeleteArea.emit(**data)
             json_dumps = deleteAreaSchema.dump(result)

tools/build_out/views/login.py

@@ -6,7 +6,7 @@ from application.signal_manager import signalManager
 from models.login import getListLoginSchema,getLoginSchema
 from webcreator.response import ResponseCode, response_result
 
-class LoginResource(Resource):
+class LoginResourceList(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
@@ -29,14 +29,14 @@ class LoginResource(Resource):
             current_app.logger.error(e)
             return response_result(ResponseCode.DB_ERROR)
 
-class LoginResourceList(Resource):
+class LoginResource(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser = RequestParser()
 
     @jwt_required
-    def get(self):
+    def get(self, uuid):
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser.add_argument("page", type=int, location="args", default=1)
         # self.parser.add_argument("pageSize", type=int, location="args", default=15)
@@ -44,7 +44,7 @@ class LoginResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            print("========>", uuid, json_payload)
             data = getLoginSchema.load(json_payload)
             result = signalManager.actionGetLogin.emit(**data)
             json_dumps = getLoginSchema.dump(result)

tools/build_out/views/package.py

@@ -6,7 +6,7 @@ from application.signal_manager import signalManager
 from models.package import getListPackageSchema,getPackageSchema
 from webcreator.response import ResponseCode, response_result
 
-class PackageResource(Resource):
+class PackageResourceList(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
@@ -29,14 +29,14 @@ class PackageResource(Resource):
             current_app.logger.error(e)
             return response_result(ResponseCode.DB_ERROR)
 
-class PackageResourceList(Resource):
+class PackageResource(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser = RequestParser()
 
     @jwt_required
-    def get(self):
+    def get(self, uuid):
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser.add_argument("page", type=int, location="args", default=1)
         # self.parser.add_argument("pageSize", type=int, location="args", default=15)
@@ -44,7 +44,7 @@ class PackageResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            print("========>", uuid, json_payload)
             data = getPackageSchema.load(json_payload)
             result = signalManager.actionGetPackage.emit(**data)
             json_dumps = getPackageSchema.dump(result)

tools/build_out/views/user.py

@@ -6,7 +6,7 @@ from application.signal_manager import signalManager
 from models.user import postUserSchema,deleteUserSchema,getListUserSchema,getUserSchema,putUserSchema
 from webcreator.response import ResponseCode, response_result
 
-class UserResource(Resource):
+class UserResourceList(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
@@ -42,14 +42,14 @@ class UserResource(Resource):
             return response_result(ResponseCode.DB_ERROR)
 
 
-class UserResourceList(Resource):
+class UserResource(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser = RequestParser()
 
     @jwt_required
-    def get(self):
+    def get(self, uuid):
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser.add_argument("page", type=int, location="args", default=1)
         # self.parser.add_argument("pageSize", type=int, location="args", default=15)
@@ -57,7 +57,7 @@ class UserResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            print("========>", uuid, json_payload)
             data = getUserSchema.load(json_payload)
             result = signalManager.actionGetUser.emit(**data)
             json_dumps = getUserSchema.dump(result)
@@ -68,9 +68,10 @@ class UserResourceList(Resource):
 
 
     @jwt_required
-    def put(self):
+    def put(self, uuid):
         try:
             json_payload = request.json
+            print("========>", uuid, json_payload)
             data = putUserSchema.load(json_payload)
             result = signalManager.actionPutUser.emit(**data)
             json_dumps = putUserSchema.dump(result)
@@ -81,9 +82,10 @@ class UserResourceList(Resource):
 
 
     @jwt_required
-    def delete(self):
+    def delete(self, uuid):
         try:
             json_payload = request.json
+            print("========>", uuid, json_payload)
             data = deleteUserSchema.load(json_payload)
             result = signalManager.actionDeleteUser.emit(**data)
             json_dumps = deleteUserSchema.dump(result)

tools/config.json

@@ -992,6 +992,14 @@
                 ]
             },
             "view": {
+                "post": {
+                    "auth": false,
+                    "path": "",
+                    "endpoint": "",
+                    "params": [
+                        
+                    ]
+                },
                 "getList": {
                     "auth": false,
                     "path": "",

tools/templates/view.tpl

@@ -9,7 +9,7 @@ from models.{{ config['name'] }} import {% for k, v in config["view"].items() -%
 {%- endfor %}
 from webcreator.response import ResponseCode, response_result
 
-class {{ config['name'] | letterUpper }}Resource(Resource):
+class {{ config['name'] | letterUpper }}ResourceList(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
@@ -53,7 +53,7 @@ class {{ config['name'] | letterUpper }}Resource(Resource):
             return response_result(ResponseCode.DB_ERROR)
 {% endif %}
 
-class {{ config['name'] | letterUpper }}ResourceList(Resource):
+class {{ config['name'] | letterUpper }}Resource(Resource):
     def __init__(self):
         pass
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
@@ -63,7 +63,7 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
 {% if config["view"]["get"]["auth"] %}
     @jwt_required
 {%- endif %}
-    def get(self):
+    def get(self, uuid):
         # 特殊参数，即不是从json获取参数的接口，可以将这个注释打开
         # self.parser.add_argument("page", type=int, location="args", default=1)
         # self.parser.add_argument("pageSize", type=int, location="args", default=15)
@@ -71,7 +71,7 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
 
         try:
             json_payload = request.json
-            print("========>", json_payload)
+            print("========>", uuid, json_payload)
             data = get{{ config['name'] | letterUpper }}Schema.load(json_payload)
             result = signalManager.actionGet{{ config["name"] | letterUpper }}.emit(**data)
             json_dumps = get{{ config['name'] | letterUpper }}Schema.dump(result)
@@ -85,9 +85,10 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
 {% if config["view"]["put"]["auth"] %}
     @jwt_required
 {%- endif %}
-    def put(self):
+    def put(self, uuid):
         try:
             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)
             json_dumps = put{{ config['name'] | letterUpper }}Schema.dump(result)
@@ -101,9 +102,10 @@ class {{ config['name'] | letterUpper }}ResourceList(Resource):
 {% if config["view"]["delete"]["auth"] %}
     @jwt_required
 {%- endif %}
-    def delete(self):
+    def delete(self, uuid):
         try:
             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)
             json_dumps = delete{{ config['name'] | letterUpper }}Schema.dump(result)