|
@@ -180,11 +180,11 @@ async def analysis(local_path, task_id):
|
|
if isinstance(result, Exception):
|
|
if isinstance(result, Exception):
|
|
print(f"处理出错: {result}")
|
|
print(f"处理出错: {result}")
|
|
await Scan_Tasks.filter(id=task_id).update(state=3, result={"results": results},
|
|
await Scan_Tasks.filter(id=task_id).update(state=3, result={"results": results},
|
|
- scan_end_time=int(time.time()))
|
|
|
|
|
|
+ scan_end_time=int(time.time() * 1000))
|
|
else:
|
|
else:
|
|
results.append(result)
|
|
results.append(result)
|
|
await Scan_Tasks.filter(id=task_id).update(state=2, result={"results": results},
|
|
await Scan_Tasks.filter(id=task_id).update(state=2, result={"results": results},
|
|
- scan_end_time=int(time.time()))
|
|
|
|
|
|
+ scan_end_time=int(time.time() * 1000))
|
|
print("扫描完成")
|
|
print("扫描完成")
|
|
|
|
|
|
async def commit_task(content,task_id):
|
|
async def commit_task(content,task_id):
|
|
@@ -193,7 +193,7 @@ async def commit_task(content,task_id):
|
|
print(f"提交出错: {commit_result}")
|
|
print(f"提交出错: {commit_result}")
|
|
else:
|
|
else:
|
|
print("提交成功")
|
|
print("提交成功")
|
|
- await Commit_Summary_Tasks.filter(id=task_id).update(result=commit_result[0],end_time=int(time.time()))
|
|
|
|
|
|
+ await Commit_Summary_Tasks.filter(id=task_id).update(result=commit_result[0],end_time=int(time.time() * 1000))
|
|
|
|
|
|
async def file_task(file_path,task_id):
|
|
async def file_task(file_path,task_id):
|
|
with open(file_path, 'r', encoding="utf8") as f:
|
|
with open(file_path, 'r', encoding="utf8") as f:
|
|
@@ -203,7 +203,7 @@ async def file_task(file_path,task_id):
|
|
print(f"提交出错: {file_result}")
|
|
print(f"提交出错: {file_result}")
|
|
else:
|
|
else:
|
|
print("提交成功")
|
|
print("提交成功")
|
|
- await File_Summary_Tasks.filter(id=task_id).update(result=file_result[0], end_time=int(time.time()))
|
|
|
|
|
|
+ await File_Summary_Tasks.filter(id=task_id).update(result=file_result[0], end_time=int(time.time() * 1000))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -212,7 +212,7 @@ async def file_task(file_path,task_id):
|
|
async def scan(request: RequestScan, background_tasks: BackgroundTasks):
|
|
async def scan(request: RequestScan, background_tasks: BackgroundTasks):
|
|
local_path, repo_name = generate_repo_path(request.uuid, request.repo_url)
|
|
local_path, repo_name = generate_repo_path(request.uuid, request.repo_url)
|
|
print(f"开始扫描仓库: {repo_name}")
|
|
print(f"开始扫描仓库: {repo_name}")
|
|
- await Scan_Tasks.filter(id=request.task_id).update(state=1, scan_start_time=int(time.time()))
|
|
|
|
|
|
+ await Scan_Tasks.filter(id=request.task_id).update(state=1, scan_start_time=int(time.time() * 1000))
|
|
background_tasks.add_task(analysis, local_path, request.task_id)
|
|
background_tasks.add_task(analysis, local_path, request.task_id)
|
|
return {"code": 200, "msg": "添加扫描任务成功"}
|
|
return {"code": 200, "msg": "添加扫描任务成功"}
|
|
|
|
|
|
@@ -222,7 +222,7 @@ async def summaryCommit(request: RequestCommit, background_tasks: BackgroundTask
|
|
repo_commit=await Commit_Summary_Tasks.get(id=request.task_id)
|
|
repo_commit=await Commit_Summary_Tasks.get(id=request.task_id)
|
|
repo_commit_hash=repo_commit.repo_hash
|
|
repo_commit_hash=repo_commit.repo_hash
|
|
print(f"开始提交仓库: {repo_name}")
|
|
print(f"开始提交仓库: {repo_name}")
|
|
- await Commit_Summary_Tasks.filter(id=request.task_id).update(start_time=int(time.time()))
|
|
|
|
|
|
+ await Commit_Summary_Tasks.filter(id=request.task_id).update(start_time=int(time.time() * 1000))
|
|
# commit_content = Repo(local_path).git.log('-1', '-p', '--pretty=format:%h %s')
|
|
# commit_content = Repo(local_path).git.log('-1', '-p', '--pretty=format:%h %s')
|
|
commit_content = Repo(local_path).git.diff(f"{repo_commit_hash}^", repo_commit_hash)
|
|
commit_content = Repo(local_path).git.diff(f"{repo_commit_hash}^", repo_commit_hash)
|
|
background_tasks.add_task(commit_task,commit_content, request.task_id)
|
|
background_tasks.add_task(commit_task,commit_content, request.task_id)
|
|
@@ -230,7 +230,7 @@ async def summaryCommit(request: RequestCommit, background_tasks: BackgroundTask
|
|
|
|
|
|
@airouter.post("/summaryFile")
|
|
@airouter.post("/summaryFile")
|
|
async def summaryFile(request: RequestFile,background_tasks: BackgroundTasks):
|
|
async def summaryFile(request: RequestFile,background_tasks: BackgroundTasks):
|
|
- await File_Summary_Tasks.filter(id=request.task_id).update(start_time=int(time.time()))
|
|
|
|
|
|
+ await File_Summary_Tasks.filter(id=request.task_id).update(start_time=int(time.time() * 1000))
|
|
background_tasks.add_task(file_task, request.file_path, request.task_id)
|
|
background_tasks.add_task(file_task, request.file_path, request.task_id)
|
|
return {"code": 200, "msg": "添加提交任务成功"}
|
|
return {"code": 200, "msg": "添加提交任务成功"}
|
|
|
|
|