admin/django-vue3-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
猿小天
2024-01-03 23:23:24 +08:00
parent 5510a18280 97737c3ef1
commit bbf3018b20
5 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/application/settings.py
View File

@@ -404,7 +404,7 @@ PLUGINS_URL_PATTERNS = []
# ********** 一键导入插件配置开始 ********** # ********** 一键导入插件配置开始 **********
# 例如: # 例如:
# from dvadmin_upgrade_center.settings import * # 升级中心 # from dvadmin_upgrade_center.settings import * # 升级中心
# from dvadmin_celery.settings import * # celery 异步任务 from dvadmin_celery.settings import * # celery 异步任务
# from dvadmin_third.settings import * # 第三方用户管理 # from dvadmin_third.settings import * # 第三方用户管理
# from dvadmin_ak_sk.settings import * # 秘钥管理管理 # from dvadmin_ak_sk.settings import * # 秘钥管理管理
# from dvadmin_tenants.settings import * # 租户管理 # from dvadmin_tenants.settings import * # 租户管理

18
backend/conf/env.example.py
View File

@@ -7,30 +7,30 @@ from application.settings import BASE_DIR
# ================================================= # # ================================================= #
# 数据库 ENGINE ，默认演示使用 sqlite3 数据库，正式环境建议使用 mysql 数据库 # 数据库 ENGINE ，默认演示使用 sqlite3 数据库，正式环境建议使用 mysql 数据库
# sqlite3 设置 # sqlite3 设置
DATABASE_ENGINE = "django.db.backends.sqlite3" # DATABASE_ENGINE = "django.db.backends.sqlite3"
DATABASE_NAME = os.path.join(BASE_DIR, "db.sqlite3") # DATABASE_NAME = os.path.join(BASE_DIR, "db.sqlite3")
# 使用mysql时，改为此配置 # 使用mysql时，改为此配置
# DATABASE_ENGINE = "django.db.backends.mysql" DATABASE_ENGINE = "django.db.backends.mysql"
# DATABASE_NAME = 'django-vue-admin' # mysql 时使用 DATABASE_NAME = 'django-vue3-admin' # mysql 时使用
# 数据库地址 改为自己数据库地址 # 数据库地址 改为自己数据库地址
DATABASE_HOST = "127.0.0.1" DATABASE_HOST = '127.0.0.1'
# # 数据库端口 # # 数据库端口
DATABASE_PORT = 3306 DATABASE_PORT = 3306
# # 数据库用户名 # # 数据库用户名
DATABASE_USER = "root" DATABASE_USER = "root"
# # 数据库密码 # # 数据库密码
DATABASE_PASSWORD = "123456" DATABASE_PASSWORD = "DVADMIN3"
# 表前缀 # 表前缀
TABLE_PREFIX = "dvadmin_" TABLE_PREFIX = "dvadmin_"
# ================================================= # # ================================================= #
# ******** redis配置，无redis 可不进行配置 ******** # # ******** redis配置，无redis 可不进行配置 ******** #
# ================================================= # # ================================================= #
# REDIS_PASSWORD = '' REDIS_PASSWORD = 'DVADMIN3'
# REDIS_HOST = '127.0.0.1' REDIS_HOST = '127.0.0.1'
# REDIS_URL = f'redis://:{REDIS_PASSWORD or ""}@{REDIS_HOST}:6380' REDIS_URL = f'redis://:{REDIS_PASSWORD or ""}@{REDIS_HOST}:6379'
# ================================================= # # ================================================= #
# ****************** 功能 启停 ******************* # # ****************** 功能 启停 ******************* #
# ================================================= # # ================================================= #

1
backend/requirements.txt
View File

@@ -28,3 +28,4 @@ uvicorn==0.23.2
gunicorn==21.2.0 gunicorn==21.2.0
gevent==23.9.1 gevent==23.9.1
Pillow==10.1.0 Pillow==10.1.0
dvadmin-celery==1.0.5

130
docker-compose.yml
View File

