升级支持SAAS

main
rogersun 2 days ago
parent 58f02cbfe4
commit 0c0999760a
  1. 18
      update/migrations/0035_cinema_db_name.py
  2. 1
      update/models.py
  3. 11
      update/utils/get_version.py
  4. 2
      update/views.py

@ -0,0 +1,18 @@
# Generated by Django 4.2.7 on 2026-07-15 03:53
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('update', '0034_cinema_url'),
]
operations = [
migrations.AddField(
model_name='cinema',
name='db_name',
field=models.CharField(default='cine', help_text='影院数据库名称', max_length=50, verbose_name='影院数据库名称'),
),
]

@ -14,6 +14,7 @@ class Cinema(BaseModels):
inner_id = models.CharField(verbose_name="影院4位编码", max_length=4, null=False, help_text='影院4位编码')
db_user = models.CharField(verbose_name='影院数据库账号', max_length=20, null=False, help_text='影院数据库账号')
db_pwd = models.CharField(verbose_name='影院数据库密码', max_length=50, null=False, help_text='影院数据库密码')
db_name = models.CharField(verbose_name='影院数据库名称', max_length=50, null=False, default='cine', help_text='影院数据库名称')
sys_ver = models.CharField(verbose_name='鼎新系统版本', max_length=50, null=False, help_text='鼎新系统版本')
client_ver = models.CharField(verbose_name='鼎新客户端版本', max_length=50, null=False, help_text='鼎新客户端版本')
user = models.CharField(verbose_name='使用人', max_length=10, null=True, help_text='当前使用人')

@ -53,12 +53,11 @@ class GetVersion(object):
else:
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;"
ip = cinema_config.get('ip')
db_config = {
'host': ip,
'host': cinema_config.get('ip'),
'user': cinema_config.get('db_user'),
'password': cinema_config.get('db_pwd'),
'database': 'cine',
'database': cinema_config.get('db_name'),
'connect_timeout': 5,
}
try:
@ -70,6 +69,10 @@ class GetVersion(object):
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])
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 = {
'name': res['cinema_name'],
'zz_num': res['cinema_num'],
@ -78,7 +81,7 @@ class GetVersion(object):
'client_ver': res['client_version'],
# 'update_time': datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d %H:%M:%S')
'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 '--',
'ver_id': ver_id,
'is_online': True

@ -52,7 +52,7 @@ class CinemaViewSet(CacheResponseMixin, viewsets.ModelViewSet):
search_fields = ('sys_ver',)
# filter_fields = ('ip',)
filterset_fields = ('ip',)
GetVersion().main_process() # 修改数据model时需要注释调
# GetVersion().main_process() # 修改数据model时需要注释调
# ClientUtilCustom().sync_client_db()
@action(methods=['get'], detail=False)

Loading…
Cancel
Save