|
|
@@ -107,9 +107,10 @@ class PcInfo(View):
|
|
|
def getnewversionV2(self, request_dict, response):
|
|
|
pc_name = request_dict.get('pc_name', None)
|
|
|
bundle_version = request_dict.get('bundle_version', None)
|
|
|
+ pc_version = request_dict.get('pc_version', None)
|
|
|
pc_test = request_dict.get('pc_test', None)
|
|
|
param_flag = CommonService.get_param_flag(
|
|
|
- data=[pc_name, bundle_version, pc_test])
|
|
|
+ data=[pc_name, bundle_version, pc_version, pc_test])
|
|
|
if param_flag is not True:
|
|
|
return response.json(444)
|
|
|
file = Pc_Info.objects.filter(pc_name=pc_name, bundle_version=bundle_version, pc_test=pc_test)
|
|
|
@@ -124,6 +125,7 @@ class PcInfo(View):
|
|
|
version_list = []
|
|
|
for i in range(2):
|
|
|
app_list = Pc_Info.objects.filter(pc_name=pc_name, bundle_version=bundle_version, pc_test=pc_test, is_update=i)
|
|
|
+ # 当前软件不存在强制更新（is_update=1）的版本返回空
|
|
|
if not app_list.exists():
|
|
|
res = {'pc_name': '',
|
|
|
'new_version': '',
|
|
|
@@ -137,6 +139,15 @@ class PcInfo(View):
|
|
|
for i in all_version:
|
|
|
v.append(i['pc_version'])
|
|
|
new_version = max(v)
|
|
|
+ # 当前软件版本为最新时返回空
|
|
|
+ if pc_version >= new_version:
|
|
|
+ res = {'pc_name': '',
|
|
|
+ 'new_version': '',
|
|
|
+ 'is_update': app_list.filter(pc_version=new_version).values('is_update')[0]['is_update'],
|
|
|
+ 'path': '',
|
|
|
+ 'response_url': ''}
|
|
|
+ version_list.append(res)
|
|
|
+ continue
|
|
|
path = app_list.filter(pc_version=new_version).values('download_link')[0]['download_link']
|
|
|
print('path', path)
|
|
|
response_url = aws_s3_guonei.generate_presigned_url(
|
lhq