From bd1c11379b05a0a883b8f2ee381ce5527fa09164 Mon Sep 17 00:00:00 2001
From: lihuacai <lihuacai168@gmail.com>
Date: Sat, 19 Nov 2022 11:05:24 +0800
Subject: [PATCH 1/3] feat: remove js compress

---
 templates/report_template.html | 2 --
 1 file changed, 2 deletions(-)
diff --git a/templates/report_template.html b/templates/report_template.html
index 21e63c6e..08e8ce68 100644
--- a/templates/report_template.html
+++ b/templates/report_template.html
@@ -8477,9 +8477,7 @@ <h5 class='category-name'></h5>
 
 </script>
 
-{% compress js %}
 <script src="{% static 'extent.js' %}" type='text/javascript'></script>
-{% endcompress js %}
 
 <script type='text/javascript'>
     $(window).off("keydown");

From 47229b61ff854cb26d4b2f1b9e4ce9b7e6675c7b Mon Sep 17 00:00:00 2001
From: lihuacai <lihuacai168@gmail.com>
Date: Sat, 19 Nov 2022 11:28:08 +0800
Subject: [PATCH 2/3] feat: remove js compress

---
 FasterRunner/settings/base.py  | 24 ------------------------
 requirements.txt               |  5 +----
 templates/report_template.html |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/FasterRunner/settings/base.py b/FasterRunner/settings/base.py
index 94a19d01..1f0ced0e 100644
--- a/FasterRunner/settings/base.py
+++ b/FasterRunner/settings/base.py
@@ -56,13 +56,10 @@
     "django_celery_beat",
     "rest_framework_swagger",
     "drf_yasg",
-    "compressor",
 ]
 
 MIDDLEWARE = [
     "django.middleware.gzip.GZipMiddleware",
-    "htmlmin.middleware.HtmlMinifyMiddleware",
-    "htmlmin.middleware.MarkRequestMiddleware",
     "log_request_id.middleware.RequestIDMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -77,28 +74,7 @@
 # https://docs.djangoproject.com/en/2.1/howto/static-files/
 STATIC_URL = "/static/"
 
-STATICFILES_FINDERS = (
-    "django.contrib.staticfiles.finders.FileSystemFinder",
-    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
-    # Add this
-    "compressor.finders.CompressorFinder",
-)
-STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
-COMPRESS_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_ROOT = os.path.join(BASE_DIR, "static_root")
-COMPRESS_ENABLED = True
-COMPRESS_CSS_HASHING_METHOD = "content"
-COMPRESS_FILTERS = {
-    "css": [
-        "compressor.filters.css_default.CssAbsoluteFilter",
-        "compressor.filters.cssmin.rCSSMinFilter",
-    ],
-    "js": [
-        "compressor.filters.jsmin.JSMinFilter",
-    ],
-}
-HTML_MINIFY = True
-KEEP_COMMENTS_ON_MINIFYING = True
 
 ROOT_URLCONF = "FasterRunner.urls"
 
diff --git a/requirements.txt b/requirements.txt
index 93e7a009..71fa03ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -67,7 +67,4 @@ pydantic==1.9.0
 gunicorn
 sentry-sdk~=1.5.8
 croniter~=1.3.5 # 计算下一次crontab
-django-log-request-id~=2.0.0
-
-django-htmlmin==0.11.0
-django-compressor==2.3 # 压缩静态文件
\ No newline at end of file
+django-log-request-id~=2.0.0
\ No newline at end of file
diff --git a/templates/report_template.html b/templates/report_template.html
index 08e8ce68..3ceb11e2 100644
--- a/templates/report_template.html
+++ b/templates/report_template.html
@@ -1,6 +1,5 @@
 {% load static %}
 
-{% load compress %}
 <!DOCTYPE html>
 <html>
 

From 665fae950865d643ee178a40bad338107170e7dc Mon Sep 17 00:00:00 2001
From: lihuacai <lihuacai168@gmail.com>
Date: Sat, 19 Nov 2022 12:07:13 +0800
Subject: [PATCH 3/3] fix: specific static file path

---
 FasterRunner/settings/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FasterRunner/settings/base.py b/FasterRunner/settings/base.py
index 1f0ced0e..c42ffec0 100644
--- a/FasterRunner/settings/base.py
+++ b/FasterRunner/settings/base.py
@@ -74,7 +74,9 @@
 # https://docs.djangoproject.com/en/2.1/howto/static-files/
 STATIC_URL = "/static/"
 
-STATIC_ROOT = os.path.join(BASE_DIR, "static_root")
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]  # 指定static文件的路径，缺少这个配置，collect static 无法加载extent.js
+
+STATIC_ROOT = os.path.join(BASE_DIR, "static_root")  # collect static 之后的文件存放路径
 
 ROOT_URLCONF = "FasterRunner.urls"
 