@@ -13,6 +13,7 @@ services:
- ./docker_env/nginx/my.conf:/etc/nginx/conf.d/my.conf - ./docker_env/nginx/my.conf:/etc/nginx/conf.d/my.conf
expose: expose:
- "8080" - "8080"
restart: always
networks: networks:
network: network:
ipv4_address: 177.10.0.11 ipv4_address: 177.10.0.11
@@ -23,9 +24,8 @@ services:
dockerfile: ./docker_env/django/Dockerfile dockerfile: ./docker_env/django/Dockerfile
container_name: dvadmin3-django container_name: dvadmin3-django
working_dir: /backend working_dir: /backend
# 打开mysql 时，打开此选项 depends_on:
# depends_on: - dvadmin3-mysql
# - dvadmin3-mysql
environment: environment:
PYTHONUNBUFFERED: 1 PYTHONUNBUFFERED: 1
DATABASE_HOST: dvadmin3-mysql DATABASE_HOST: dvadmin3-mysql
@@ -42,74 +42,70 @@ services:
network: network:
ipv4_address: 177.10.0.12 ipv4_address: 177.10.0.12
# dvadmin3-mysql: dvadmin3-mysql:
# image: mysql:5.7 image: mysql:8.0
# container_name: dvadmin3-mysql container_name: dvadmin3-mysql
# #使用该参数，container内的root拥有真正的root权限，否则，container内的root只是外部的一个普通用户权限 privileged: true
# #设置为true，不然数据卷可能挂载不了，启动不起 restart: always
## privileged: true ports:
# restart: always - "3306:3306"
# ports: environment:
# - "3306:3306" MYSQL_ROOT_PASSWORD: "DVADMIN3"
# environment: MYSQL_DATABASE: "django-vue3-admin"
# MYSQL_ROOT_PASSWORD: "123456" TZ: Asia/Shanghai
# MYSQL_DATABASE: "dvadmin3_pro" command:
# TZ: Asia/Shanghai --wait_timeout=31536000
# command: --interactive_timeout=31536000
# --wait_timeout=31536000 --max_connections=1000
# --interactive_timeout=31536000 --default-authentication-plugin=mysql_native_password
# --max_connections=1000 volumes:
# --default-authentication-plugin=mysql_native_password - "./docker_env/mysql/data:/var/lib/mysql"
# volumes: - "./docker_env/mysql/conf.d:/etc/mysql/conf.d"
# - "./docker_env/mysql/data:/var/lib/mysql" - "./docker_env/mysql/logs:/logs"
# - "./docker_env/mysql/conf.d:/etc/mysql/conf.d" networks:
# - "./docker_env/mysql/logs:/logs" network:
# networks: ipv4_address: 177.10.0.13
# network:
# ipv4_address: 177.10.0.13
# 如果使用celery 插件，请自行打开此注释 dvadmin3-celery:
# dvadmin3-celery: build:
# build: context: .
# context: . dockerfile: ./docker_env/celery/Dockerfile
# dockerfile: ./docker_env/celery/Dockerfile container_name: dvadmin3-celery
# # image: django:2.2 working_dir: /backend
# container_name: dvadmin3-celery depends_on:
# working_dir: /backend - dvadmin3-mysql
# depends_on: environment:
# - dvadmin3-mysql PYTHONUNBUFFERED: 1
# environment: DATABASE_HOST: dvadmin3-mysql
# PYTHONUNBUFFERED: 1 TZ: Asia/Shanghai
# DATABASE_HOST: dvadmin3-mysql volumes:
# TZ: Asia/Shanghai - ./backend:/backend
# volumes: - ./logs/log:/var/log
# - ./backend:/backend restart: always
# - ./logs/log:/var/log networks:
# restart: always network:
# networks: ipv4_address: 177.10.0.14
# network:
# ipv4_address: 177.10.0.14
# dvadmin3-redis: dvadmin3-redis:
# image: redis:6.2.6-alpine # 指定服务镜像，最好是与之前下载的redis配置文件保持一致 image: redis:6.2.6-alpine # 指定服务镜像，最好是与之前下载的redis配置文件保持一致
# container_name: dvadmin3-redis # 容器名称 container_name: dvadmin3-redis # 容器名称
# restart: on-failure # 重启方式 restart: always
# environment: environment:
# - TZ=Asia/Shanghai # 设置时区 - TZ=Asia/Shanghai # 设置时区
# volumes: # 配置数据卷 volumes: # 配置数据卷
# - ./docker_env/redis/data:/data - ./docker_env/redis/data:/data
# - ./docker_env/redis/redis.conf:/etc/redis/redis.conf - ./docker_env/redis/redis.conf:/etc/redis/redis.conf
# ports: # 映射端口 ports: # 映射端口
# - "6379:6379" - "6379:6379"
# sysctls: # 设置容器中的内核参数 sysctls: # 设置容器中的内核参数
# - net.core.somaxconn=1024 - net.core.somaxconn=1024
# command: /bin/sh -c "echo 'vm.overcommit_memory = 1' >> /etc/sysctl.conf && redis-server /etc/redis/redis.conf --appendonly yes" # 指定配置文件并开启持久化 command: /bin/sh -c "echo 'vm.overcommit_memory = 1' >> /etc/sysctl.conf && redis-server /etc/redis/redis.conf --appendonly yes --requirepass DVADMIN3" # 指定配置文件并开启持久化
# privileged: true # 使用该参数，container内的root拥有真正的root权限。否则，container内的root只是外部的一个普通用户权限 privileged: true # 使用该参数，container内的root拥有真正的root权限。否则，container内的root只是外部的一个普通用户权限
# networks: networks:
# network: network:
# ipv4_address: 177.10.0.15 ipv4_address: 177.10.0.15
networks: networks:

3
docker_env/django/Dockerfile
View File

@@ -1,6 +1,9 @@
FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-backend:latest FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-backend:latest
WORKDIR /backend WORKDIR /backend
COPY ./backend/ . COPY ./backend/ .
RUN ls ./conf/
RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }' RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }'
RUN sed -i "s|DATABASE_HOST = "127.0.0.1"|DATABASE_HOST = '177.10.0.1'|g" ./conf/env.py
RUN sed -i "s|REDIS_HOST = '127.0.0.1'|REDIS_HOST = '177.10.0.1'|g" ./conf/env.py
RUN python3 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple/ -r requirements.txt RUN python3 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple/ -r requirements.txt
CMD ["/backend/docker_start.sh"] CMD ["/backend/docker_start.sh"]