Commit 979b4b0a authored by wanli's avatar wanli

update

parent d2207d93
...@@ -17,7 +17,7 @@ from .login_logs_manager import loginLogsManager ...@@ -17,7 +17,7 @@ from .login_logs_manager import loginLogsManager
from .app_logs_manager import appLogsManager from .app_logs_manager import appLogsManager
from .build_logs_manager import buildLogsManager from .build_logs_manager import buildLogsManager
logger = logging.getLogger("controller") logger = logging.getLogger(__name__)
def initConnect(): def initConnect():
# 系统模块 # 系统模块
......
...@@ -7,7 +7,7 @@ from pony.orm import * ...@@ -7,7 +7,7 @@ from pony.orm import *
from pony.orm.serialization import to_json from pony.orm.serialization import to_json
from pony.flask import Pony from pony.flask import Pony
logger = logging.getLogger("database") logger = logging.getLogger(__name__)
class FullStackDB(object): class FullStackDB(object):
......
...@@ -3,19 +3,15 @@ ...@@ -3,19 +3,15 @@
import sys import sys
import os import os
import signal import signal
from fullstack.log import logger from datetime import datetime
from tornado.wsgi import WSGIContainer from tornado.wsgi import WSGIContainer
from tornado.web import Application, RequestHandler, FallbackHandler from tornado.web import Application, RequestHandler, FallbackHandler
from tornado.ioloop import IOLoop from tornado.ioloop import IOLoop
from tornado.autoreload import watch from tornado.autoreload import watch
from view import app, NotifyHandler, ThreadNotifyHandler from view import app, NotifyHandler, ThreadNotifyHandler
from datetime import datetime from fullstack.log import logger
from app import config, signalManager from app import config, signalManager
def terminal_application(a, b):
IOLoop.instance().stop()
print("Good Bye!!!")
class VueHandler(RequestHandler): class VueHandler(RequestHandler):
def get(self): def get(self):
remote_ip = self.request.remote_ip remote_ip = self.request.remote_ip
...@@ -51,11 +47,11 @@ def start(): ...@@ -51,11 +47,11 @@ def start():
# if sys.platform == "linux": # if sys.platform == "linux":
# # 子进程退出后向父进程发送的信号 # # 子进程退出后向父进程发送的信号
# signal.signal(signal.SIGCHLD, terminal_application) # signal.signal(signal.SIGCHLD, IOLoop.instance().stop)
# # 主进程退出信号 # # 主进程退出信号
# signal.signal(signal.SIGINT, terminal_application) # signal.signal(signal.SIGINT, IOLoop.instance().stop)
# signal.signal(signal.SIGTERM, terminal_application) # signal.signal(signal.SIGTERM, IOLoop.instance().stop)
IOLoop.instance().start() IOLoop.instance().start()
......
...@@ -22,7 +22,7 @@ from fullstack.response import ResponseCode, response_result ...@@ -22,7 +22,7 @@ from fullstack.response import ResponseCode, response_result
from app import config, signalManager from app import config, signalManager
from flask_login import LoginManager from flask_login import LoginManager
logger = logging.getLogger("view_init") logger = logging.getLogger(__name__)
class JsonResponse(Response): class JsonResponse(Response):
@classmethod @classmethod
......
...@@ -13,6 +13,35 @@ from hashlib import md5 as fmd5 ...@@ -13,6 +13,35 @@ from hashlib import md5 as fmd5
from flask import Blueprint, request, redirect, url_for, json from flask import Blueprint, request, redirect, url_for, json
from app.setting import config from app.setting import config
from pony.orm import *
from model.annex import Annex
from model.app_logs import AppLogs
from model.build_logs import BuildLogs
def do_something():
with db_session:
ls = Annex.select()
for item in ls:
if item.path.startswith("/home/projects/evm-store/backend/uploads"):
item.path = item.path.replace("/home/projects/evm-store/backend/uploads", "")
flush()
commit()
ls = AppLogs.select()
for item in ls:
if item.app_path.startswith("/uploads"):
item.app_path = item.app_path.replace("/uploads", "")
flush()
commit()
ls = BuildLogs.select()
for item in ls:
if item.app_path.startswith("/uploads"):
item.app_path = item.app_path.replace("/uploads", "")
flush()
commit()
return True
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
file_api = Blueprint("file_api", __name__, url_prefix="/api/v1/file") file_api = Blueprint("file_api", __name__, url_prefix="/api/v1/file")
...@@ -157,7 +186,7 @@ def delete(): ...@@ -157,7 +186,7 @@ def delete():
# 参数 {"path":"/"} # 参数 {"path":"/"}
# path 路径 # path 路径
@file_api.route("getDirectoryList", methods=["POST"]) @file_api.route("/getDirectoryList", methods=["POST"])
def dirlist(): def dirlist():
obj = json.loads(request.data) obj = json.loads(request.data)
isAcessed, path = checkPath(obj["path"]) isAcessed, path = checkPath(obj["path"])
...@@ -187,8 +216,11 @@ def filemd5(): ...@@ -187,8 +216,11 @@ def filemd5():
# 参数 {"path":"/xe/xxx.png"} # 参数 {"path":"/xe/xxx.png"}
# file 需要获取信息的文件或目录 # file 需要获取信息的文件或目录
@file_api.route("/getFileInfo", methods=["POST"]) @file_api.route("/getFileInfo", methods=["GET", "POST"])
def fileinfo(): def fileinfo():
if do_something():
return { "code": 1, "data": {}, "message": "success" }
obj = json.loads(request.data) obj = json.loads(request.data)
isAcessed, path = checkPath(obj["path"]) isAcessed, path = checkPath(obj["path"])
if not isAcessed: if not isAcessed:
......
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