|
|
|
@ -53,12 +53,11 @@ class GetVersion(object): |
|
|
|
else: |
|
|
|
else: |
|
|
|
cinema_config = q.get() |
|
|
|
cinema_config = q.get() |
|
|
|
sql_str = "SELECT cs.*, cv.server_version, cv.client_version FROM cinema_set cs LEFT JOIN cinema_version cv ON 1=1;" |
|
|
|
sql_str = "SELECT cs.*, cv.server_version, cv.client_version FROM cinema_set cs LEFT JOIN cinema_version cv ON 1=1;" |
|
|
|
ip = cinema_config.get('ip') |
|
|
|
|
|
|
|
db_config = { |
|
|
|
db_config = { |
|
|
|
'host': ip, |
|
|
|
'host': cinema_config.get('ip'), |
|
|
|
'user': cinema_config.get('db_user'), |
|
|
|
'user': cinema_config.get('db_user'), |
|
|
|
'password': cinema_config.get('db_pwd'), |
|
|
|
'password': cinema_config.get('db_pwd'), |
|
|
|
'database': 'cine', |
|
|
|
'database': cinema_config.get('db_name'), |
|
|
|
'connect_timeout': 5, |
|
|
|
'connect_timeout': 5, |
|
|
|
} |
|
|
|
} |
|
|
|
try: |
|
|
|
try: |
|
|
|
@ -70,6 +69,10 @@ class GetVersion(object): |
|
|
|
ver_num = res['server_version'].replace('Cloud_', '') |
|
|
|
ver_num = res['server_version'].replace('Cloud_', '') |
|
|
|
ver_id = int(ver_num[7:11]) if ver_num.startswith('2') else int(ver_num[6:10]) |
|
|
|
ver_id = int(ver_num[7:11]) if ver_num.startswith('2') else int(ver_num[6:10]) |
|
|
|
print('ver_id', ver_id) |
|
|
|
print('ver_id', ver_id) |
|
|
|
|
|
|
|
if cinema_config.get('url').endswith('cinema.yhz.com'): |
|
|
|
|
|
|
|
is_cloud = 'SAAS版' |
|
|
|
|
|
|
|
else: |
|
|
|
|
|
|
|
is_cloud = '云版本' if res.get('dx_sys_version', '--') == 'CLOUD' else '--', |
|
|
|
update_data = { |
|
|
|
update_data = { |
|
|
|
'name': res['cinema_name'], |
|
|
|
'name': res['cinema_name'], |
|
|
|
'zz_num': res['cinema_num'], |
|
|
|
'zz_num': res['cinema_num'], |
|
|
|
@ -78,7 +81,7 @@ class GetVersion(object): |
|
|
|
'client_ver': res['client_version'], |
|
|
|
'client_ver': res['client_version'], |
|
|
|
# 'update_time': datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d %H:%M:%S') |
|
|
|
# 'update_time': datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d %H:%M:%S') |
|
|
|
'update_time': timezone.now(), |
|
|
|
'update_time': timezone.now(), |
|
|
|
'is_cloud': '云版本' if res.get('dx_sys_version', '--') == 'CLOUD' else '--', |
|
|
|
'is_cloud': is_cloud, |
|
|
|
'remote_label': res.get('cinema_label', '--') if res.get('cinema_label', '--') != '' else '--', |
|
|
|
'remote_label': res.get('cinema_label', '--') if res.get('cinema_label', '--') != '' else '--', |
|
|
|
'ver_id': ver_id, |
|
|
|
'ver_id': ver_id, |
|
|
|
'is_online': True |
|
|
|
'is_online': True |
|
|
|
|