From 0c0999760aae00e83114d4f3215184e9edeb3be8 Mon Sep 17 00:00:00 2001 From: rogersun Date: Wed, 15 Jul 2026 13:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=94=AF=E6=8C=81SAAS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/migrations/0035_cinema_db_name.py | 18 ++++++++++++++++++ update/models.py | 1 + update/utils/get_version.py | 11 +++++++---- update/views.py | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 update/migrations/0035_cinema_db_name.py diff --git a/update/migrations/0035_cinema_db_name.py b/update/migrations/0035_cinema_db_name.py new file mode 100644 index 0000000..fcd1634 --- /dev/null +++ b/update/migrations/0035_cinema_db_name.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='影院数据库名称'), + ), + ] diff --git a/update/models.py b/update/models.py index 9a468fa..f13cbf7 100644 --- a/update/models.py +++ b/update/models.py @@ -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='当前使用人') diff --git a/update/utils/get_version.py b/update/utils/get_version.py index 264003b..5868922 100644 --- a/update/utils/get_version.py +++ b/update/utils/get_version.py @@ -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 diff --git a/update/views.py b/update/views.py index 54d0e98..8bac35e 100644 --- a/update/views.py +++ b/update/views.py @@ -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)