diff --git a/update/utils/git_util.py b/update/utils/git_util.py index 54142e2..ef345b3 100644 --- a/update/utils/git_util.py +++ b/update/utils/git_util.py @@ -195,6 +195,7 @@ class GitDbUtil: release = [] for remote in local_repo.remotes: for ref in remote.refs: + # print(ref.name) release.append(ref.name) saved_release = Release.objects.all() saved_release_version_list = [rel.release for rel in saved_release] @@ -204,12 +205,25 @@ class GitDbUtil: pass # print('pass') else: - print(rel) + # 生成 short_rel + short_rel = rel.replace('origin/', '') + + # 生成 main_var + main_var = '' + short_rel_temp = short_rel.replace('Feature_', '') if short_rel.startswith('Feature_') else short_rel + if short_rel_temp.startswith('2'): + main_var = short_rel_temp[0:11] + elif short_rel_temp.startswith('3'): + main_var = short_rel_temp[0:10] + else: + main_var = short_rel_temp + + # 生成data data = { 'release': rel, - 'short_release': rel.replace('origin/', ''), - 'main_ver': rel[7:18], - 'ver_id': int(rel[14:18]), + 'short_release': short_rel, + 'main_ver': main_var, + 'ver_id': int(main_var[-4:]), 'status': '1' } Release.objects.create(**data)