Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

.idea/ITShowPlatform.iml

@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="settings.py" />
+        <option name="manageScript" value="manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
-    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+  </component>
 </module>

.idea/deployment.xml

@@ -5,7 +5,7 @@
       <paths name="ITShowPlatform">
         <serverdata>
           <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/Django/ITShowPlatform" local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>

.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (ITShowPlatform)" project-jdk-type="Python SDK" />
 </project>

.idea/workspace.xml

@@ -31,8 +31,10 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="修改了部门详情的model，&#10;添加了对数据库数据输出前的格式验证">
+    <list default="true" id="81247df9-f070-428a-8ff8-85c1a06086e7" name="Default Changelist" comment="完善了一下serializers">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/history/migrations/0001_initial.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/history/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/models.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/history/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/serializers.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/history/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/views.py" afterDir="false" />
     </list>
@@ -66,7 +68,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Todo" />
     <property name="settings.editor.selected.configurable" value="web.server" />
   </component>
   <component name="RunManager">
@@ -118,8 +120,7 @@
       <workItem from="1651235869595" duration="8446000" />
       <workItem from="1651248194966" duration="1722000" />
       <workItem from="1651275393720" duration="5083000" />
-      <workItem from="1651322613788" duration="6853000" />
+      <workItem from="1651322613788" duration="6665000" />
-      <workItem from="1651741043921" duration="7059000" />
     </task>
     <task id="LOCAL-00001" summary="fix">
       <created>1650187914913</created>
@@ -142,14 +143,7 @@
       <option name="project" value="LOCAL" />
       <updated>1651233809599</updated>
     </task>
-    <task id="LOCAL-00004" summary="修改了部门详情的model，&#10;添加了对数据库数据输出前的格式验证">
+    <option name="localTasksCounter" value="4" />
-      <created>1651329470523</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1651329470523</updated>
-    </task>
-    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -183,8 +177,7 @@
     <MESSAGE value="fix" />
     <MESSAGE value="修改+合并前的提交" />
     <MESSAGE value="完善了一下serializers" />
-    <MESSAGE value="修改了部门详情的model，&#10;添加了对数据库数据输出前的格式验证" />
+    <option name="LAST_COMMIT_MESSAGE" value="完善了一下serializers" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改了部门详情的model，&#10;添加了对数据库数据输出前的格式验证" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/ITShowPlatform$urls.coverage" NAME="urls Coverage Results" MODIFIED="1650768597611" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/history" />

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'

Apps/comments/urls.py

@@ -1,4 +1,3 @@
-from django.contrib import admin
 from django.urls import path
 from . import views
 

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)

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'

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
 

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
 
 

Apps/enroll/urls.py

@@ -1,5 +1,4 @@
-from django.contrib import admin
+from django.urls import path
-from django.urls import path, include
 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/<string:pk>", views.Sign_in.as_view({"get": "get"}))
 ]
-
-# router = DefaultRouter()
-# router.register("sign_in", views.Sign_in, "sign_in")
-# urlpatterns += router.urls

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 Apps.enroll.models import Department, EmailVerifyRecord, New_member
-from enroll.serializer import Department_serializer, New_member_serializer, New_member_schedule_serializer, \
+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
 

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'

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',
+            },
+        ),
+    ]

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):

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()),

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

ITShowPlatform/settings.py

@@ -37,9 +37,9 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'rest_framework',
-    'enroll',
+    'Apps.enroll',
-    'history',
+    'Apps.history',
-    'comments',
+    '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',
     }
 }
 

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('Apps.comments.urls')),
-    path('v1/api/', include('history.urls')),
+    path('v1/api/', include('Apps.history.urls')),
-    path('v1/api/', include('enroll.urls')),
+    path('v1/api/', include('Apps.enroll.urls')),
     path(r'^api-auth/', include('rest_framework.urls')),
     re_path(r'^media/(?P<path>.*)', serve, {"document_root": settings.MEDIA_ROOT}),
 ]

enroll/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.