diff --git a/.idea/ITShowPlatform.iml b/.idea/ITShowPlatform.iml index 9b31378..c5d6a50 100644 --- a/.idea/ITShowPlatform.iml +++ b/.idea/ITShowPlatform.iml @@ -1,8 +1,25 @@ + + + + + + - - + + + + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 8ff733f..fa01f2b 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -5,7 +5,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 6649a8c..67c853b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0594c73..6bc96f5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -31,8 +31,10 @@ - + + + @@ -66,7 +68,7 @@ - + @@ -118,8 +120,7 @@ - - + 1650187914913 @@ -142,14 +143,7 @@ - - 1651329470523 - - @@ -183,8 +177,7 @@ - - diff --git a/comments/__init__.py b/Apps/__init__.py similarity index 100% rename from comments/__init__.py rename to Apps/__init__.py diff --git a/comments/migrations/__init__.py b/Apps/comments/__init__.py similarity index 100% rename from comments/migrations/__init__.py rename to Apps/comments/__init__.py diff --git a/comments/admin.py b/Apps/comments/admin.py similarity index 100% rename from comments/admin.py rename to Apps/comments/admin.py diff --git a/comments/apps.py b/Apps/comments/apps.py similarity index 82% rename from comments/apps.py rename to Apps/comments/apps.py index a90cc97..3f11edc 100644 --- a/comments/apps.py +++ b/Apps/comments/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class CommentsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'comments' + name = 'Apps.comments' diff --git a/comments/migrations/0001_initial.py b/Apps/comments/migrations/0001_initial.py similarity index 100% rename from comments/migrations/0001_initial.py rename to Apps/comments/migrations/0001_initial.py diff --git a/enroll/__init__.py b/Apps/comments/migrations/__init__.py similarity index 100% rename from enroll/__init__.py rename to Apps/comments/migrations/__init__.py diff --git a/comments/models.py b/Apps/comments/models.py similarity index 100% rename from comments/models.py rename to Apps/comments/models.py diff --git a/comments/serializers.py b/Apps/comments/serializers.py similarity index 100% rename from comments/serializers.py rename to Apps/comments/serializers.py diff --git a/comments/tests.py b/Apps/comments/tests.py similarity index 100% rename from comments/tests.py rename to Apps/comments/tests.py diff --git a/comments/urls.py b/Apps/comments/urls.py similarity index 78% rename from comments/urls.py rename to Apps/comments/urls.py index f183407..3dff894 100644 --- a/comments/urls.py +++ b/Apps/comments/urls.py @@ -1,4 +1,3 @@ -from django.contrib import admin from django.urls import path from . import views diff --git a/comments/views.py b/Apps/comments/views.py similarity index 100% rename from comments/views.py rename to Apps/comments/views.py diff --git a/enroll/migrations/__init__.py b/Apps/enroll/__init__.py similarity index 100% rename from enroll/migrations/__init__.py rename to Apps/enroll/__init__.py diff --git a/Apps/enroll/admin.py b/Apps/enroll/admin.py new file mode 100644 index 0000000..49b1b84 --- /dev/null +++ b/Apps/enroll/admin.py @@ -0,0 +1,55 @@ +from django.contrib import admin +from .models import * + + +# Register your models here. +class DepartmentAdmin(admin.ModelAdmin): + # 定制哪些字段需要展示 + list_display = ('id','name','picture') + + # sortable_by # 排序 + + list_editable = ('name','picture',) + + + list_per_page = 10 + + + list_max_show_all = 200 # default + + + search_fields = ['title'] + + # date_hierarchy = 'create_date' + + '''默认空值''' + empty_value_display = 'NA' + + '''过滤选项''' + list_filter = () + +class New_memberAdmin(admin.ModelAdmin): + # 定制哪些字段需要展示 + list_display = ('id', 'name', 'picture') + + # sortable_by # 排序 + + list_editable = ('name', 'picture',) + + list_per_page = 10 + + list_max_show_all = 200 # default + + search_fields = ['title'] + + # date_hierarchy = 'create_date' + + '''默认空值''' + empty_value_display = 'NA' + + '''过滤选项''' + list_filter = () + +admin.site.register(Department ,DepartmentAdmin) +admin.site.register(New_member) +admin.site.register(EmailVerifyRecord) diff --git a/enroll/apps.py b/Apps/enroll/apps.py similarity index 83% rename from enroll/apps.py rename to Apps/enroll/apps.py index 4cfaf47..743932b 100644 --- a/enroll/apps.py +++ b/Apps/enroll/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class EnrollConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'enroll' + name = 'Apps.enroll' diff --git a/enroll/email.py b/Apps/enroll/email.py similarity index 96% rename from enroll/email.py rename to Apps/enroll/email.py index 064229f..ed0af32 100644 --- a/enroll/email.py +++ b/Apps/enroll/email.py @@ -1,6 +1,6 @@ from random import Random # 用于生成随机码 from django.core.mail import send_mail # 发送邮件模块 -from enroll.models import EmailVerifyRecord # 邮箱验证model +from Apps.enroll.models import EmailVerifyRecord # 邮箱验证model from django.conf import settings # setting.py添加的的配置信息 import random diff --git a/enroll/migrations/0001_initial.py b/Apps/enroll/migrations/0001_initial.py similarity index 100% rename from enroll/migrations/0001_initial.py rename to Apps/enroll/migrations/0001_initial.py diff --git a/enroll/migrations/0002_alter_new_member_schedule_and_more.py b/Apps/enroll/migrations/0002_alter_new_member_schedule_and_more.py similarity index 100% rename from enroll/migrations/0002_alter_new_member_schedule_and_more.py rename to Apps/enroll/migrations/0002_alter_new_member_schedule_and_more.py diff --git a/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py b/Apps/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py similarity index 100% rename from enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py rename to Apps/enroll/migrations/0003_alter_new_member_email_alter_new_member_phone_number.py diff --git a/enroll/migrations/0004_alter_emailverifyrecord_send_time.py b/Apps/enroll/migrations/0004_alter_emailverifyrecord_send_time.py similarity index 100% rename from enroll/migrations/0004_alter_emailverifyrecord_send_time.py rename to Apps/enroll/migrations/0004_alter_emailverifyrecord_send_time.py diff --git a/enroll/migrations/0005_alter_emailverifyrecord_code.py b/Apps/enroll/migrations/0005_alter_emailverifyrecord_code.py similarity index 100% rename from enroll/migrations/0005_alter_emailverifyrecord_code.py rename to Apps/enroll/migrations/0005_alter_emailverifyrecord_code.py diff --git a/history/__init__.py b/Apps/enroll/migrations/__init__.py similarity index 100% rename from history/__init__.py rename to Apps/enroll/migrations/__init__.py diff --git a/enroll/models.py b/Apps/enroll/models.py similarity index 100% rename from enroll/models.py rename to Apps/enroll/models.py diff --git a/enroll/serializer.py b/Apps/enroll/serializers.py similarity index 95% rename from enroll/serializer.py rename to Apps/enroll/serializers.py index e4c07bb..eb5b648 100644 --- a/enroll/serializer.py +++ b/Apps/enroll/serializers.py @@ -1,7 +1,6 @@ from rest_framework import serializers -from rest_framework.response import Response from rest_framework.validators import UniqueValidator -from enroll.models import Department, New_member, EmailVerifyRecord +from Apps.enroll.models import Department, New_member, EmailVerifyRecord import time diff --git a/enroll/tests.py b/Apps/enroll/tests.py similarity index 100% rename from enroll/tests.py rename to Apps/enroll/tests.py diff --git a/enroll/urls.py b/Apps/enroll/urls.py similarity index 65% rename from enroll/urls.py rename to Apps/enroll/urls.py index bf6e2c7..86591da 100644 --- a/enroll/urls.py +++ b/Apps/enroll/urls.py @@ -1,5 +1,4 @@ -from django.contrib import admin -from django.urls import path, include +from django.urls import path from . import views # from rest_framework.routers import DefaultRouter @@ -10,7 +9,3 @@ urlpatterns = [ path("sign_up/verification_code/", views.Send_email.as_view()), # path("sign_up/", views.Sign_in.as_view({"get": "get"})) ] - -# router = DefaultRouter() -# router.register("sign_in", views.Sign_in, "sign_in") -# urlpatterns += router.urls diff --git a/enroll/views.py b/Apps/enroll/views.py similarity index 94% rename from enroll/views.py rename to Apps/enroll/views.py index 3b89260..78868cd 100644 --- a/enroll/views.py +++ b/Apps/enroll/views.py @@ -1,11 +1,11 @@ from rest_framework.response import Response from rest_framework.generics import GenericAPIView -from enroll.models import Department, EmailVerifyRecord, New_member -from enroll.serializer import Department_serializer, New_member_serializer, New_member_schedule_serializer, \ +from Apps.enroll.models import Department, EmailVerifyRecord, New_member +from Apps.enroll.serializers import Department_serializer, New_member_serializer, New_member_schedule_serializer, \ Send_email_serializer from rest_framework import status from rest_framework.views import APIView -from enroll.email import send_code_email +from Apps.enroll.email import send_code_email import re import time diff --git a/history/migrations/__init__.py b/Apps/history/__init__.py similarity index 100% rename from history/migrations/__init__.py rename to Apps/history/__init__.py diff --git a/history/admin.py b/Apps/history/admin.py similarity index 100% rename from history/admin.py rename to Apps/history/admin.py diff --git a/history/apps.py b/Apps/history/apps.py similarity index 82% rename from history/apps.py rename to Apps/history/apps.py index 53e978c..d095bb8 100644 --- a/history/apps.py +++ b/Apps/history/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class TodoListConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'history' + name = 'Apps.history' diff --git a/Apps/history/migrations/0001_initial.py b/Apps/history/migrations/0001_initial.py new file mode 100644 index 0000000..501c6bf --- /dev/null +++ b/Apps/history/migrations/0001_initial.py @@ -0,0 +1,58 @@ +# Generated by Django 4.0.4 on 2022-05-05 17:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Department', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('did', models.IntegerField(verbose_name='部门ID')), + ('department', models.CharField(max_length=10, verbose_name='部门')), + ('department_en', models.CharField(max_length=30, verbose_name='部门英文名称')), + ('content', models.CharField(max_length=800, verbose_name='内容')), + ('introduction', models.CharField(max_length=800, verbose_name='介绍')), + ], + options={ + 'verbose_name_plural': '部门详情', + 'db_table': 'it_Department', + }, + ), + migrations.CreateModel( + name='History', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('grade', models.IntegerField(verbose_name='年级')), + ('did', models.IntegerField(verbose_name='部门ID')), + ('department', models.CharField(max_length=10, verbose_name='部门')), + ], + options={ + 'verbose_name_plural': '历史表', + 'db_table': 'it_History', + }, + ), + migrations.CreateModel( + name='Members', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('avatar', models.ImageField(blank=True, upload_to='avatar', verbose_name='头像')), + ('did', models.IntegerField(default=0, verbose_name='所属部门ID')), + ('grade', models.IntegerField(verbose_name='年级')), + ('name', models.CharField(max_length=10, verbose_name='成员姓名')), + ('motto', models.CharField(max_length=30, verbose_name='座右铭')), + ('department', models.CharField(max_length=10, verbose_name='所属部门')), + ], + options={ + 'verbose_name_plural': '部门成员', + 'db_table': 'it_Members', + }, + ), + ] diff --git a/Apps/history/migrations/__init__.py b/Apps/history/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/history/models.py b/Apps/history/models.py similarity index 100% rename from history/models.py rename to Apps/history/models.py diff --git a/history/serializers.py b/Apps/history/serializers.py similarity index 99% rename from history/serializers.py rename to Apps/history/serializers.py index da6f1fd..aaee3f9 100644 --- a/history/serializers.py +++ b/Apps/history/serializers.py @@ -1,6 +1,6 @@ import re from rest_framework import serializers -from history.models import * +from Apps.history import * def validate_department(value): diff --git a/history/tests.py b/Apps/history/tests.py similarity index 100% rename from history/tests.py rename to Apps/history/tests.py diff --git a/history/urls.py b/Apps/history/urls.py similarity index 80% rename from history/urls.py rename to Apps/history/urls.py index d0da8d0..23189a8 100644 --- a/history/urls.py +++ b/Apps/history/urls.py @@ -1,7 +1,7 @@ from django.conf.urls.static import static from ITShowPlatform import settings from django.urls import path -from history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet +from Apps.history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet urlpatterns = [ path('department/', DepartmentViewSet.as_view()), diff --git a/history/views.py b/Apps/history/views.py similarity index 99% rename from history/views.py rename to Apps/history/views.py index 3849d09..426d400 100644 --- a/history/views.py +++ b/Apps/history/views.py @@ -1,5 +1,5 @@ from rest_framework.views import APIView -from history.serializers import * +from Apps.history import * from rest_framework.response import Response from django.db.models import Q from django.utils.decorators import method_decorator diff --git a/ITShowPlatform/settings.py b/ITShowPlatform/settings.py index eb7b1de..4cbb943 100644 --- a/ITShowPlatform/settings.py +++ b/ITShowPlatform/settings.py @@ -37,9 +37,9 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'rest_framework', - 'enroll', - 'history', - 'comments', + 'Apps.enroll', + 'Apps.history', + 'Apps.comments', ] @@ -80,9 +80,9 @@ WSGI_APPLICATION = 'ITShowPlatform.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': 'ITStudio', + 'NAME': 'ITShowPlatform', 'USER': 'root', - 'PASSWORD': 'Kjh030106', + 'PASSWORD': 'HNXhnx123', } } diff --git a/ITShowPlatform/urls.py b/ITShowPlatform/urls.py index 61cc431..1388e13 100644 --- a/ITShowPlatform/urls.py +++ b/ITShowPlatform/urls.py @@ -17,15 +17,12 @@ from django.contrib import admin from django.urls import path, re_path, include from django.views.static import serve from ITShowPlatform import settings -from rest_framework import routers - -from history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet urlpatterns = [ path('admin/', admin.site.urls), - path('v1/api/', include('comments.urls')), - path('v1/api/', include('history.urls')), - path('v1/api/', include('enroll.urls')), + path('v1/api/', include('Apps.comments.urls')), + path('v1/api/', include('Apps.history.urls')), + path('v1/api/', include('Apps.enroll.urls')), path(r'^api-auth/', include('rest_framework.urls')), re_path(r'^media/(?P.*)', serve, {"document_root": settings.MEDIA_ROOT}), ] diff --git a/enroll/admin.py b/enroll/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/enroll/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/media/lFUQpbHJ8k.jpg b/media/lFUQpbHJ8k.jpg new file mode 100644 index 0000000..e2c3ed6 Binary files /dev/null and b/media/lFUQpbHJ8k.jpg differ