diff --git a/README.md b/README.md index 87bef476df02c7bfb39d847a9c8837b3875f30d3..6a58cbc26d251e8c51325231a2d86a71f87493fa 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ DJANGO 数据库增强 ================ -[![Django Kelove Setting Version](https://img.shields.io/badge/stable-v1.0.0-blue.svg)](https://gitee.com/itxq/django-kelove-database) +[![Django Kelove Setting Version](https://img.shields.io/badge/stable-v1.0.1-blue.svg)](https://gitee.com/itxq/django-kelove-database) [![Python Version](https://img.shields.io/badge/Python-3.6+-blue.svg)](https://www.python.org/) [![Django Version](https://img.shields.io/badge/Django-v3.1+-important.svg)](https://www.djangoproject.com/) [![LICENSE](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](https://gitee.com/itxq/django-kelove-database/blob/master/LICENSE) diff --git a/django_kelove_database/apps.py b/django_kelove_database/apps.py index 15bb8331c548d960972fc7338b325d427b9bb121..c8a0d05297c5482518717305f36261d0f80d6663 100644 --- a/django_kelove_database/apps.py +++ b/django_kelove_database/apps.py @@ -15,7 +15,7 @@ class DjangoKeloveDatabaseConfig(AppConfig): label = 'django_kelove_database' name = 'django_kelove_database' - verbose_name = _('Kelove Database') + verbose_name = _('数据资源') kelove_settings = [ 'django_kelove_database.kelove_settings.JSONFieldSettings', diff --git a/django_kelove_database/db/backends/mysql/doc.py b/django_kelove_database/db/backends/mysql/doc.py index d495058ebbdc8a672b414746f794037ce7a7a974..12b62512b5e80f5aae86e0e8f09824d5a053317d 100644 --- a/django_kelove_database/db/backends/mysql/doc.py +++ b/django_kelove_database/db/backends/mysql/doc.py @@ -41,5 +41,8 @@ class Doc(doc.Doc): 'privileges': filed_info[7], # 'comment': comment if comment else filed_info[8] } - cur_fields[filed_name].update(cur_filed_info) + try: + cur_fields[filed_name].update(cur_filed_info) + except Exception as e: + print(filed_name, table_name, cur_fields, e) return cur_fields diff --git a/django_kelove_database/models.py b/django_kelove_database/models.py index 48e94eabf51fd04301e3c5ae1c8aadb624d85e4a..267ca8db40a4fb4ee3c460c78b24df28926f3df9 100644 --- a/django_kelove_database/models.py +++ b/django_kelove_database/models.py @@ -339,8 +339,8 @@ class CkfinderResource(models.Model): return f'{self.name}({self.get_adapter_display()})' class Meta: - verbose_name = _('Ckfinder 资源') - verbose_name_plural = _('Ckfinder 资源') + verbose_name = _('文件资源') + verbose_name_plural = _('文件资源') permissions = ( ('manage_ckfinderresource', '文件管理'), ) diff --git a/pyproject.toml b/pyproject.toml index d08fb8f7e70873418ff59a25585c378c0d565399..6bf78f2280474bb1ee8f4051587a326fa901d9e2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "django-kelove-database" -version = "1.0.0" +version = "1.0.1" description = "DJANGO 数据库增强插件"