Merge branch 'shine' of https://gitee.com/ladeng07/ITShowPlatform

 Conflicts:

	Apps/enroll/admin.py

	ITShowPlatform/.gitignore

.idea/dataSources.local.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal">
+    <data-source name="ITStudio@localhost" uuid="f9570fba-eba2-4840-bc3f-b898c3fabd4c">
+      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
+      <secret-storage>forget</secret-storage>
+      <schema-mapping />
+    </data-source>
+  </component>
+</project>

.idea/shelf/Update_at_2022_5_5_22_17__Default_Changelist_.xml

@@ -0,0 +1,4 @@
+<changelist name="在Update之前未提交更改_at_2022_5_5_22_17_[Default_Changelist]" date="1651760302590" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在Update之前未提交更改_at_2022_5_5_22_17_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="在Update之前未提交更改 at 2022/5/5 22:17 [Default Changelist]" />
+</changelist>

Apps/comments/models.py

@@ -4,6 +4,8 @@ from django.db import models
 
 
 class Comments(models.Model):
+    class Meta:
+        verbose_name_plural=u"弹幕内容"
     post_time = models.DateTimeField(verbose_name="发布时间")
     content = models.CharField(verbose_name="弹幕内容", max_length=50, blank=False)
 

Apps/comments/serializers.py

@@ -16,12 +16,13 @@ class CommentsInfo(serializers.ModelSerializer):
         ban = ['!', '@', '#', '$', '%', '^', '&', '*', '(', ')', "_", "-"]
         for i in ban:
             if i in value:
-                raise serializers.ValidationError(code='40001', detail=get_error_msg(40001))
+                raise serializers.ValidationError(code='40002', detail={'msg': get_error_msg(40002),
+                                                                                  "code": '40002'})
 
         if len(value) > 50:
-            raise serializers.ValidationError(code='40002', detail=get_error_msg(40002))
-        elif len(value) == 0:
             raise serializers.ValidationError(code='40003', detail=get_error_msg(40003))
+        elif len(value) == 0:
+            raise serializers.ValidationError(code='40004', detail=get_error_msg(40004))
 
 
         return value

Apps/enroll/admin.py

@@ -50,6 +50,7 @@ class New_memberAdmin(admin.ModelAdmin):
     '''过滤选项'''
     list_filter = ()
 
+
 admin.site.register(Department ,DepartmentAdmin)
 admin.site.register(NewMember)
-admin.site.register(EmailVerifyRecord)
+

Apps/work/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+from .models import Works
+# Register your models here.
+
+admin.site.register(Works)
+

Apps/work/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class WorksConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'Apps.work'

Apps/work/migrations/0001_initial.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.5 on 2022-05-05 21:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Works',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('grade', models.IntegerField(verbose_name='年份')),
+                ('name', models.CharField(max_length=30, verbose_name='事件名称')),
+                ('description', models.CharField(max_length=200, verbose_name='事件描述')),
+                ('img', models.ImageField(upload_to='image', verbose_name='图片')),
+            ],
+        ),
+    ]

Apps/work/migrations/0002_alter_works_img.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.5 on 2022-05-05 21:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('work', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='works',
+            name='img',
+            field=models.ImageField(blank=True, null=True, upload_to='image', verbose_name='图片'),
+        ),
+    ]

Apps/work/models.py

@@ -0,0 +1,13 @@
+from django.db import models
+
+# Create your models here.
+
+
+class Works(models.Model):
+    class Meta:
+        verbose_name_plural=u"部门作品"
+
+    grade = models.IntegerField(verbose_name="年份")
+    name = models.CharField(verbose_name="事件名称", max_length=30)
+    description = models.CharField(verbose_name="事件描述", max_length=200)
+    img = models.ImageField(verbose_name="图片", upload_to="image", null=True, blank=True)

Apps/work/serializers.py

@@ -2,7 +2,7 @@ from rest_framework import serializers
 from .models import *
 
 
-class HistoryInfoSerializer(serializers.ModelSerializer):
+class WorksInfoSerializer(serializers.ModelSerializer):
     class Meta:
         model = Works
         fields = '__all__'
@@ -11,6 +11,7 @@ class HistoryInfoSerializer(serializers.ModelSerializer):
     description = serializers.CharField(label="事件描述", max_length=200, required=True)
     img = serializers.ImageField(label="图片", required=False)
 
+
     def validate_grade(self, value):
         if not (2010 < value <= 2021):
             raise serializers.ValidationError("不合法输入")

Apps/work/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

Apps/work/urls.py

@@ -10,3 +10,4 @@ urlpatterns = [
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+

Apps/work/views.py

@@ -0,0 +1,35 @@
+import time
+from django.conf import settings
+import re
+from django.shortcuts import render
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from .models import Works
+from .serializers import WorksInfoSerializer
+# Create your views here.
+
+
+class work(APIView):
+
+    def get(self, request):
+        key = []
+        data = {"data": key}
+        for i in range(2012, 2022):
+            temp = {}
+            try:
+                works_set = Works.objects.filter(grade=i)
+                if works_set:
+                    serializer = WorksInfoSerializer(works_set, many=True)
+                    temp['grade'] = i
+                    temp['data'] = serializer.data
+                    data['data'].append(temp)
+            except Exception:
+                pass
+        if len(data['data']) == 0:
+            data['code'] = 40000
+            data['msg'] = "error"
+        else:
+            data['code'] = 20000
+            data['msg'] = 'success'
+        return Response(data=data)
+

ITShowPlatform/config.ini

@@ -19,8 +19,8 @@ EMAIL_FROM = 2302253692@qq.com  # 邮箱来自
 
 ENGINE = django.db.backends.mysql
 
-NAME = ITShowPlatform
+NAME = It_show
 
 USER = root
 
-PASSWORD = HNXhnx123
+PASSWORD = Qq2442402635*

ITShowPlatform/settings.py

@@ -49,6 +49,7 @@ INSTALLED_APPS = [
     'Apps.enroll',
     'Apps.history',
     'Apps.comments',
+    'Apps.work',
 
 ]
 

utils/get_error_msg.py

@@ -1,3 +1,4 @@
+
 def get_error_msg(code="20000"):
     error_set = {
         "20000": "成功",