Skip to content

接口重构及规范 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 29 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f9b86f5
optimize: extract all routes to blue map for clear readability and co…
VincentAdamNemessisX Nov 7, 2024
3eb82b4
optimize: add build image when docker not fetched image, add china …
VincentAdamNemessisX Nov 8, 2024
4ae2b40
fix: add pre-commit, add rules into pyproject.toml
VincentAdamNemessisX Nov 8, 2024
7bc1e16
clean: add pre-commit for better cleaned style, restore favorites app…
VincentAdamNemessisX Nov 19, 2024
02084eb
optimize: remove django_router, optimize routes' path name
VincentAdamNemessisX Nov 19, 2024
931035d
optimize:
VincentAdamNemessisX Nov 20, 2024
cc447c6
optimize:
VincentAdamNemessisX Nov 20, 2024
f34b912
optimize:
VincentAdamNemessisX Nov 21, 2024
57b0806
optimize:
VincentAdamNemessisX Nov 21, 2024
ebe5271
optimize:
VincentAdamNemessisX Nov 21, 2024
4d56978
optimize:
VincentAdamNemessisX Nov 22, 2024
4bef59b
Update django.yml
VincentAdamNemessisX Nov 22, 2024
0e47860
Update django.yml
VincentAdamNemessisX Nov 22, 2024
c5a4f70
optimize:
VincentAdamNemessisX Dec 13, 2024
ad2b20f
Merge branch 'master' into feat/va/clean-better
VincentAdamNemessisX Jan 11, 2025
f22ec3e
fix:
VincentAdamNemessisX Jan 11, 2025
df76397
fix: update env example
VincentAdamNemessisX Jan 11, 2025
bc4efb0
fix: update pyproject
VincentAdamNemessisX Jan 11, 2025
893877d
fix: update env example and workflow action file to get correct env v…
VincentAdamNemessisX Jan 11, 2025
fbe68a9
fix: add more_itertools to poetry package management
VincentAdamNemessisX Jan 11, 2025
48a94c2
fix: remove unnecessary in pyproject.toml
VincentAdamNemessisX Mar 7, 2025
df61bb3
fix: remove tool source from pyproject.toml
VincentAdamNemessisX Mar 7, 2025
45e60d0
fix: remove lock from project
VincentAdamNemessisX Mar 7, 2025
0756eeb
fix: temp remove dependencies
VincentAdamNemessisX Mar 7, 2025
67d9e1b
fix: add python version
VincentAdamNemessisX Mar 7, 2025
725c386
fix: add python version
VincentAdamNemessisX Mar 7, 2025
644a716
fix: add tests file
VincentAdamNemessisX Mar 7, 2025
add445a
fix: add tests file
VincentAdamNemessisX Mar 7, 2025
e4555bc
fix: update docker relevant files, add jenkins file, add poetry.lock
VincentAdamNemessisX Mar 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.env
*.env.*

logs
*.log
*.log*

.idea
Expand All @@ -11,5 +10,17 @@ logs

**/.*
docker/volumes/*
volumes/*
tests/*

# test files
testunit/**


# local files only for production
static/**
media/**

# local dirs/files for only development
**/*-local.*
**/*-local
**/*_local.*
**/*_local
18 changes: 10 additions & 8 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
.env.example# Description: Environment variables for the application center service.
# Description: Environment variables for the application center service.
# Django debug mode
DEBUG=True
# Django secret key
SECRET_KEY='django-insecure-^jm+at6%5or6_@a-nkx0a_u%sxqp=oo%4szjeqpz_h!6+#)+(h'
SECRET_KEY=django-insecure-^jm+at6%5or6_@a-nkx0a_u%sxqp=oo%4szjeqpz_h!6+#)+(h
# LOG DIR
LOG_DIR=logs/ApplicationDistributionCenter.log

# mysql database configuration
MYSQL_HOST=localhost
MYSQL_PORT=3306
MYSQL_DATABASE=application_center
MYSQL_USER=application_center
MYSQL_PASSWORD=application_center
# postgres database configuration
POSTGRES_HOST=localhost
POSTGRES_PORT=5437
POSTGRES_DATABASE=application_center
POSTGRES_USER=application_center
POSTGRES_PASSWORD=application_center

# redis configuration
REDIS_HOST=localhost
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ "master" ]
pull_request:
branches: [ "feat/va/optimize" ]
branches: [ "master" ]

jobs:
build:
Expand Down Expand Up @@ -35,13 +35,15 @@ jobs:
DEBUG: ${{ secrets.DEBUG }}
# Django secret key
SECRET_KEY: ${{ secrets.SECRET_KEY }}
# logs directory
LOG_DIR: ${{ secrets.LOG_DIR }}

# mysql database configuration
MYSQL_HOST: ${{ secrets.MYSQL_HOST }}
MYSQL_PORT: ${{ secrets.MYSQL_PORT }}
MYSQL_DATABASE: ${{ secrets.MYSQL_DATABASE }}
MYSQL_USER: ${{ secrets.MYSQL_USER }}
MYSQL_PASSWORD: ${{ secrets.MYSQL_PASSWORD }}
# postgres database configuration
POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }}
POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
POSTGRES_DATABASE: ${{ secrets.POSTGRES_DATABASE }}
POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}

# redis configuration
REDIS_HOST: ${{ secrets.REDIS_HOST }}
Expand Down
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,15 @@ static/import_export/
static/login/
static/user_center/

# local files only for development
**/*-local*

# local files only for production
static/**
media/**

# local dirs/files for only development
**/*-local.*
**/*-local
**/*_local.*
**/*_local
12 changes: 12 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.3
hooks:
- id: ruff
args: [--fix, --show-fixes] # auto fix
- id: ruff-format

- repo: https://github.com/pylint-dev/pylint
rev: v3.2.7
hooks:
- id: pylint
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="docker/docker-compose.yaml: Compose Deployment-on-local" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="sourceFilePath" value="docker/docker-compose.yaml" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="docker/docker-compose.yaml: Compose Deployment-on-server" type="docker-deploy" factoryName="docker-compose.yml" server-name="ServerDocker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="sourceFilePath" value="docker/docker-compose.yaml" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>
2 changes: 0 additions & 2 deletions ApplicationDistributionCenter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
import pymysql

pymysql.install_as_MySQLdb()
2 changes: 1 addition & 1 deletion ApplicationDistributionCenter/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

from django.core.asgi import get_asgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ApplicationDistributionCenter.settings')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ApplicationDistributionCenter.settings")

application = get_asgi_application()
Loading