chore: fix some changes for django

Ehco1996 · Aug 25, 2024 · 4099cfb · 4099cfb
1 parent e837951
commit 4099cfb
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/apps/proxy/models.py b/apps/proxy/models.py
@@ -803,7 +803,9 @@ class Meta:
         verbose_name = "用户流量记录"
         verbose_name_plural = "用户流量记录"
         ordering = ["-created_at"]
-        index_together = ["user", "proxy_node", "created_at"]
+        indexes = [
+            models.Index(fields=["user", "proxy_node", "created_at"]),
+        ]
 
     def __str__(self) -> str:
         return f"用户流量记录:{self.id}"

diff --git a/apps/sspanel/models.py b/apps/sspanel/models.py
@@ -377,7 +377,7 @@ def bind(self, user):
         self.save()
 
 
-class UserOrder(models.Model, UserMixin):
+class UserOrder(UserMixin, models.Model):
     ALIPAY_CALLBACK_URL = f"{settings.SITE_HOST}/api/callback/alipay"
     DEFAULT_ORDER_TIME_OUT = "10m"
     STATUS_CREATED = 0
@@ -411,7 +411,9 @@ def __str__(self):
     class Meta:
         verbose_name = "用户订单"
         verbose_name_plural = "用户订单"
-        index_together = ["user", "status"]
+        indexes = [
+            models.Index(fields=["user", "status"]),
+        ]
 
     @classmethod
     def gen_out_trade_no(cls):
@@ -1109,7 +1111,9 @@ class Meta:
         verbose_name = "工单回复"
         verbose_name_plural = "工单回复"
         ordering = ("ticket", "created_at")
-        index_together = ["ticket", "created_at"]
+        indexes = [
+            models.Index(fields=["ticket", "created_at"]),
+        ]
 
     @classmethod
     def create_message(cls, user, ticket, message):

diff --git a/apps/tianyi.py b/apps/tianyi.py
@@ -2,6 +2,7 @@
 tianyi: 天一是三渣的早期作品:<贩罪>的主角，是像猫一样生活的男人，并且善于计算人心/性，做出各种冷静的数据分析
 这里存一些数据分析相关的东西
 """
+
 import decimal
 from typing import List
 

diff --git a/configs/default/sentry.py b/configs/default/sentry.py
@@ -16,9 +16,10 @@
         release=SENTRY_RELEASE_TAG,
         traces_sample_rate=SENTRY_TRACES_SAMPLE_RATE,
         environment=SENTRY_ENVIRONMENT,
+        auto_session_tracking=False,
         integrations=[
+            RedisIntegration(),
             CeleryIntegration(),
             DjangoIntegration(transaction_style="function_name"),
-            RedisIntegration(),
         ],
     )
diff --git a/templates/basehead.html b/templates/basehead.html
@@ -7,29 +7,29 @@
       type="image/x-icon" />
 <!-- css -->
 {% if user.theme and user.theme != "default" %}
-      <link href="https://cdn.jsdelivr.net/npm/bulmaswatch@0.8.1/{{ user.theme }}/bulmaswatch.min.css"
-            rel="stylesheet" />
+    <link href="https://cdn.jsdelivr.net/npm/bulmaswatch@0.8.1/{{ user.theme }}/bulmaswatch.min.css"
+          rel="stylesheet" />
 {% else %}
-      <link href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css"
-            rel="stylesheet" />
+    <link href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css"
+          rel="stylesheet" />
 {% endif %}
 <link rel="stylesheet" href="{% static 'sspanel/css/sspanel.css' %}" />
 {% if not simple_extra_static or user.is_authenticated %}
-      <link rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/flag-icon-css@3.5.0/css/flag-icon.min.css" />
-      <link rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/bulma-extensions@6.2.7/dist/css/bulma-extensions.min.css" />
-      <link rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/fontawesome.min.css" />
+    <link rel="stylesheet"
+          href="https://cdn.jsdelivr.net/npm/flag-icon-css@3.5.0/css/flag-icon.min.css" />
+    <link rel="stylesheet"
+          href="https://cdn.jsdelivr.net/npm/bulma-extensions@6.2.7/dist/css/bulma-extensions.min.css" />
+    <link rel="stylesheet"
+          href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/fontawesome.min.css" />
 {% endif %}
 <!-- js -->
 <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/sweetalert@2.1.2/dist/sweetalert.min.js"></script>
 <script src="{% static 'sspanel/js/sspanel.js' %}"></script>
 {% if not simple_extra_static or user.is_authenticated %}
-      <script src="https://cdn.jsdelivr.net/npm/clipboard@1.7.1/dist/clipboard.min.js"></script>
-      <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
-      <script src="https://cdn.jsdelivr.net/npm/bulma-extensions@6.2.7/dist/js/bulma-extensions.min.js"></script>
-      <script src="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/all.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/clipboard@1.7.1/dist/clipboard.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bulma-extensions@6.2.7/dist/js/bulma-extensions.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/all.min.js"></script>
 {% endif %}
diff --git a/templates/web/node_occupancy.html b/templates/web/node_occupancy.html
@@ -167,9 +167,9 @@ <h1 class="title">独享节点</h1>
                                             <td>{{ o.end_time }}</td>
                                             <td>
                                                 <progress class="progress {{ o.progress_color }}"
-                                                value="{{ o.used_traffic }}"
-                                                max="{{ o.total_traffic }}"></progress>{{ o.used_percentage }}{{ o.used_percentage }}
-                                      <span>{{ o.human_used_traffic }} / {{ o.human_total_traffic }}</span>
+                                                          value="{{ o.used_traffic }}"
+                                                          max="{{ o.total_traffic }}"></progress>{{ o.used_percentage }}{{ o.used_percentage }}
+                                                <span>{{ o.human_used_traffic }} / {{ o.human_total_traffic }}</span>
                                             </td>
                                         </tr>
                                     {% endfor %}