server

server/api/migrations/0001_initial.py

@@ -1,41 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 15:36
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='User',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('username', models.CharField(max_length=16)),
-                ('password', models.CharField(max_length=32)),
-                ('desc', models.CharField(max_length=124)),
-                ('token', models.CharField(max_length=500)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Menu',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('path', models.CharField(blank=True, max_length=64, null=True)),
-                ('name', models.CharField(max_length=64, verbose_name='菜单名称')),
-                ('component', models.CharField(blank=True, max_length=512, null=True)),
-                ('redirect', models.CharField(blank=True, max_length=64, null=True)),
-                ('remark', models.CharField(blank=True, max_length=64, null=True)),
-                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='api.menu')),
-            ],
-            options={
-                'verbose_name': '菜单',
-                'verbose_name_plural': '菜单',
-            },
-        ),
-    ]

server/api/migrations/0002_auto_20210325_1617.py

@@ -1,38 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 16:17
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Metas',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=32)),
-                ('affix', models.BooleanField(default=True)),
-                ('icon', models.CharField(max_length=32)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='menu',
-            name='users',
-            field=models.ManyToManyField(null=True, to='api.User'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='username',
-            field=models.CharField(max_length=20),
-        ),
-        migrations.AddField(
-            model_name='menu',
-            name='meta',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='api.metas'),
-        ),
-    ]

server/api/migrations/0003_auto_20210325_1630.py

@@ -1,33 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 16:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0002_auto_20210325_1617'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='realname',
-            field=models.CharField(max_length=20, null=True),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='password',
-            field=models.CharField(max_length=32, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='token',
-            field=models.CharField(max_length=500, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='username',
-            field=models.CharField(max_length=20, unique=True),
-        ),
-    ]

server/api/migrations/0004_auto_20210325_1634.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 16:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0003_auto_20210325_1630'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='password',
-            field=models.CharField(max_length=32),
-        ),
-    ]

server/api/migrations/0005_auto_20210325_1641.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 16:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0004_auto_20210325_1634'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='metas',
-            name='affix',
-            field=models.BooleanField(default='true'),
-        ),
-    ]

server/api/migrations/0006_auto_20210325_1644.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 16:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0005_auto_20210325_1641'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='metas',
-            name='affix',
-            field=models.BooleanField(default=True),
-        ),
-    ]

server/api/migrations/0007_auto_20210325_1649.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 16:49
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0006_auto_20210325_1644'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='metas',
-            name='affix',
-            field=models.BooleanField(default=False),
-        ),
-    ]

server/api/migrations/0008_auto_20210325_1650.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 16:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0007_auto_20210325_1649'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='metas',
-            name='affix',
-            field=models.BooleanField(default=True),
-        ),
-    ]

server/api/migrations/0009_user_status.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-25 17:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0008_auto_20210325_1650'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='status',
-            field=models.BooleanField(default=1),
-        ),
-    ]

server/api/migrations/0010_auto_20210326_1006.py

@@ -1,35 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-26 10:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0009_user_status'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='menu',
-            name='meta',
-        ),
-        migrations.AddField(
-            model_name='menu',
-            name='affix',
-            field=models.BooleanField(default=1),
-        ),
-        migrations.AddField(
-            model_name='menu',
-            name='icon',
-            field=models.CharField(max_length=32, null=True),
-        ),
-        migrations.AddField(
-            model_name='menu',
-            name='title',
-            field=models.CharField(max_length=32, null=True),
-        ),
-        migrations.DeleteModel(
-            name='Metas',
-        ),
-    ]

server/api/migrations/0011_auto_20210329_1145.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-29 11:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0010_auto_20210326_1006'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='roleName',
-            field=models.CharField(max_length=32, null=True),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='value',
-            field=models.CharField(max_length=32, null=True),
-        ),
-    ]

server/api/migrations/0012_auto_20210330_1125.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-30 11:25
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0011_auto_20210329_1145'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='user',
-            old_name='realname',
-            new_name='realName',
-        ),
-    ]

server/api/migrations/0013_menu_status.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-30 13:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0012_auto_20210330_1125'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='menu',
-            name='status',
-            field=models.BooleanField(default=1),
-        ),
-    ]

