From d4f76925bac843d305b0c63ad227c60af373e39e Mon Sep 17 00:00:00 2001 From: RogerWork Date: Tue, 30 Jan 2024 21:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8D=95=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/utils/git_util.py | 6 +++++- update/views.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/update/utils/git_util.py b/update/utils/git_util.py index 725618e..633bcda 100644 --- a/update/utils/git_util.py +++ b/update/utils/git_util.py @@ -149,6 +149,7 @@ class GitDbUtil: # 从git中获取版本列表后和数据库对比,添加新的版本到数据库 def set_release_to_db(self): local_repo = Repo(self.local_code_path) + local_repo.git.execute('git fetch --all') release = [] for remote in local_repo.remotes: for ref in remote.refs: @@ -156,9 +157,12 @@ class GitDbUtil: saved_release = Release.objects.all() saved_release_version_list = [rel.release for rel in saved_release] for rel in release: + # print(rel) if rel in saved_release_version_list: - print('pass') + pass + # print('pass') else: + print(rel) data = { 'release': rel, 'short_release': rel.replace('origin/', ''), diff --git a/update/views.py b/update/views.py index 23a3350..3380570 100644 --- a/update/views.py +++ b/update/views.py @@ -126,7 +126,7 @@ def update_cine(request): print('传输客户端') client_release = ClientUtil() client_release.client_process(cinema_ip, short_release) - return JsonResponse({'result': 'success'}) + return JsonResponse({'result': 'success', 'ip': cinema_ip}) # # 测试用接口