Skip to content

Commit bc15ed1

Browse files
TylerlogCoding
authored andcommitted
Accept Merge Request #2: (develop -> master)
Merge Request: 正式发布v3.0.0版本 Created By: @dvadmin-开发-李强 Accepted By: @dvadmin-开发-李强 URL: https://dvadmin-private.coding.net/p/code/d/dvadmin3/git/merge/2
2 parents dd98b98 + 349986f commit bc15ed1

File tree

76 files changed

+3174
-2729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3174
-2729
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Django-Vue3-Admin 更新日志
2+
3+
## 正式发布v3.0.0版本
4+
### 1.新增:列权限管理与授权;
5+
### 2.新增:代码新版本发布后,进行升级提醒;
6+
### 3.优化:角色管理中按钮权限的操作;
7+
### 4.优化:websocket 连接状态显示;
8+
### 5.优化:初始化获取系统配置与字典配置,进行动态渲染登录页面;
9+
### 6.修复:登录页面中系统配置不生效问题;
10+
### 7.其他优化

README.en.md

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Django-Vue3-Admin
22

3-
[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/liqianglog/django-vue-admin/blob/master/LICENSE) [![img](https://img.shields.io/badge/python-%3E=3.7.x-green.svg)](https://python.org/) [![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-3.2-blue)](https://docs.djangoproject.com/zh-hans/3.2/) [![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen)](https://nodejs.org/zh-cn/) [![img](https://gitee.com/liqianglog/django-vue-admin/badge/star.svg?theme=dark)](https://gitee.com/liqianglog/django-vue-admin)
3+
[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/huge-dream/django-vue3-admin/blob/master/LICENSE) [![img](https://img.shields.io/badge/python-%3E=3.7.x-green.svg)](https://python.org/) [![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-3.2-blue)](https://docs.djangoproject.com/zh-hans/3.2/) [![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen)](https://nodejs.org/zh-cn/) [![img](https://gitee.com/huge-dream/django-vue3-admin/badge/star.svg?theme=dark)](https://gitee.com/huge-dream/django-vue3-admin)
44

55
[preview](https://demo.dvadmin.com) | [Official website document](https://www.django-vue-admin.com) | [qq group](https://qm.qq.com/cgi-bin/qm/qr?k=fOdnHhC8DJlRHGYSnyhoB8P5rgogA6Vs&jump_from=webapi) | [community](https://bbs.django-vue-admin.com) | [plugins market](https://bbs.django-vue-admin.com/plugMarket.html) | [Github](https://github.com/liqianglog/django-vue-admin)
66

77
💡 **「About」**
88

9-
We are a group of young people who love Code. In this hot era, we hope to calm down and bring some of our colors and colors through code.
9+
It is a completely open-source rapid development platform, provided free for personal use and authorized for group use.
10+
Django-Vue3-Admin is a comprehensive basic development platform based on the RBAC (Role-Based Access Control) model for permission control, with column-level granularity. It follows a frontend-backend separation architecture, with Django and Django Rest Framework used for the backend, and Vue3, Composition API, TypeScript, Vite, and Element Plus used for the frontend.
1011

11-
Because of love, so embrace the future
1212

1313
## framework introduction
1414

@@ -18,12 +18,13 @@ Because of love, so embrace the future
1818
* 👭The backend uses the Python language Django framework as well as the powerful[Django REST Framework](https://pypi.org/project/djangorestframework)
1919
* 👫Permission authentication use[Django REST Framework SimpleJWT](https://pypi.org/project/djangorestframework-simplejwt),Supports the multi-terminal authentication system.
2020
* 👬Support loading dynamic permission menu, multi - way easy permission control.
21-
* 💏 Special thanks: [vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/).
22-
* 💡 💏 Special thanks:[jetbrains](https://www.jetbrains.com/) To provide a free IntelliJ IDEA license for this open source project.
21+
* 👬Enhanced Column Permission Control, with granularity down to each column.
22+
* 💏Special thanks: [vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/).
23+
* 💡Special thanks:[jetbrains](https://www.jetbrains.com/) To provide a free IntelliJ IDEA license for this open source project.
2324

2425
## Online experience
2526

26-
👩‍👧‍👦👩‍👧‍👦 demo address:[http://demo.django-vue-admin.com](http://demo.django-vue-admin.com)
27+
👩‍👧‍👦👩‍👧‍👦 demo address:[https://demo.dvadmin.com](https://demo.dvadmin.com)
2728

2829
* demo account:superadmin
2930

@@ -39,57 +40,61 @@ Because of love, so embrace the future
3940

4041
## source code url:
4142

42-
gitee(Main push):[https://gitee.com/liqianglog/django-vue-admin](https://gitee.com/liqianglog/django-vue-admin)👩‍👦‍👦
43+
gitee(Main push):[https://gitee.com/huge-dream/django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin)👩‍👦‍👦
4344

44-
github:[https://github.com/liqianglog/django-vue-admin](https://github.com/liqianglog/django-vue-admin)👩‍👦‍👦
45+
github:[https://github.com/huge-dream/django-vue3-admin](https://github.com/huge-dream/django-vue3-admin)👩‍👦‍👦
4546

4647
## core function
4748

48-
1. 👨‍⚕️ Menu management: Configure the system menu, operation permissions, button permissions, back-end interface permissions, etc.
49-
2. 🧑‍⚕️ Department management: Configure the system organization (company, department, role).
50-
3. 👩‍⚕️ Role management: role menu permission allocation, data permission allocation, set roles according to the department for data range permission division.
51-
4. 🧑‍🎓 Rights Specifies the rights of the authorization role.
52-
5. 👨‍🎓 User management: The user is the system operator, this function mainly completes the system user configuration.
53-
6. 👬 Interface whitelist: specifies the interface that does not need permission verification.
54-
7. 🧑‍🔧 Dictionary management: Maintenance of some fixed data frequently used in the system.
55-
8. 🧑‍🔧 Regional management: to manage provinces, cities, counties and regions.
56-
9. 📁 Attachment management: Unified management of all files and pictures on the platform.
57-
10. 🗓 ️operation logs: log and query the system normal operation; Log and query system exception information.
58-
11.🔌 [plugins market] (<https://bbs.django-vue-admin.com/plugMarket.html>) : based on the Django framework - Vue - Admin application and plug-in development.
49+
1. 👨‍⚕️Menu Management: Configure system menus, operation permissions, button permission flags, backend interface permissions, etc.
50+
2. 🧑‍⚕️Department Management: Configure system organizational structure (company, department, role).
51+
3. 👩‍⚕️Role Management: Role menu permission assignment, data permission assignment, set role-based data scope permissions by department.
52+
4. 🧑‍🎓Button Permission Control: Authorize role-specific button permissions and interface permissions, enabling authorization of data scope for each interface.
53+
5. 🧑‍🎓Field Column Permission Control: Authorize page field display permissions, specifically for the display permissions of a certain column.
54+
6. 👨‍🎓User Management: Users are system operators, and this function is mainly used for system user configuration.
55+
7. 👬API Whitelist: Configure interfaces that do not require permission verification.
56+
8. 🧑‍🔧Dictionary Management: Maintain frequently used and relatively fixed data in the system.
57+
9. 🧑‍🔧Region Management: Manage provinces, cities, counties, and districts.
58+
10. 📁File Management: Unified management of all files, images, etc., on the platform.
59+
11. 🗓️Operation Logs: Record and query logs for normal system operations and exceptional system information.
60+
12. 🔌[Plugin Market](https://bbs.django-vue-admin.com/plugMarket.html): Applications and plugins developed based on the Django-Vue-Admin framework.
5961

6062
## plugins market 🔌
6163

62-
* Celery Asynchronous task:[dvadmin-celery](https://gitee.com/huge-dream/dvadmin-celery)
63-
* Upgrade center backend:[dvadmin-upgrade-center](https://gitee.com/huge-dream/dvadmin-upgrade-center)
64-
* Upgrade center front:[dvadmin-upgrade-center-web](https://gitee.com/huge-dream/dvadmin-upgrade-center-web)
64+
Updating...
65+
66+
## Repository Branch Explanation 💈
67+
Main Branch: master (stable version)
68+
Development Branch: develop
6569

6670
## before start project you need:
6771

6872
~~~
69-
Python >= 3.8.0
70-
nodejs >= 14.0
71-
Mysql >= 5.7.0 (Optional. The default database is sqlite3. 8.0 is recommended)
72-
Redis(Optional, the latest edition)
73+
Python >= 3.11.0 (Minimum version 3.9+)
74+
Node.js >= 16.0
75+
Mysql >= 8.0 (Optional, default database: SQLite3, supports 5.7+, recommended version: 8.0)
76+
Redis (Optional, latest version)
7377
~~~
7478

7579
## frontend♝
7680

7781
```bash
7882
# clone code
79-
git clone https://gitee.com/liqianglog/django-vue-admin.git
83+
git clone https://gitee.com/huge-dream/django-vue3-admin.git
8084

8185
# enter code dir
8286
cd web
8387

8488
# install dependence
85-
npm install --registry=https://registry.npm.taobao.org
89+
npm install yarn
90+
yarn install --registry=https://registry.npm.taobao.org
8691

8792
# Start service
88-
npm run dev
93+
yarn run dev
8994
# Visit http://localhost:8080 in your browser
9095
# Parameters such as boot port can be configured in the #.env.development file
9196
# Build the production environment
92-
# npm run build
97+
# yarn run build
9398
```
9499

95100
## backend💈
@@ -111,21 +116,21 @@ npm run dev
111116
python3 manage.py init_area
112117
8. start backend
113118
python3 manage.py runserver 0.0.0.0:8000
114-
or daphne :
115-
daphne -b 0.0.0.0 -p 8000 application.asgi:application
119+
or uvicorn :
120+
uvicorn application.asgi:application --port 8000 --host 0.0.0.0 --workers 8
116121
~~~
117122

118123
### visit backend swagger
119124

120125
* visit url:[http://localhost:8080](http://localhost:8080) (The default address is this one. If you want to change it, follow the configuration file)
121126
* account:`superadmin` password:`admin123456`
122127

123-
### docker-compose
128+
### docker-compose
124129

125130
~~~shell
126131
docker-compose up -d
127132
# Initialize backend data (first execution only)
128-
docker exec -ti dvadmin-django bash
133+
docker exec -ti dvadmin3-django bash
129134
python manage.py makemigrations
130135
python manage.py migrate
131136
python manage.py init_area
@@ -147,22 +152,24 @@ docker-compose up -d --build
147152

148153
## Demo screenshot✅
149154

150-
![image-01](https://images.gitee.com/uploads/images/2022/0530/234137_b58c8f98_5074988.png)
155+
![image-01](https://foruda.gitee.com/images/1701348994587355489/1bc749e7_5074988.png)
156+
157+
![image-02](https://foruda.gitee.com/images/1701349037811908960/80d361db_5074988.png)
158+
159+
![image-03](https://foruda.gitee.com/images/1701349224478845203/954f0a7b_5074988.png)
151160

152-
![image-02](https://images.gitee.com/uploads/images/2022/0530/234240_39834603_5074988.png)
161+
![image-04](https://foruda.gitee.com/images/1701349248928658877/64926724_5074988.png)
153162

154-
![image-03](https://images.gitee.com/uploads/images/2022/0530/234339_35e728a0_5074988.png)
163+
![image-05](https://foruda.gitee.com/images/1701349259068943299/1306ba40_5074988.png)
155164

156-
![image-04](https://images.gitee.com/uploads/images/2022/0530/234426_957036b0_5074988.png)
165+
![image-06](https://foruda.gitee.com/images/1701349294894429495/e3b3a8cf_5074988.png)
157166

158-
![image-05](https://images.gitee.com/uploads/images/2022/0530/234458_898be492_5074988.png)
167+
![image-07](https://foruda.gitee.com/images/1701350432536247561/3b26685e_5074988.png)
159168

160-
![image-06](https://images.gitee.com/uploads/images/2022/0530/234521_35b40076_5074988.png)
169+
![image-08](https://foruda.gitee.com/images/1701350455264771992/b364c57f_5074988.png)
161170

162-
![image-07](https://images.gitee.com/uploads/images/2022/0530/234615_c2325639_5074988.png)
171+
![image-09](https://foruda.gitee.com/images/1701350479266000753/e4e4f7c5_5074988.png)
163172

164-
![image-08](https://images.gitee.com/uploads/images/2022/0530/234639_1ed6cc93_5074988.png)
173+
![image-10](https://foruda.gitee.com/images/1701350501421625746/f8dd215e_5074988.png)
165174

166-
![image-09](https://images.gitee.com/uploads/images/2022/0530/234815_cea2c53f_5074988.png)
167175

168-
![image-10](https://images.gitee.com/uploads/images/2022/0530/234840_5f3e5f53_5074988.png)

0 commit comments

Comments
 (0)