Skip to content

Commit 857ea47

Browse files
committed
框架优化
框架优化
1 parent ac3cf16 commit 857ea47

Some content is hidden

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

62 files changed

+1447
-14593
lines changed

LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

NOTICE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2021 李强
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

backend/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,6 @@ ENV/
9191
__pycache__
9292
!migrations/__init__.py
9393
*.pyc
94+
conf/
95+
!conf/env.example.py
9496
db.sqlite3

backend/application/settings.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@
6666
TEMPLATES = [
6767
{
6868
'BACKEND': 'django.template.backends.django.DjangoTemplates',
69-
'DIRS': [os.path.join(BASE_DIR, 'templates')]
70-
,
69+
'DIRS': [os.path.join(BASE_DIR, 'templates')],
7170
'APP_DIRS': True,
7271
'OPTIONS': {
7372
'context_processors': [
@@ -254,13 +253,16 @@
254253
'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
255254
# 设置前缀
256255
'AUTH_HEADER_TYPES': ('JWT',),
256+
'ROTATE_REFRESH_TOKENS': True
257257
}
258258

259259
# ================================================= #
260260
# ******************** 其他配置 ******************** #
261261
# ================================================= #
262262
API_LOG_ENABLE = True
263263
# API_LOG_METHODS = 'ALL' # ['POST', 'DELETE']
264-
API_LOG_METHODS = ['POST', 'UPDATE', 'DELETE'] # ['POST', 'DELETE']
264+
API_LOG_METHODS = ['POST', 'UPDATE', 'DELETE', 'PUT'] # ['POST', 'DELETE']
265265
DJANGO_CELERY_BEAT_TZ_AWARE = False
266266
CELERY_TIMEZONE = 'Asia/Shanghai' # celery 时区问题
267+
# 导入租户数据
268+
from plugins import *

backend/application/urls.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
urlpatterns = [
4141
re_path(r'^swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=0), name='schema-json'),
4242
path('', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
43-
re_path(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
44-
path('api/token/', LoginView.as_view(), name='token_obtain_pair'),
45-
path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
43+
path(r'redoc/', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
4644
path('api/system/', include('dvadmin.system.urls')),
45+
path('token/', LoginView.as_view(), name='token_obtain_pair'),
46+
path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
4747
re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
4848
]

backend/conf/env_development.py renamed to backend/conf/env.example.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# 开发环境
2-
31
# ================================================= #
42
# ************** mysql数据库 配置 ************** #
53
# ================================================= #

backend/conf/env.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

backend/conf/env_production.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

backend/conf/env_test.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

backend/dvadmin/system/models.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class Meta:
2424
db_table = table_prefix + "users"
2525
verbose_name = '用户表'
2626
verbose_name_plural = verbose_name
27+
ordering = ('create_datetime',)
2728

2829

2930
class Post(CoreModel):
@@ -40,7 +41,7 @@ class Meta:
4041
db_table = table_prefix + "post"
4142
verbose_name = '岗位表'
4243
verbose_name_plural = verbose_name
43-
ordering = ('-sort',)
44+
ordering = ('sort',)
4445

4546

4647
class Role(CoreModel):
@@ -75,7 +76,7 @@ class Meta:
7576
db_table = table_prefix + 'role'
7677
verbose_name = '角色表'
7778
verbose_name_plural = verbose_name
78-
ordering = ('-sort',)
79+
ordering = ('sort',)
7980

8081

8182
class Dept(CoreModel):
@@ -97,7 +98,7 @@ class Meta:
9798
db_table = table_prefix + "dept"
9899
verbose_name = '部门表'
99100
verbose_name_plural = verbose_name
100-
ordering = ('-sort',)
101+
ordering = ('sort',)
101102

102103

103104
class Button(CoreModel):
@@ -108,6 +109,7 @@ class Meta:
108109
db_table = table_prefix + "button"
109110
verbose_name = '权限表'
110111
verbose_name_plural = verbose_name
112+
ordering = ('-name',)
111113

112114

113115
class Menu(CoreModel):
@@ -132,7 +134,7 @@ class Meta:
132134
db_table = table_prefix + "menu"
133135
verbose_name = '菜单表'
134136
verbose_name_plural = verbose_name
135-
ordering = ('-sort',)
137+
ordering = ('sort',)
136138

137139

138140
class MenuButton(CoreModel):
@@ -153,6 +155,7 @@ class Meta:
153155
db_table = table_prefix + "menu_button"
154156
verbose_name = '菜单权限表'
155157
verbose_name_plural = verbose_name
158+
ordering = ('-name',)
156159

157160

158161
class Dictionary(CoreModel):
@@ -172,7 +175,7 @@ class Meta:
172175
db_table = table_prefix + 'dictionary'
173176
verbose_name = "字典表"
174177
verbose_name_plural = verbose_name
175-
ordering = ('-sort',)
178+
ordering = ('sort',)
176179

177180

178181
class SysDictionarylist(CoreModel):
@@ -192,6 +195,7 @@ class Meta:
192195
db_table = table_prefix + 'dictionary_detail'
193196
verbose_name = "字典详细表"
194197
verbose_name_plural = verbose_name
198+
ordering = ('code',)
195199

196200

197201
class OperationLog(CoreModel):
@@ -211,6 +215,7 @@ class Meta:
211215
db_table = table_prefix + 'operation_log'
212216
verbose_name = '操作日志'
213217
verbose_name_plural = verbose_name
218+
ordering = ('-create_datetime',)
214219

215220

216221
class LoginLog(CoreModel):
@@ -226,3 +231,4 @@ class Meta:
226231
db_table = table_prefix + 'login_log'
227232
verbose_name = '登录日志'
228233
verbose_name_plural = verbose_name
234+
ordering = ('-create_datetime',)

0 commit comments

Comments
 (0)