Commit 110522f3 authored by wanli's avatar wanli

update

parent c1e4b8f6
......@@ -9,6 +9,7 @@ from pony.flask import Pony
logger = logging.getLogger(__name__)
class FullStackDB(object):
def __init__(self):
......
......@@ -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)
......
......@@ -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) # 防止用户传特别大的数,导致数据库查询阻塞
......
......@@ -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)
......
......@@ -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__)
......
......@@ -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'])
......
......@@ -61,3 +61,28 @@
[2021-06-15 18:01:13,813][ INFO] [ _internal.py _log 225] 127.0.0.1 - - [15/Jun/2021 18:01:13] "GET /api/v1/area HTTP/1.1" 200 -
[2021-06-15 18:01:14,540][ ERROR] [ area.py get 29] {'id': ['Unknown field.']}
[2021-06-15 18:01:14,541][ INFO] [ _internal.py _log 225] 127.0.0.1 - - [15/Jun/2021 18:01:14] "GET /api/v1/area HTTP/1.1" 200 -
[2021-06-15 18:15:08,085][ INFO] [ _internal.py _log 225] * Detected change in 'D:\\projects\\scriptiot\\evm-store\\tools\\build_out\\views\\user.py', reloading
[2021-06-15 18:15:08,204][ INFO] [ _internal.py _log 225] * Restarting with stat
[2021-06-15 18:15:09,490][WARNING] [ _internal.py _log 225] * Debugger is active!
[2021-06-15 18:15:09,535][ INFO] [ _internal.py _log 225] * Debugger PIN: 182-666-074
[2021-06-15 18:15:09,797][ INFO] [ _internal.py _log 225] * Running on http://127.0.0.1:3000/ (Press CTRL+C to quit)
[2021-06-15 18:17:56,148][ INFO] [ _internal.py _log 225] * Detected change in 'D:\\projects\\scriptiot\\evm-store\\tools\\build_out\\views\\app.py', reloading
[2021-06-15 18:17:56,265][ INFO] [ _internal.py _log 225] * Restarting with stat
[2021-06-15 18:17:57,572][WARNING] [ _internal.py _log 225] * Debugger is active!
[2021-06-15 18:17:57,621][ INFO] [ _internal.py _log 225] * Debugger PIN: 182-666-074
[2021-06-15 18:17:57,879][ INFO] [ _internal.py _log 225] * Running on http://127.0.0.1:3000/ (Press CTRL+C to quit)
[2021-06-15 18:18:01,220][ INFO] [ _internal.py _log 225] * Detected change in 'D:\\projects\\scriptiot\\evm-store\\tools\\build_out\\views\\area.py', reloading
[2021-06-15 18:18:01,336][ INFO] [ _internal.py _log 225] * Restarting with stat
[2021-06-15 18:18:02,616][WARNING] [ _internal.py _log 225] * Debugger is active!
[2021-06-15 18:18:02,660][ INFO] [ _internal.py _log 225] * Debugger PIN: 182-666-074
[2021-06-15 18:18:02,916][ INFO] [ _internal.py _log 225] * Running on http://127.0.0.1:3000/ (Press CTRL+C to quit)
[2021-06-15 18:18:04,009][ INFO] [ _internal.py _log 225] * Detected change in 'D:\\projects\\scriptiot\\evm-store\\tools\\build_out\\views\\login.py', reloading
[2021-06-15 18:18:04,132][ INFO] [ _internal.py _log 225] * Restarting with stat
[2021-06-15 18:18:05,432][WARNING] [ _internal.py _log 225] * Debugger is active!
[2021-06-15 18:18:05,482][ INFO] [ _internal.py _log 225] * Debugger PIN: 182-666-074
[2021-06-15 18:18:05,741][ INFO] [ _internal.py _log 225] * Running on http://127.0.0.1:3000/ (Press CTRL+C to quit)
[2021-06-15 18:18:10,217][ INFO] [ _internal.py _log 225] * Detected change in 'D:\\projects\\scriptiot\\evm-store\\tools\\build_out\\views\\user.py', reloading
[2021-06-15 18:18:10,345][ INFO] [ _internal.py _log 225] * Restarting with stat
[2021-06-15 18:18:11,642][WARNING] [ _internal.py _log 225] * Debugger is active!
[2021-06-15 18:18:11,690][ INFO] [ _internal.py _log 225] * Debugger PIN: 182-666-074
[2021-06-15 18:18:11,967][ INFO] [ _internal.py _log 225] * Running on http://127.0.0.1:3000/ (Press CTRL+C to quit)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment