更新依赖包，支持python39环境

fir_ser/Dockerfile

@@ -1,34 +1,25 @@
 FROM python:3.9.14-slim
 
 # Fixes some weird terminal issues such as broken clear / CTRL+L
-ARG PIP_MIRROR=https://mirrors.aliyun.com/pypi/simple
+ARG PIP_MIRROR=https://mirrors.163.com/pypi/simple
 
-RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list \
-    && sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list \
-    && apt update 
+RUN sed -i 's/deb.debian.org/mirrors.163.com/g' /etc/apt/sources.list \
+    && sed -i 's/security.debian.org/mirrors.163.com/g' /etc/apt/sources.list \
+    && apt update  \
+    && apt-get install g++ wget -y \
+    && apt-get install libssl-dev openssl libmariadb-dev  -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN apt-get install g++ wget -y
-RUN apt-get install libssl-dev openssl libmariadb-dev  -y
-RUN rm -rf /var/lib/apt/lists/* 
-
-
-
-#COPY fir_client/dist /data/flyapps/fir_client
 
 #RUN cd /opt/ && wget https://github.com/nineaiyu/zsign/archive/refs/tags/v1.1.2.tar.gz
-COPY zsign-1.1.2.tar.gz /opt/zsign-1.1.2.tar.gz
-RUN cd /opt/ && tar xvf zsign-1.1.2.tar.gz && cd zsign-1.1.2/ && g++ *.cpp common/*.cpp -lcrypto -O3 -std=c++11 -o zsign && cp zsign /usr/bin/
+ADD zsign-1.1.2.tar.gz /opt/
+RUN cd /opt/zsign-1.1.2/ && g++ *.cpp common/*.cpp -lcrypto -O3 -std=c++11 -o zsign && cp zsign /usr/bin/ && rm -rf /opt/zsign-1.1.2/
 # install pip
 COPY requirements.txt /opt/requirements.txt
 RUN cd /opt/ && pip install -U setuptools pip -i ${PIP_MIRROR} --ignore-installed && pip install --no-cache-dir -r requirements.txt -i ${PIP_MIRROR}  && pip install --no-cache-dir uwsgi -i ${PIP_MIRROR} 
 
 
-#COPY Docker/flyapps.conf  /etc/supervisor/conf.d/flyapps.conf
-#COPY Docker/uwsgi.conf /data/flyapps/fir_ser/uwsgi.conf
-#COPY Docker/flyapps-vhost.conf  /etc/nginx/conf.d/flyapps-vhost.conf
-#COPY Docker/app.hehelucky.cn.pem /data/flyapps/app.hehelucky.cn.pem
-#COPY Docker/app.hehelucky.cn.key /data/flyapps/app.hehelucky.cn.key
-
 WORKDIR /data/fir_ser/
 RUN addgroup --system --gid 101 nginx \
     && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx 

fir_ser/admin/views/celery_flower.py

@@ -2,7 +2,7 @@
 #
 from django.conf import settings
 from django.http import HttpResponse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from proxy.views import proxy_view
 from rest_framework.views import APIView
 

fir_ser/common/core/signals.py

@@ -11,30 +11,30 @@ logger = logging.getLogger(__name__)
 """
 更新应用的时候，是否同时更新超级签名数据
 """
-run_resign_task_signal = Signal(providing_args=["app_obj"])
+run_resign_task_signal = Signal()
 
 """
 删除应用时的信号，用户清理签名相关数据
 """
 
-delete_app_signal = Signal(providing_args=["app_obj"])
+delete_app_signal = Signal()
 
 """
 下载超级签名数据
 """
-xsign_app_download_url_signal = Signal(providing_args=["app_pk", "udid", "download_url_type", "limit"])
+xsign_app_download_url_signal = Signal()
 
 """
 迁移超级签名数据
 """
-xsign_migrate_data_signal = Signal(providing_args=["app_release_obj", "user_obj", "new_storage_obj", "clean_old_data"])
+xsign_migrate_data_signal = Signal()
 
 """
 清理超级签名数据
 """
-xsign_clean_data_signal = Signal(providing_args=["app_release_obj", "storage_obj"])
+xsign_clean_data_signal = Signal()
 
 """
 根据binary_file获取签名应用数据
 """
-xsign_app_release_obj_signal = Signal(providing_args=["binary_file"])
+xsign_app_release_obj_signal = Signal()

fir_ser/fir_ser/settings.py

@@ -195,9 +195,6 @@ STATIC_URL = '/statics/'
 # python manage.py collectstatic 收集到的静态文件
 STATIC_ROOT = os.path.join(BASE_DIR, "api-static")
 
-STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "statics")
-]
 
 # Media配置
 MEDIA_URL = "files/"

fir_ser/requirements.txt

@@ -1,25 +1,24 @@
-celery==5.1.0
-django-celery-results==2.0.1
-django-celery-beat==2.2.0
-Django==3.2.3
-djangorestframework==3.12.4
+celery==5.2.7
+django-celery-results==2.4.0
+django-celery-beat==2.3.0
+Django==4.0.8
+djangorestframework==3.14.0
 djangorestframework-xml==2.0.0
-django-simple-captcha==0.5.14
-mysqlclient==2.0.3
-django-redis==4.12.1
-dnspython==2.1.0
-oss2==2.14.0
-aliyun-python-sdk-sts==3.0.2
-qiniu==7.4.1
-xmltodict==0.12.0
-pyOpenSSL==20.0.1
-paramiko==2.7.2
-PyJWT==2.1.0
-drf-extensions==0.7.0
-python-daemon==2.2.3
-psutil==5.6.6
-flower==1.0.0
+django-simple-captcha==0.5.17
+mysqlclient==2.1.1
+django-redis==5.2.0
+dnspython==2.2.1
+oss2==2.16.0
+aliyun-python-sdk-sts==3.1.0
+qiniu==7.9.0
+xmltodict==0.13.0
+pyOpenSSL==22.1.0
+paramiko==2.11.0
+PyJWT==2.5.0
+python-daemon==2.3.1
+psutil==5.9.2
+flower==1.2.0
 django-proxy==1.2.1
 uWSGI==2.0.20
-django-cors-headers==3.10.1
-django-filter==21.1
+django-cors-headers==3.13.0
+django-filter==22.1