release v2023.12

.env.sample

@@ -1,81 +1,86 @@
 #--->服务端口 nginx
-port = 80
+port=80
 
 #--->mysql
-# mysql数据库设置 db.py
-MYSQL_USER = root
-MYSQL_PASSWORD = yourpass
+#mysql数据库设置 db.py
+MYSQL_USER=root
+MYSQL_PASSWORD=yourpass
 # mysql服务设置
 # mysql host默认请保持注释*
-# MYSQL_HOST = mysql
-# mysql服务密码设置
-MYSQL_ROOT_PASSWORD = ${MYSQL_PASSWORD}  #设置MYSQL_PASSWORD即可
+# MYSQL_HOST=mysql
 
 
 #--->网站定制 sites.py
 # 网站域名设置（请正确填写，不然订阅功能会失效：
-HOST = http://127.0.0.1:8000
+HOST=http://127.0.0.1:8000
 # 网站密钥
-SECRET_KEY = aasdasdas
+SECRET_KEY=aasdasdas
 # 是否开启注册
-ALLOW_REGISTER = True
+ALLOW_REGISTER=True
 # 默认的theme
 # 可选列表在 apps/constants.py 里的THEME_CHOICES里
-DEFAULT_THEME = default
+DEFAULT_THEME=default
 # 默认加密混淆协议
-DEFAULT_METHOD = aes-256-cfb
+DEFAULT_METHOD=aes-256-cfb
 # 签到流量设置
-MIN_CHECKIN_TRAFFIC = 10485760   # 10 * 1024 * 1024 (10MB)
-MAX_CHECKIN_TRAFFIC = 209715200  # 200 * 1024 * 1024 (200MB)
+MIN_CHECKIN_TRAFFIC=10485760
+# 10 * 1024 * 1024 (10MB)
+MAX_CHECKIN_TRAFFIC=209715200
+# 200 * 1024 * 1024 (200MB)
 # 网站title
-TITLE= 谜之屋
-SUBTITLE= 秘密的小屋
+SITE_TITLE=谜之屋
+SITE_SUBTITLE=秘密的小屋
+SITE_KEYWORDS=秘密的小屋
+SITE_DESCRIPTION=秘密的小屋
+SITE_LOGO_URL=""
 # 用户邀请返利比例
-INVITE_PERCENT= 0.2
+INVITE_PERCENT=0.2
 # 用户能生成的邀请码数量
-INVITE_NUM = 5
-# 网站邀请界面提示语
-INVITEINFO = 邀请码实时更新，如果用完了就没了
+INVITE_NUM=5
+# 网站邀请页提示语
+INVITEINFO=邀请码实时更新，如果用完了就没了
 # 部分API接口TOKEN
-TOKEN= youowntoken
+TOKEN=youowntoken
 # SHORT_URL_ALPHABET 请随机生成,且不要重复
-DEFAULT_ALPHABET = qwertyuiopasdfghjklzxcvbnm
+DEFAULT_ALPHABET=qwertyuiopasdfghjklzxcvbnm
 # FOR SIMPLE UI
-SIMPLEUI_HOME_INFO = False
-SIMPLEUI_DEFAULT_ICON = False
+SIMPLEUI_HOME_INFO=False
+SIMPLEUI_DEFAULT_ICON=False
 # 是否开启用户到期邮件通知
-EXPIRE_EMAIL_NOTICE= False
+EXPIRE_EMAIL_NOTICE=False
 
 
 #--->邮箱设置 email.py
 # 是否开启邮件功能
-USE_SMTP = True
-EMAIL_USE_SSL = True
-EMAIL_HOST = smtp.163.com
-EMAIL_PORT = 465
-EMAIL_HOST_USER= user
-EMAIL_HOST_PASSWORD= yourpass
-DEFAULT_FROM_EMAIL = user      #可以与EMAIL_HOST_USER一致
+USE_SMTP=True
+EMAIL_USE_SSL=True
+EMAIL_HOST=smtp.163.com
+EMAIL_PORT=465
+EMAIL_HOST_USER=user
+EMAIL_HOST_PASSWORD=yourpass
+DEFAULT_FROM_EMAIL=user
+#可以与EMAIL_HOST_USER一致
 # FOR mailgun*
-# MAILGUN_API_KEY = key
-# MAILGUN_SENDER_DOMAIN = domain
+# MAILGUN_API_KEY=key
+# MAILGUN_SENDER_DOMAIN=domain
 
 
 #--->支付宝对接 pay.py*
