forked from Lesin/reposync
Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
|
e2835f7c59 | |
|
9da27ce977 |
|
@ -38,11 +38,11 @@ class SyncDirection(Controller):
|
|||
dto: SyncRepoDTO = Body(..., description="绑定同步仓库信息")
|
||||
):
|
||||
api_log(LogType.INFO, f"用户 {user} 使用 POST 方法访问接口 {request.url.path} ", user)
|
||||
if not base.check_addr(dto.external_repo_address) or not base.check_addr(dto.internal_repo_address):
|
||||
return SYNCResponse(
|
||||
code_status=Status.REPO_ADDR_ILLEGAL.code,
|
||||
msg=Status.REPO_ADDR_ILLEGAL.msg
|
||||
)
|
||||
# if not base.check_addr(dto.external_repo_address) or not base.check_addr(dto.internal_repo_address):
|
||||
# return SYNCResponse(
|
||||
# code_status=Status.REPO_ADDR_ILLEGAL.code,
|
||||
# msg=Status.REPO_ADDR_ILLEGAL.msg
|
||||
# )
|
||||
|
||||
if dto.sync_granularity not in [1, 2]:
|
||||
return SYNCResponse(code_status=Status.SYNC_GRAN_ILLEGAL.code, msg=Status.SYNC_GRAN_ILLEGAL.msg)
|
||||
|
|
|
@ -139,7 +139,7 @@ def outer_to_inter(repo, branch, log_name: str, user: str, force_flag):
|
|||
async def sync_repo_task(repo, user, force_flag):
|
||||
if repo.sync_granularity == SyncType.one:
|
||||
branches = await sync_branch_dao.sync_branch(repo_id=repo.id)
|
||||
await sync_branch_task(repo, branches, repo.sync_direction, user)
|
||||
await sync_branch_task(repo, branches, repo.sync_direction, user, force_flag)
|
||||
else:
|
||||
log_name = f'sync_{repo.repo_name}.log'
|
||||
try:
|
||||
|
|
|
@ -112,14 +112,14 @@ class SyncService(Service):
|
|||
if repo is None:
|
||||
return SYNCException(Status.REPO_NOTFOUND)
|
||||
update_fields = {}
|
||||
if dto.internal_repo_address is not None:
|
||||
if not base.check_addr(dto.internal_repo_address):
|
||||
return SYNCException(Status.REPO_ADDR_ILLEGAL)
|
||||
update_fields['internal_repo_address'] = dto.internal_repo_address
|
||||
if dto.external_repo_address is not None:
|
||||
if not base.check_addr(dto.external_repo_address):
|
||||
return SYNCException(Status.REPO_ADDR_ILLEGAL)
|
||||
update_fields['external_repo_address'] = dto.external_repo_address
|
||||
# if dto.internal_repo_address is not None:
|
||||
# if not base.check_addr(dto.internal_repo_address):
|
||||
# return SYNCException(Status.REPO_ADDR_ILLEGAL)
|
||||
update_fields['internal_repo_address'] = dto.internal_repo_address
|
||||
# if dto.external_repo_address is not None:
|
||||
# if not base.check_addr(dto.external_repo_address):
|
||||
# return SYNCException(Status.REPO_ADDR_ILLEGAL)
|
||||
update_fields['external_repo_address'] = dto.external_repo_address
|
||||
if dto.inter_token is not None:
|
||||
update_fields['inter_token'] = dto.inter_token
|
||||
if dto.exter_token is not None:
|
||||
|
|
Loading…
Reference in New Issue