server/api/migrations/0014_auto_20210330_1405.py

@@ -1,24 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-30 14:05
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0013_menu_status'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='menu',
-            old_name='remark',
-            new_name='detail',
-        ),
-        migrations.AddField(
-            model_name='menu',
-            name='create_time',
-            field=models.DateTimeField(auto_created=True, default=django.utils.timezone.now),
-        ),
-    ]

server/api/migrations/0015_auto_20210330_1410.py

@@ -1,22 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-30 14:10
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0014_auto_20210330_1405'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='menu',
-            name='users',
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='menus',
-            field=models.ManyToManyField(null=True, to='api.Menu'),
-        ),
-    ]

server/api/migrations/0016_auto_20210331_1439.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-31 14:39
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0015_auto_20210330_1410'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='user',
-            old_name='desc',
-            new_name='detail',
-        ),
-    ]

server/api/migrations/0017_auto_20210401_1037.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.1.7 on 2021-04-01 10:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0016_auto_20210331_1439'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='detail',
-            field=models.CharField(max_length=124, null=True),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='token',
-            field=models.CharField(default='fakeToken', max_length=500, unique=True),
-        ),
-    ]

server/api/migrations/0018_auto_20210401_1205.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-04-01 12:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0017_auto_20210401_1037'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='id',
-            field=models.AutoField(primary_key=True, serialize=False),
-        ),
-    ]

server/api/migrations/0019_auto_20210401_1336.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-04-01 13:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0018_auto_20210401_1205'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='id',
-            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-    ]

server/api/migrations/0020_auto_20210401_1342.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-04-01 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0019_auto_20210401_1336'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='token',
-            field=models.CharField(max_length=500, unique=True),
-        ),
-    ]

server/api/migrations/0021_auto_20210406_1200.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.7 on 2021-04-06 12:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0020_auto_20210401_1342'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='menu',
-            name='icon',
-            field=models.CharField(max_length=120, null=True),
-        ),
-    ]

server/api/urls.py

@@ -17,16 +17,16 @@ app_name = 'api'  # namespace 命名空间
 # 路由列表 urlpatterns
 urlpatterns = [
     # 不能以/ 开头
-    path('login/', views.login.as_view(), name='login'),
-    path('getUserInfoById/', views.getUserInfoById.as_view(), name='get_user_info'),
-    path('getUserList/', views.getUserList.as_view(), name='get_user_list'),
-    path('addUser/', views.addUser.as_view(), name='add_user'),
-    path('editUser/', views.editUser.as_view(), name='edit_user'),
-    path('deleteUser/', views.deleteUser.as_view(), name='delete_user'),
-    path('getMenuListById/', views.getMenuListById.as_view(), name='get_menu'),
-    path('getAllMenuList/', views.getAllMenuList.as_view(), name='get_all_menu'),
-    path('addMenu/', views.addMenu.as_view(), name='add_menu'),
-    path('editMenu/', views.editMenu.as_view(), name='edit_menu'),
-    path('deleteMenu/', views.deleteMenu.as_view(), name='delete_menu'),
-    path('upload/', views.FileUpload.as_view(), name='upload'),
+    path('login', views.login.as_view(), name='login'),
+    path('userInfo/id', views.getUserInfoById.as_view(), name='get_user_info'),
+    path('getUserList', views.getUserList.as_view(), name='get_user_list'),
+    path('addUser', views.addUser.as_view(), name='add_user'),
+    path('editUser', views.editUser.as_view(), name='edit_user'),
+    path('deleteUser', views.deleteUser.as_view(), name='delete_user'),
+    path('getMenuListById', views.getMenuListById.as_view(), name='get_menu'),
+    path('getAllMenuList', views.getAllMenuList.as_view(), name='get_all_menu'),
+    path('addMenu', views.addMenu.as_view(), name='add_menu'),
+    path('editMenu', views.editMenu.as_view(), name='edit_menu'),
+    path('deleteMenu', views.deleteMenu.as_view(), name='delete_menu'),
+    path('upload', views.FileUpload.as_view(), name='upload'),
 ]

server/api/views.py

