重构

.run/DjangoAppCenter.run.xml

@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DjangoAppCenter" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+    <module name="DjangoAppCenter" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="SDK_NAME" value="Python 3.12 (DjangoAppCenter)" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="DjangoAppCenter" />
+    <option name="PARAMETERS" value="dev runserver" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="true" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

DjangoAppCenter/__main__.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 import os
 import sys
 

DjangoAppCenter/cli.py

@@ -1,10 +1,11 @@
+# encoding: utf-8
+
 import os
 import sys
 
 import fire
 
-from DjangoAppCenter.settings.loader import init_profile, CWD_SETTINGS_PATH
-from DjangoAppCenter.settings.loader import load_settings_from_file
+from DjangoAppCenter.settings.storage import django_app_center_settings
 from DjangoAppCenter.utils import get_python_version
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@@ -40,7 +41,7 @@ def deploy(reload: bool = True, use_nginx: bool = False):
     run django with uwsgi
     """
     os.environ.setdefault('DAC_ENVIRON', 'PROD')
-    custom_settings = load_settings_from_file()
+    custom_settings = django_app_center_settings
     static_root = custom_settings.get('STATIC_ROOT', 'statics')
     wsgi_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'wsgi.py')
     served_hosts = custom_settings.get('DAC_SERVED_HOSTS', '0.0.0.0')
@@ -50,7 +51,7 @@ def deploy(reload: bool = True, use_nginx: bool = False):
         if reload:
             os.system(
                 "uwsgi --py-autoreload=1 --touch-reload=%s --socket=%s:%s --file=%s  --static-map=/static=%s --logto appcenter-wsgi.log" % (
-                    CWD_SETTINGS_PATH, served_hosts, str(port), wsgi_path, static_root))
+                    BASE_SETTINGS_PATH, served_hosts, str(port), wsgi_path, static_root))
         else:
             os.system(
                 "uwsgi --touch-reload=%s --socket=%s:%s --file=%s  --static-map=/static=%s --logto appcenter-wsgi.log" % (
@@ -59,7 +60,7 @@ def deploy(reload: bool = True, use_nginx: bool = False):
         if reload:
             os.system(
                 "uwsgi --py-autoreload=1 --touch-reload=%s --http=%s:%s --file=%s  --static-map=/static=%s --logto appcenter-wsgi.log" % (
-                    CWD_SETTINGS_PATH, served_hosts, str(port), wsgi_path, static_root))
+                    BASE_SETTINGS_PATH, served_hosts, str(port), wsgi_path, static_root))
         else:
             os.system(
                 "uwsgi --touch-reload=%s --http=%s:%s --file=%s  --static-map=/static=%s --logto appcenter-wsgi.log" % (
@@ -71,5 +72,4 @@ def entry():
         'dev': dev,
         'prod': prod,
         'deploy': deploy,
-        'init': init_profile
     })

DjangoAppCenter/middlewares/global_exception_handler.py

@@ -0,0 +1,21 @@
+import logging
+
+from django.http import HttpResponseBadRequest, JsonResponse
+
+logger = logging.getLogger("exception")
+
+
+class CustomException(Exception):
+    pass
+
+
+class GlobalExceptionHandler(object):
+    def process_exception(self, request, exception):
+        logger.exception(exception)
+
+        if isinstance(exception, CustomException):
+            logger.error(f"CustomException: {exception}")
+            return JsonResponse({'msg': str(exception), 'code': -1})
+        else:
+            logger.error(f"GlobalExceptionHandler: {exception}")
+            return HttpResponseBadRequest()

DjangoAppCenter/packages/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
 
 from DjangoAppCenter.packages.models import Package
-from DjangoAppCenter.settings import load_settings_from_file
+from DjangoAppCenter.settings.storage import django_app_center_settings
 
 # Register your models here.
 admin.site.register(Package)
-admin.site.site_title = load_settings_from_file().get("ADMIN_SITE_TITLE", "DjangoAppCenter")
-admin.site.site_header = load_settings_from_file().get("ADMIN_SITE_HEADER", "DjangoAppCenter")
+admin.site.site_title = django_app_center_settings.get("ADMIN_SITE_TITLE", "DjangoAppCenter")
+admin.site.site_header = django_app_center_settings.get("ADMIN_SITE_HEADER", "DjangoAppCenter")

DjangoAppCenter/packages/apps.py

@@ -2,4 +2,6 @@
 
 
 class PackagesConfig(AppConfig):
-    name = 'packages'
+    name = 'DjangoAppCenter.packages'
+    verbose_name = '包管理'
+    default_auto_field = 'django.db.models.AutoField'

DjangoAppCenter/packages/handler.py

@@ -0,0 +1,64 @@
+import json
+import os
+from datetime import datetime
+
+from settings import BASE_DIR
+
+
+class PackageEventHandler:
+    TOUCH_RELOAD_FILE = os.path.join(BASE_DIR, 'package-event.log')
+
+    @staticmethod
+    def write_event(func):
+        def wrapper():
+            event = func()
+            with open(PackageEventHandler.TOUCH_RELOAD_FILE, 'w') as f:
+                f.write(f'{json.dumps(event, ensure_ascii=False)}\n')
+
+        return wrapper
+
+    @staticmethod
+    @write_event
+    def on_package_installed(package_name: str,
+                             package_version: str,
+                             old_config_snapshot_version: str,
+                             new_config_snapshot_version: str):
+        return {
+            'event': 'package_installed',
+            'package_name': package_name,
+            'package_version': package_version,
+            'old_config_snapshot_version': old_config_snapshot_version,
+            'new_config_snapshot_version': new_config_snapshot_version,
+            'time': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        }
+
+    @staticmethod
+    @write_event
+    def on_package_uninstalled(package_name: str,
+                               package_version: str,
+                               old_config_snapshot_version: str,
+                               new_config_snapshot_version: str):
+        return {
+            'event': 'package_uninstalled',
+            'package_name': package_name,
+            'package_version': package_version,
+            'old_config_snapshot_version': old_config_snapshot_version,
+            'new_config_snapshot_version': new_config_snapshot_version,
+            'time': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        }
+
+    @staticmethod
+    def on_package_updated(package_name: str,
+                           package_old_version: str,
+                           package_new_version: str,
+                           old_config_snapshot_version: str,
+                           new_config_snapshot_version: str):
+        return {
+            'event': 'package_updated',
+            'package_name': package_name,
+            'package_old_version': package_old_version,
+            'package_new_version': package_new_version,
+            'old_config_snapshot_version': old_config_snapshot_version,
+            'new_config_snapshot_version': new_config_snapshot_version,
+            'time': datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        }