-#USE_ALIPAY = False
-#ALIPAY_APP_ID = XXXXXXXX
-#ALIPAY_APP_PRIVATE_KEY_STRING = "-----BEGIN RSA PRIVATE KEY-----
+#USE_ALIPAY=False
+#CHECK_PAY_REQ_IP_FROM_CN=False
+#ALIPAY_APP_ID=XXXXXXXX
+#ALIPAY_APP_PRIVATE_KEY_STRING="-----BEGIN RSA PRIVATE KEY-----
 #-----END RSA PRIVATE KEY-----"
 #ALIPAY_PUBLIC_KEY_STRING="-----BEGIN PUBLIC KEY-----
 #-----END PUBLIC KEY-----"
-
+ALIPAY_TRADE_INFO="{}元充值码"
 
 #--->其他*
 # 时区
-#TZ = Asia/Shanghai
+#TZ=Asia/Shanghai
 # msyql host
-#MYSQL_HOST = mysql
+#MYSQL_HOST=mysql
 # redis host
-#REDIS_HOST = redis
+#REDIS_HOST=redis
 # production不开启debug，development开启debug
-#DJANGO_ENV = production
+#DJANGO_ENV=production

.github/ISSUE_TEMPLATE/bug----.md → .github/ISSUE_TEMPLATE/bug.md

@@ -1,21 +1,15 @@
 ---
-name: Bug或者疑问
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
+name: "\U0001F41B 提交BUG"
+labels: "bug"
+about: Something isn't working as expected
 ---
 
 **问题的描述**
 
 **项目的配置文件**
 
-
 **如何复现**
 
-
 **相关截图/log**
 
-
 **其他信息**

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,17 @@
+---
+name: "\U0001F680 Feature Request"
+labels: "feature-request"
+about: I have a suggestion
+
+---
+
+## Feature Request
+
+**Is your feature request related to a problem? Please describe:**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the feature you'd like:**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered:**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->

.github/dependabot.yml

@@ -0,0 +1,55 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: black
+    versions:
+    - 21.4b0
+    - 21.4b1
+  - dependency-name: django-simpleui
+    versions:
+    - "2021.2"
+    - "2021.4"
+    - 2021.4.1
+    - 2021.4.3
+  - dependency-name: isort
+    versions:
+    - 5.7.0
+    - 5.8.0
+  - dependency-name: django-countries
+    versions:
+    - "7.0"
+    - "7.1"
+  - dependency-name: sentry-sdk
+    versions:
+    - 0.19.5
+    - 0.20.0
+    - 0.20.1
+    - 0.20.2
+    - 0.20.3
+    - 1.0.0
+  - dependency-name: markdown
+    versions:
+    - 3.3.4
+  - dependency-name: django-anymail
+    versions:
+    - "8.2"
+  - dependency-name: django
+    versions:
+    - 3.1.6
+    - 3.1.7
+  - dependency-name: python-alipay-sdk
+    versions:
+    - 2.3.0
+    - 3.0.0
+    - 3.0.1
+  - dependency-name: mysqlclient
+    versions:
+    - 2.0.3
+  - dependency-name: celery
+    versions:
+    - 5.0.5

.github/workflows/cd.yml

@@ -0,0 +1,37 @@
+name: build-code-image
+on:
+  push:
+    branches:
+      - master
+      - dev
+      - debug-*
+    paths:
+      - "apps/**"
+      - "configs/**"
+      - "templates/**"
+  workflow_dispatch:
+jobs:
+  build-code:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: set up qemu
+        uses: docker/setup-qemu-action@v2
+
+      - name: set up docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: login to docker hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: build code image
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: "ehco1996/django-sspanel:latest,ehco1996/django-sspanel:code,ehco1996/django-sspanel:${{ github.sha }}"
+          platforms: linux/amd64,linux/arm64
+          file: deploy/Dockerfile.CODE

.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+name: check-code
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      #----------------------------------------------
+      #       check-out repo and set-up python
+      #----------------------------------------------
+      - name: Check out repository
+        uses: actions/checkout@v2
+      - name: Set up python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.11.5
+      #----------------------------------------------
+      #  -----  install & configure poetry  -----
+      #----------------------------------------------
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          installer-parallel: true
+      #----------------------------------------------
+      #       load cached venv if cache exists
+      #----------------------------------------------
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v2
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+      #----------------------------------------------
+      # install dependencies if cache does not exist
+      #----------------------------------------------
+      - name: Install dependencies
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        run: poetry install --no-interaction --no-root
+      #----------------------------------------------
+      #              run lint suite
+      #----------------------------------------------
+      - name: Run Lint
+        run: |
+          source .venv/bin/activate
+          make setup
+          make check

.github/workflows/issue.yaml

@@ -0,0 +1,12 @@
+name: "Close stale issues and PRs"
+on:
+  # schedule:
+  # - cron: "30 1 * * *"
+  workflow_dispatch:
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v5
+        with:
+          exempt-all-pr-assignees: true