@@ -129,7 +129,9 @@ def getTree(children, menus, childrens):
 # 请求---------------------------------------------------------------------
 class login(View):
     def post(self, request):
-        data = json.loads(request.body)
+
+        data = request.POST
+
         user = User.objects.all().filter(username=data.get(
             'username'), password=data.get('password'))
         print(user)
@@ -142,7 +144,7 @@ class login(View):
 
 class getUserInfoById(View):
     def post(self, request):
-        userid = json.loads(request.body).get('userId')
+        userid = request.POST.get('userId')
         print('====================udsaersadf======')
         print(userid)
         print('====================udsaersadf======')
@@ -170,7 +172,8 @@ class addUser(APIView):
     serialize_class = UserSerializer
 
     def post(self, request):
-        user = json.loads(request.body)
+        # user = json.loads(request.body)
+        user = request.POST
         userSer = UserSerializer(data=user)
         if userSer.is_valid():
             menuIdList = user.pop('menus')
@@ -197,7 +200,8 @@ class editUser(APIView):
     serialize_class = UserSerializer
 
     def post(self, request):
-        data = json.loads(request.body)
+        # data = json.loads(request.body)
+        data = request.POST
         userSer = UserSerializer(data=data)
         user = User.objects.all().filter(id=data.get('id')).first()
 
@@ -218,7 +222,7 @@ class editUser(APIView):
 
 class deleteUser(View):
     def post(self, request):
-        data = json.loads(request.body)
+        data = request.POST
         user = User.objects.all().filter(id=data.get('id'))
         try:
             if user:
@@ -234,7 +238,7 @@ class deleteUser(View):
 class getMenuListById(View):
     def post(self, request):
         # 获取参数id
-        userId = json.loads(request.body).get('id')
+        userId = request.POST.get('id')
         print(userId)
         # 当前用户
         querSetUser = User.objects.all().filter(id=userId)
@@ -258,8 +262,9 @@ class addMenu(APIView):
     serialize_class = MenuSerializer
 
     def post(self, request):
-        data = json.loads(request.body)
-        data['title'] = data.pop('menuName')
+        # data = json.loads(request.body)
+        data = request.POST
+        data.title = data.pop('menuName')
         menuSer = MenuSerializer(data=data)
         if menuSer.is_valid():
             if data.get('parent'):
@@ -276,8 +281,8 @@ class editMenu(APIView):
     serialize_class = MenuSerializer
 
     def post(self, request):
-        data = json.loads(request.body)
-        data['title'] = data.pop('menuName')
+        data = request.POST
+        data.title = data.pop('menuName')
         menuSer = MenuSerializer(data=data)
         if menuSer.is_valid():
             menu = Menu.objects.all().filter(id=data.get('id')).first()
@@ -297,7 +302,7 @@ class editMenu(APIView):
 
 class deleteMenu(View):
     def post(self, request):
-        data = json.loads(request.body)
+        data = request.POST
         menu = Menu.objects.all().filter(id=data.get('id'))
         try:
             if menu:

server/server/urls.py

@@ -13,8 +13,8 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-from django.urls import path,include
+from django.urls import path, include
 
 urlpatterns = [
-    path('api/', include('api.urls')),
+    path('admin/', include('api.urls')),
 ]

src/api/sys/user.ts

@@ -12,15 +12,6 @@ import {
 import { ErrorMessageMode } from '/@/utils/http/axios/types';
 
 enum Api {
-  // post请求结尾不加斜杠 django报错
-  //   Login = '/login/',
-  //   GetUserInfoById = '/getUserInfoById/',
-  //   GetUserList = '/getUserList/',
-  //   AddUser = '/addUser/',
-  //   EditUser = '/editUser/',
-  //   DeleteUser = '/deleteUser/',
-  //   GetPermCodeByUserId = '/getPermCodeByUserId/',
-
   Login = '/login',
   GetUserInfoById = '/userInfo/id',
   GetUserList = '/getUserList',

src/utils/http/axios/index.ts

@@ -174,6 +174,7 @@ const transform: AxiosTransform = {
 };
 
 function createAxios(opt?: Partial<CreateAxiosOptions>) {
+  console.log(ContentTypeEnum);
   return new VAxios(
     deepMerge(
       {