feature：更新docker打包方式

.dockerignore

@@ -0,0 +1,12 @@
+.editorconfig
+.gitattributes
+.github
+.gitignore
+.gitlab-ci.yml
+.idea
+.pre-commit-config.yaml
+.readthedocs.yml
+.travis.yml
+venv
+.git
+/web/

applications/task/__init__.py

@@ -0,0 +1 @@
+default_app_config = "applications.task.apps.ProjectConfig"

applications/task/apps.py

@@ -1,5 +1,11 @@
 from django.apps import AppConfig
+from django.db.models.signals import post_migrate
+
+from applications.task.handlers import init_task
 
 
 class ProjectConfig(AppConfig):
-    name = 'task'
+    name = 'applications.task'
+
+    def ready(self):
+        post_migrate.connect(init_task, self)

applications/task/handlers.py

@@ -0,0 +1,4 @@
+def init_task(sender, **kwargs):
+    from django.contrib.auth.models import User
+    if not User.objects.filter(username="admin").exists():
+        User.objects.create_superuser("admin", "admin@qq.com", "admin")

compose/local/django/Dockerfile

@@ -0,0 +1,60 @@
+# define an alias for the specfic python version used in this file.
+FROM python:3.9.12-slim-bullseye as python
+
+# Python build stage
+FROM python as python-build-stage
+
+ARG BUILD_ENVIRONMENT=local
+
+# Install apt packages
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # dependencies for building Python packages
+  build-essential \
+  # psycopg2 dependencies
+  libpq-dev \
+  default-libmysqlclient-dev
+
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements .
+# Create Python Dependency and Sub-Dependency Wheels.
+RUN pip wheel --wheel-dir /usr/src/app/wheels  \
+  -r ${BUILD_ENVIRONMENT}.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+# Python 'run' stage
+FROM python as python-run-stage
+
+ARG BUILD_ENVIRONMENT=local
+ARG APP_HOME=/app
+
+ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV BUILD_ENV ${BUILD_ENVIRONMENT}
+
+WORKDIR ${APP_HOME}
+
+# Install required system dependencies
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # psycopg2 dependencies
+  libpq-dev \
+  # Translations dependencies
+  gettext \
+  default-libmysqlclient-dev \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*
+
+# All absolute dir copies ignore workdir instruction. All relative dir copies are wrt to the workdir instruction
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels  /wheels/
+
+# use wheels to install python dependencies
+RUN pip install --no-cache-dir --no-index --find-links=/wheels/ /wheels/* \
+	&& rm -rf /wheels/
+
+
+COPY ./compose/local/django/start /start
+RUN sed -i 's/\r$//g' /start
+RUN chmod +x /start
+
+# copy application code to WORKDIR
+COPY . ${APP_HOME}

compose/local/django/start

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+
+python manage.py migrate
+exec gunicorn -w 1 -k gevent -b 0.0.0.0:8001 django_vue_cli.wsgi:application

django_vue_cli/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import
 
-from .celery_app import app as current_app
-
-__all__ = ('current_app',)
+# from .celery_app import app as current_app
+#
+# __all__ = ('current_app',)

django_vue_cli/celery_app.py

@@ -1,30 +1,30 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
-import os
-import time
-from celery import Celery, platforms
-from django.conf import settings
-
-platforms.C_FORCE_ROOT = True
-
-# set the default Django settings module for the 'celery' program.
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_vue_cli.settings")
-
-app = Celery("django_vue_cli")
-
-# Using a string here means the worker don't have to serialize
-# the configuration object to child processes.
-# - namespace='CELERY' means all celery-related configuration keys
-#   should have a `CELERY_` prefix.
-app.config_from_object("django.conf:settings")
-
-# Load task modules from all registered Django app configs.
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
-
-
-@app.task(bind=True)
-def debug_task(self):
-    print("Request: {!r}".format(self.request))
-    time.sleep(2)
+# # -*- coding: utf-8 -*-
+#
+# from __future__ import absolute_import, unicode_literals
+#
+# import os
+# import time
+# from celery import Celery, platforms
+# from django.conf import settings
+#
+# platforms.C_FORCE_ROOT = True
+#
+# # set the default Django settings module for the 'celery' program.
+# os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_vue_cli.settings")
+#
+# app = Celery("django_vue_cli")
+#
+# # Using a string here means the worker don't have to serialize
+# # the configuration object to child processes.
+# # - namespace='CELERY' means all celery-related configuration keys
+# #   should have a `CELERY_` prefix.
+# app.config_from_object("django.conf:settings")
+#
+# # Load task modules from all registered Django app configs.
+# app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+#
+#
+# @app.task(bind=True)
+# def debug_task(self):
+#     print("Request: {!r}".format(self.request))
+#     time.sleep(2)

local.yml

@@ -0,0 +1,15 @@
+version: '3'
+
+services:
+  django: &django
+    build:
+      context: .
+      dockerfile: ./compose/local/django/Dockerfile
+    image: music-tag-web
+    container_name: music-tag-web
+    ports:
+      - "8001:8001"
+    volumes:
+      - /Users/macbookair/Music/my_music:/app/media:z
+    command: /start
+    restart: always

requirements.txt

@@ -5,6 +5,7 @@ djangorestframework==3.8.1
 python-dateutil==2.8.2
 requests==2.27.1
 gunicorn==20.1.0
+gevent==21.12.0
 djangorestframework-jwt==1.11.0
 music-tag==0.4.3
 Pillow==9.4.0

requirements/base.txt

@@ -0,0 +1,12 @@
+Django==2.2.6
+django-cors-headers==3.2.1
+django-filter==2.0.0
+djangorestframework==3.8.1
+python-dateutil==2.8.2
+requests==2.27.1
+gunicorn==20.1.0
+gevent==21.12.0
+djangorestframework-jwt==1.11.0
+music-tag==0.4.3
+Pillow==9.4.0
+pycryptodomex==3.17

requirements/local.txt

@@ -0,0 +1 @@
+-r base.txt

supervisor.conf

@@ -1,160 +0,0 @@
-[unix_http_server]
-file=/tmp/supervisor.sock   ; the path to the socket file
-;chmod=0700                 ; socket file mode (default 0700)
-;chown=nobody:nogroup       ; socket file uid:gid owner
-;username=admin              ; default is no username (open server)
-;password=xhongc               ; default is no password (open server)
-
-;[inet_http_server]         ; inet (TCP) server disabled by default
-;port=127.0.0.1:9001        ; ip_address:port specifier, *:port for all iface
-;username=user              ; default is no username (open server)
-;password=123               ; default is no password (open server)
-
-[supervisord]
-logfile=/tmp/supervisord.log ; main log file; default $CWD/supervisord.log
-logfile_maxbytes=50MB        ; max main logfile bytes b4 rotation; default 50MB
-logfile_backups=10           ; # of main logfile backups; 0 means none, default 10
-loglevel=info                ; log level; default info; others: debug,warn,trace
-pidfile=/tmp/supervisord.pid ; supervisord pidfile; default supervisord.pid
-nodaemon=false               ; start in foreground if true; default false
-silent=false                 ; no logs to stdout if true; default false
-minfds=1024                  ; min. avail startup file descriptors; default 1024
-minprocs=200                 ; min. avail process descriptors;default 200
-;umask=022                   ; process file creation umask; default 022
-;user=supervisord            ; setuid to this UNIX account at startup; recommended if root
-;identifier=supervisor       ; supervisord identifier, default is 'supervisor'
-;directory=/tmp              ; default is not to cd during start
-;nocleanup=true              ; don't clean up tempfiles at start; default false
-;childlogdir=/tmp            ; 'AUTO' child log dir, default $TEMP
-;environment=KEY="value"     ; key value pairs to add to environment
-;strip_ansi=false            ; strip ansi escape codes in logs; def. false
-
-; The rpcinterface:supervisor section must remain in the config file for
-; RPC (supervisorctl/web interface) to work.  Additional interfaces may be
-; added by defining them in separate [rpcinterface:x] sections.
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-; The supervisorctl section configures how supervisorctl will connect to
-; supervisord.  configure it match the settings in either the unix_http_server
-; or inet_http_server section.
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
-;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket
-;username=chris              ; should be same as in [*_http_server] if set
-;password=123                ; should be same as in [*_http_server] if set
-;prompt=mysupervisor         ; cmd line prompt (default "supervisor")
-;history_file=~/.sc_history  ; use readline history if available
-
-; The sample program section below shows all possible program subsection values.
-; Create one or more 'real' program: sections to be able to control them under
-; supervisor.
-
-;[program:theprogramname]
-;command=/bin/cat              ; the program (relative uses PATH, can take args)
-;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
-;numprocs=1                    ; number of processes copies to start (def 1)
-;directory=/tmp                ; directory to cwd to before exec (def no cwd)
-;umask=022                     ; umask for process (default None)
-;priority=999                  ; the relative start priority (default 999)
-;autostart=true                ; start at supervisord start (default: true)
-;startsecs=1                   ; # of secs prog must stay up to be running (def. 1)
-;startretries=3                ; max # of serial start failures when starting (default 3)
-;autorestart=unexpected        ; when to restart if exited after running (def: unexpected)
-;exitcodes=0                   ; 'expected' exit codes used with autorestart (default 0)
-;stopsignal=QUIT               ; signal used to kill process (default TERM)
-;stopwaitsecs=10               ; max num secs to wait b4 SIGKILL (default 10)
-;stopasgroup=false             ; send stop signal to the UNIX process group (default false)
-;killasgroup=false             ; SIGKILL the UNIX process group (def false)
-;user=chrism                   ; setuid to this UNIX account to run the program
-;redirect_stderr=true          ; redirect proc stderr to stdout (default false)
-;stdout_logfile=/a/path        ; stdout log path, NONE for none; default AUTO
-;stdout_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)
-;stdout_logfile_backups=10     ; # of stdout logfile backups (0 means none, default 10)
-;stdout_capture_maxbytes=1MB   ; number of bytes in 'capturemode' (default 0)
-;stdout_events_enabled=false   ; emit events on stdout writes (default false)
-;stdout_syslog=false           ; send stdout to syslog with process name (default false)
-;stderr_logfile=/a/path        ; stderr log path, NONE for none; default AUTO
-;stderr_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)
-;stderr_logfile_backups=10     ; # of stderr logfile backups (0 means none, default 10)
-;stderr_capture_maxbytes=1MB   ; number of bytes in 'capturemode' (default 0)
-;stderr_events_enabled=false   ; emit events on stderr writes (default false)
-;stderr_syslog=false           ; send stderr to syslog with process name (default false)
-;environment=A="1",B="2"       ; process environment additions (def no adds)
-;serverurl=AUTO                ; override serverurl computation (childutils)
-
-; The sample eventlistener section below shows all possible eventlistener
-; subsection values.  Create one or more 'real' eventlistener: sections to be
-; able to handle event notifications sent by supervisord.
-
-;[eventlistener:theeventlistenername]
-;command=/bin/eventlistener    ; the program (relative uses PATH, can take args)
-;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
-;numprocs=1                    ; number of processes copies to start (def 1)
-;events=EVENT                  ; event notif. types to subscribe to (req'd)
-;buffer_size=10                ; event buffer queue size (default 10)
-;directory=/tmp                ; directory to cwd to before exec (def no cwd)
-;umask=022                     ; umask for process (default None)
-;priority=-1                   ; the relative start priority (default -1)
-;autostart=true                ; start at supervisord start (default: true)
-;startsecs=1                   ; # of secs prog must stay up to be running (def. 1)
-;startretries=3                ; max # of serial start failures when starting (default 3)
-;autorestart=unexpected        ; autorestart if exited after running (def: unexpected)
-;exitcodes=0                   ; 'expected' exit codes used with autorestart (default 0)
-;stopsignal=QUIT               ; signal used to kill process (default TERM)
-;stopwaitsecs=10               ; max num secs to wait b4 SIGKILL (default 10)
-;stopasgroup=false             ; send stop signal to the UNIX process group (default false)
-;killasgroup=false             ; SIGKILL the UNIX process group (def false)
-;user=chrism                   ; setuid to this UNIX account to run the program
-;redirect_stderr=false         ; redirect_stderr=true is not allowed for eventlisteners
-;stdout_logfile=/a/path        ; stdout log path, NONE for none; default AUTO
-;stdout_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)
-;stdout_logfile_backups=10     ; # of stdout logfile backups (0 means none, default 10)
-;stdout_events_enabled=false   ; emit events on stdout writes (default false)
-;stdout_syslog=false           ; send stdout to syslog with process name (default false)
-;stderr_logfile=/a/path        ; stderr log path, NONE for none; default AUTO
-;stderr_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)
-;stderr_logfile_backups=10     ; # of stderr logfile backups (0 means none, default 10)
-;stderr_events_enabled=false   ; emit events on stderr writes (default false)
-;stderr_syslog=false           ; send stderr to syslog with process name (default false)
-;environment=A="1",B="2"       ; process environment additions
-;serverurl=AUTO                ; override serverurl computation (childutils)
-
-; The sample group section below shows all possible group values.  Create one
-; or more 'real' group: sections to create "heterogeneous" process groups.
-
-;[group:thegroupname]
-;programs=progname1,progname2  ; each refers to 'x' in [program:x] definitions
-;priority=999                  ; the relative start priority (default 999)
-
-; The [include] section can just contain the "files" setting.  This
-; setting can list multiple files (separated by whitespace or
-; newlines).  It can also contain wildcards.  The filenames are
-; interpreted as relative to this file.  Included files *cannot*
-; include files themselves.
-
-;[include]
-;files = relative/directory/*.ini
-
-
-[program:gunicorn]
-user  = root
-directory = /root/dj-flow
-command = /usr/bin/gunicorn -w 1 -k gevent -b 127.0.0.1:8001 dj_flow.wsgi:application
-autostart=true
-autorestart=true
-# 日志
-stdout_logfile=/root/logs/dj-flow/supervisor/wsgi_out.log
-stderr_logfile=/root/logs/dj-flow/supervisor/wsgi_err.log
-
-[program:worker]
-user  = root
-directory = /root/dj-flow
-command = /usr/bin/python3 manage.py celery worker -Q er_execute,er_schedule -l info -P gevent
-autostart=true
-autorestart=true
-# 日志
-stdout_logfile=/root/logs/dj-flow/supervisor/worker_out.log
-stderr_logfile=/root/logs/dj-flow/supervisor/worker_err.log

web/src/api/axiosconfig/axiosconfig.js

@@ -108,4 +108,4 @@ export function DELETE(url, params, config) {
 // reUrl = '';  不需要重定向
 //  reUrl = VueEnv === 'production' ? '' : '/api'; 重定向
 // todo do
-export const reUrl = '/api-proxy'
+export const reUrl = ''