diff --git a/.gitignore b/.gitignore index 37022ac..ca448c5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .vscode/ .vs/ venv/ -media/ __pycache__/ *.pyc diff --git a/test_server/.gitignore b/test_server/.gitignore new file mode 100644 index 0000000..2393d78 --- /dev/null +++ b/test_server/.gitignore @@ -0,0 +1,10 @@ +.vscode/ +.vs/ +venv/ +!media/default/* +!media/muban/* +__pycache__/ +*.pyc +server/conf*.py +dist/* +log/* \ No newline at end of file diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 45ec8d3..63af8bb 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -35,7 +35,7 @@ from rbac.models import UserProfile from django.http import Http404 from .spider import getZs import time -from server.config import * +from server.conf import * from .hwmsg import sendMsg def my_payload_handler(user, dtype="admin"): diff --git a/test_server/media/20200309/2160182c-61e6-11ea-8674-1063c8f02116.xlsx b/test_server/media/20200309/2160182c-61e6-11ea-8674-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/2160182c-61e6-11ea-8674-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/39a8e21c-61e5-11ea-818e-1063c8f02116.xlsx b/test_server/media/20200309/39a8e21c-61e5-11ea-818e-1063c8f02116.xlsx deleted file mode 100644 index b1f2f98..0000000 Binary files a/test_server/media/20200309/39a8e21c-61e5-11ea-818e-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/4e26c534-6204-11ea-bb1a-1063c8f02116.xlsx b/test_server/media/20200309/4e26c534-6204-11ea-bb1a-1063c8f02116.xlsx deleted file mode 100644 index ff14b68..0000000 Binary files a/test_server/media/20200309/4e26c534-6204-11ea-bb1a-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/5a7f1140-61e5-11ea-9c44-1063c8f02116.xlsx b/test_server/media/20200309/5a7f1140-61e5-11ea-9c44-1063c8f02116.xlsx deleted file mode 100644 index b1f2f98..0000000 Binary files a/test_server/media/20200309/5a7f1140-61e5-11ea-9c44-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/72a9046e-61e5-11ea-90ac-1063c8f02116.xlsx b/test_server/media/20200309/72a9046e-61e5-11ea-90ac-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/72a9046e-61e5-11ea-90ac-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/908e693e-61e6-11ea-9e25-1063c8f02116.xlsx b/test_server/media/20200309/908e693e-61e6-11ea-9e25-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/908e693e-61e6-11ea-9e25-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/9f6df070-6201-11ea-a97c-1063c8f02116.xlsx b/test_server/media/20200309/9f6df070-6201-11ea-a97c-1063c8f02116.xlsx deleted file mode 100644 index ff14b68..0000000 Binary files a/test_server/media/20200309/9f6df070-6201-11ea-a97c-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/a71359d2-61e5-11ea-bdf0-1063c8f02116.xlsx b/test_server/media/20200309/a71359d2-61e5-11ea-bdf0-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/a71359d2-61e5-11ea-bdf0-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/b08b0cb4-61e4-11ea-b3f6-1063c8f02116.xlsx b/test_server/media/20200309/b08b0cb4-61e4-11ea-b3f6-1063c8f02116.xlsx deleted file mode 100644 index b1f2f98..0000000 Binary files a/test_server/media/20200309/b08b0cb4-61e4-11ea-b3f6-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/bf9376d0-61e6-11ea-85fe-1063c8f02116.xlsx b/test_server/media/20200309/bf9376d0-61e6-11ea-85fe-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/bf9376d0-61e6-11ea-85fe-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/ce58ba30-61e5-11ea-83fa-1063c8f02116.xlsx b/test_server/media/20200309/ce58ba30-61e5-11ea-83fa-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/ce58ba30-61e5-11ea-83fa-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/d29f0690-61e5-11ea-9ba3-1063c8f02116.xlsx b/test_server/media/20200309/d29f0690-61e5-11ea-9ba3-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/d29f0690-61e5-11ea-9ba3-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/d98b7c4a-61cf-11ea-8c33-1063c8f02116.xlsx b/test_server/media/20200309/d98b7c4a-61cf-11ea-8c33-1063c8f02116.xlsx deleted file mode 100644 index 81ad577..0000000 Binary files a/test_server/media/20200309/d98b7c4a-61cf-11ea-8c33-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200309/f75836a4-61e6-11ea-9a28-1063c8f02116.xlsx b/test_server/media/20200309/f75836a4-61e6-11ea-9a28-1063c8f02116.xlsx deleted file mode 100644 index 946873b..0000000 Binary files a/test_server/media/20200309/f75836a4-61e6-11ea-9a28-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200320/7e69b28c-6a90-11ea-8b16-90cdb685c056.xlsx b/test_server/media/20200320/7e69b28c-6a90-11ea-8b16-90cdb685c056.xlsx deleted file mode 100644 index a3867d1..0000000 Binary files a/test_server/media/20200320/7e69b28c-6a90-11ea-8b16-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200320/a045ee7e-6a90-11ea-9c68-90cdb685c056.xlsx b/test_server/media/20200320/a045ee7e-6a90-11ea-9c68-90cdb685c056.xlsx deleted file mode 100644 index 917c10f..0000000 Binary files a/test_server/media/20200320/a045ee7e-6a90-11ea-9c68-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200324/539de268-6dda-11ea-8275-1063c8f02116.xlsx b/test_server/media/20200324/539de268-6dda-11ea-8275-1063c8f02116.xlsx deleted file mode 100644 index 5f335b8..0000000 Binary files a/test_server/media/20200324/539de268-6dda-11ea-8275-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200324/784ad082-6dda-11ea-9d22-1063c8f02116.xlsx b/test_server/media/20200324/784ad082-6dda-11ea-9d22-1063c8f02116.xlsx deleted file mode 100644 index e15fa17..0000000 Binary files a/test_server/media/20200324/784ad082-6dda-11ea-9d22-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200324/afef3fd8-6dda-11ea-8796-1063c8f02116.xlsx b/test_server/media/20200324/afef3fd8-6dda-11ea-8796-1063c8f02116.xlsx deleted file mode 100644 index e15fa17..0000000 Binary files a/test_server/media/20200324/afef3fd8-6dda-11ea-8796-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200324/ea4a4e2c-6dda-11ea-bd15-1063c8f02116.xlsx b/test_server/media/20200324/ea4a4e2c-6dda-11ea-bd15-1063c8f02116.xlsx deleted file mode 100644 index e15fa17..0000000 Binary files a/test_server/media/20200324/ea4a4e2c-6dda-11ea-bd15-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200325/29787bda-6e76-11ea-b932-90cdb685c056.xlsx b/test_server/media/20200325/29787bda-6e76-11ea-b932-90cdb685c056.xlsx deleted file mode 100644 index 6333b38..0000000 Binary files a/test_server/media/20200325/29787bda-6e76-11ea-b932-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200325/39f8f98a-6e45-11ea-997f-90cdb685c056.xlsx b/test_server/media/20200325/39f8f98a-6e45-11ea-997f-90cdb685c056.xlsx deleted file mode 100644 index 599913d..0000000 Binary files a/test_server/media/20200325/39f8f98a-6e45-11ea-997f-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200325/7b63313a-6e44-11ea-a9fe-90cdb685c056.xlsx b/test_server/media/20200325/7b63313a-6e44-11ea-a9fe-90cdb685c056.xlsx deleted file mode 100644 index 599913d..0000000 Binary files a/test_server/media/20200325/7b63313a-6e44-11ea-a9fe-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200325/bff014c6-6e75-11ea-b071-90cdb685c056.xlsx b/test_server/media/20200325/bff014c6-6e75-11ea-b071-90cdb685c056.xlsx deleted file mode 100644 index 6333b38..0000000 Binary files a/test_server/media/20200325/bff014c6-6e75-11ea-b071-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200325/cf9550ba-6e74-11ea-bed5-90cdb685c056.xlsx b/test_server/media/20200325/cf9550ba-6e74-11ea-bed5-90cdb685c056.xlsx deleted file mode 100644 index 6333b38..0000000 Binary files a/test_server/media/20200325/cf9550ba-6e74-11ea-bed5-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200325/d2696f62-6e44-11ea-b540-90cdb685c056.xlsx b/test_server/media/20200325/d2696f62-6e44-11ea-b540-90cdb685c056.xlsx deleted file mode 100644 index 599913d..0000000 Binary files a/test_server/media/20200325/d2696f62-6e44-11ea-b540-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200325/df97bb0a-6e43-11ea-bf01-90cdb685c056.xlsx b/test_server/media/20200325/df97bb0a-6e43-11ea-bf01-90cdb685c056.xlsx deleted file mode 100644 index 599913d..0000000 Binary files a/test_server/media/20200325/df97bb0a-6e43-11ea-bf01-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/1b768970-6f42-11ea-86ae-90cdb685c056.xlsx b/test_server/media/20200326/1b768970-6f42-11ea-86ae-90cdb685c056.xlsx deleted file mode 100644 index fb448a0..0000000 Binary files a/test_server/media/20200326/1b768970-6f42-11ea-86ae-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/4f816e5c-6f41-11ea-b9f0-90cdb685c056.xlsx b/test_server/media/20200326/4f816e5c-6f41-11ea-b9f0-90cdb685c056.xlsx deleted file mode 100644 index fb448a0..0000000 Binary files a/test_server/media/20200326/4f816e5c-6f41-11ea-b9f0-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/6b392c68-6f40-11ea-a2eb-90cdb685c056.xlsx b/test_server/media/20200326/6b392c68-6f40-11ea-a2eb-90cdb685c056.xlsx deleted file mode 100644 index 159ab8f..0000000 Binary files a/test_server/media/20200326/6b392c68-6f40-11ea-a2eb-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/7a775c98-6f42-11ea-a076-90cdb685c056.xlsx b/test_server/media/20200326/7a775c98-6f42-11ea-a076-90cdb685c056.xlsx deleted file mode 100644 index fb448a0..0000000 Binary files a/test_server/media/20200326/7a775c98-6f42-11ea-a076-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/925d1614-6f0e-11ea-b730-90cdb685c056.xlsx b/test_server/media/20200326/925d1614-6f0e-11ea-b730-90cdb685c056.xlsx deleted file mode 100644 index 9b0e58a..0000000 Binary files a/test_server/media/20200326/925d1614-6f0e-11ea-b730-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/a1d712ee-6f42-11ea-95d6-90cdb685c056.xlsx b/test_server/media/20200326/a1d712ee-6f42-11ea-95d6-90cdb685c056.xlsx deleted file mode 100644 index ee484cc..0000000 Binary files a/test_server/media/20200326/a1d712ee-6f42-11ea-95d6-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/c7559124-6f10-11ea-81e6-90cdb685c056.xlsx b/test_server/media/20200326/c7559124-6f10-11ea-81e6-90cdb685c056.xlsx deleted file mode 100644 index 3340c0c..0000000 Binary files a/test_server/media/20200326/c7559124-6f10-11ea-81e6-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200326/fede2092-6f41-11ea-8fd8-90cdb685c056.xlsx b/test_server/media/20200326/fede2092-6f41-11ea-8fd8-90cdb685c056.xlsx deleted file mode 100644 index 599913d..0000000 Binary files a/test_server/media/20200326/fede2092-6f41-11ea-8fd8-90cdb685c056.xlsx and /dev/null differ diff --git a/test_server/media/20200330/5df5bb26-722e-11ea-bb5e-90cdb685c056.jpg b/test_server/media/20200330/5df5bb26-722e-11ea-bb5e-90cdb685c056.jpg deleted file mode 100644 index a30ae35..0000000 Binary files a/test_server/media/20200330/5df5bb26-722e-11ea-bb5e-90cdb685c056.jpg and /dev/null differ diff --git a/test_server/media/20200330/6ce3745c-722e-11ea-b195-90cdb685c056.jpg b/test_server/media/20200330/6ce3745c-722e-11ea-b195-90cdb685c056.jpg deleted file mode 100644 index ca3e81d..0000000 Binary files a/test_server/media/20200330/6ce3745c-722e-11ea-b195-90cdb685c056.jpg and /dev/null differ diff --git a/test_server/media/20200330/d32dec34-722e-11ea-8679-90cdb685c056.jpg b/test_server/media/20200330/d32dec34-722e-11ea-8679-90cdb685c056.jpg deleted file mode 100644 index 993dafa..0000000 Binary files a/test_server/media/20200330/d32dec34-722e-11ea-8679-90cdb685c056.jpg and /dev/null differ diff --git a/test_server/media/20200330/d7f576b6-722e-11ea-937d-90cdb685c056.jpg b/test_server/media/20200330/d7f576b6-722e-11ea-937d-90cdb685c056.jpg deleted file mode 100644 index 0b4ee7e..0000000 Binary files a/test_server/media/20200330/d7f576b6-722e-11ea-937d-90cdb685c056.jpg and /dev/null differ diff --git a/test_server/media/20200330/de0f98e8-722e-11ea-8c60-90cdb685c056.jpg b/test_server/media/20200330/de0f98e8-722e-11ea-8c60-90cdb685c056.jpg deleted file mode 100644 index 993dafa..0000000 Binary files a/test_server/media/20200330/de0f98e8-722e-11ea-8c60-90cdb685c056.jpg and /dev/null differ diff --git a/test_server/media/20200330/eafaa71e-722e-11ea-b108-90cdb685c056.jpg b/test_server/media/20200330/eafaa71e-722e-11ea-b108-90cdb685c056.jpg deleted file mode 100644 index 0b4ee7e..0000000 Binary files a/test_server/media/20200330/eafaa71e-722e-11ea-b108-90cdb685c056.jpg and /dev/null differ diff --git a/test_server/media/20200330/ee508bc6-722e-11ea-a47c-90cdb685c056.jpg b/test_server/media/20200330/ee508bc6-722e-11ea-a47c-90cdb685c056.jpg deleted file mode 100644 index 993dafa..0000000 Binary files a/test_server/media/20200330/ee508bc6-722e-11ea-a47c-90cdb685c056.jpg and /dev/null differ diff --git a/test_server/media/20200404/2fc12afa-761b-11ea-8aa0-1063c8f02116.xlsx b/test_server/media/20200404/2fc12afa-761b-11ea-8aa0-1063c8f02116.xlsx deleted file mode 100644 index 00acacf..0000000 Binary files a/test_server/media/20200404/2fc12afa-761b-11ea-8aa0-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/20200404/4b03b64c-761b-11ea-a6ef-1063c8f02116.xlsx b/test_server/media/20200404/4b03b64c-761b-11ea-a6ef-1063c8f02116.xlsx deleted file mode 100644 index 6a08838..0000000 Binary files a/test_server/media/20200404/4b03b64c-761b-11ea-a6ef-1063c8f02116.xlsx and /dev/null differ diff --git a/test_server/media/admin/20200227233157_曹前明1.jpg b/test_server/media/admin/20200227233157_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200227233157_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200227235214_曹前明1.jpg b/test_server/media/admin/20200227235214_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200227235214_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200227235514_曹前明1.jpg b/test_server/media/admin/20200227235514_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200227235514_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200227235745_曹前明1.jpg b/test_server/media/admin/20200227235745_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200227235745_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228094504_曹前明1.jpg b/test_server/media/admin/20200228094504_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228094504_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228094728_曹前明1.jpg b/test_server/media/admin/20200228094728_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228094728_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228105350_曹前明1.jpg b/test_server/media/admin/20200228105350_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228105350_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228105619_曹前明1.jpg b/test_server/media/admin/20200228105619_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228105619_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228111658_曹前明1.jpg b/test_server/media/admin/20200228111658_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228111658_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228111917_曹前明1.jpg b/test_server/media/admin/20200228111917_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228111917_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228111947_曹前明1.jpg b/test_server/media/admin/20200228111947_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228111947_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228112014_曹前明1.jpg b/test_server/media/admin/20200228112014_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228112014_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228112206_曹前明1.jpg b/test_server/media/admin/20200228112206_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228112206_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228112229_曹前明1.jpg b/test_server/media/admin/20200228112229_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228112229_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228112242_曹前明1.jpg b/test_server/media/admin/20200228112242_曹前明1.jpg deleted file mode 100644 index b023e32..0000000 Binary files a/test_server/media/admin/20200228112242_曹前明1.jpg and /dev/null differ diff --git a/test_server/media/admin/20200228145615_曹前明2.jpg b/test_server/media/admin/20200228145615_曹前明2.jpg deleted file mode 100644 index 4b30834..0000000 Binary files a/test_server/media/admin/20200228145615_曹前明2.jpg and /dev/null differ diff --git a/test_server/rbac/views/user.py b/test_server/rbac/views/user.py index c74aa99..0440c22 100644 --- a/test_server/rbac/views/user.py +++ b/test_server/rbac/views/user.py @@ -27,7 +27,7 @@ from ..serializers.user_serializer import (UserCreateSerializer, UserInfoListSerializer, UserListSerializer, UserModifySerializer) -from server.config import * +from server.conf import * from rest_framework_jwt.serializers import jwt_encode_handler from crm.views import my_payload_handler diff --git a/test_server/requirements.txt b/test_server/requirements.txt index 3e45591..5d4cb1c 100644 Binary files a/test_server/requirements.txt and b/test_server/requirements.txt differ diff --git a/test_server/server/config.py b/test_server/server/config.py deleted file mode 100644 index eeeabd4..0000000 --- a/test_server/server/config.py +++ /dev/null @@ -1,5 +0,0 @@ -appid = 'wxf1e9471c93f05ad6' -secret = '4bf7f9bd6c52634586bbe792a1f0a834' -sms_appid = '100172' -sms_appsecret = '00b8681c-0ce6-41c8-a867-904c1891c78a' -sms_url = 'https://sms.zhenzikj.com' \ No newline at end of file diff --git a/test_server/server/settings.py b/test_server/server/settings.py index 358dc91..78f1537 100644 --- a/test_server/server/settings.py +++ b/test_server/server/settings.py @@ -13,7 +13,7 @@ https://docs.djangoproject.com/en/3.0/ref/settings/ import os import datetime import sys - +from . import conf # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -25,7 +25,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = '+*j($q+46c*1qre8227=(b$(d@lro0)vllts%l%*8)z5$x#=tx' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = conf.DEBUG ALLOWED_HOSTS = ['*'] @@ -98,20 +98,7 @@ CACHES = { # Database # https://docs.djangoproject.com/en/3.0/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'zkfs', - 'USER':'ctcuser', - 'PASSWORD':'zkfs1234', - 'HOST':'116.63.176.211', - 'PORT':'5432', - }, - # 'default': { - # 'ENGINE': 'django.db.backends.sqlite3', - # 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - # } -} +DATABASES = conf.DATABASES # Password validation @@ -151,7 +138,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.0/howto/static-files/ STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR,'static') +STATIC_ROOT = os.path.join(BASE_DIR, 'dist/static') REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ diff --git a/test_server/server/urls.py b/test_server/server/urls.py index 8a99d12..937196b 100644 --- a/test_server/server/urls.py +++ b/test_server/server/urls.py @@ -24,21 +24,25 @@ from utils.file import UploadFileView from utils.view import redirect urlpatterns = [ - path('rbac/', include('rbac.urls')), - path('vod/', include('vod.urls')), - path('develop/', include('develop.urls')), - path('crm/', include('crm.urls')), - path('question/', include('question.urls')), - path('examtest/', include('examtest.urls')), - path('cms/', include('cms.urls')), - path('analyse/', include('analyse.urls')), - path('qtest/', include('qtest.urls')), - path('token/', obtain_jwt_token), - path('token/refresh/', refresh_jwt_token), - path('token/verify/', verify_jwt_token), - path('token/remove/', UserLogoutView.as_view()), - path('uploadfile/', UploadFileView.as_view()), - path('redirect/',redirect), - path('admin/', admin.site.urls), - path('docs/', include_docs_urls(title="答题平台接口文档",authentication_classes=[], permission_classes=[])), + path('api/rbac/', include('rbac.urls')), + path('api/vod/', include('vod.urls')), + path('api/develop/', include('develop.urls')), + path('api/crm/', include('crm.urls')), + path('api/question/', include('question.urls')), + path('api/examtest/', include('examtest.urls')), + path('api/cms/', include('cms.urls')), + path('api/analyse/', include('analyse.urls')), + path('api/qtest/', include('qtest.urls')), + path('api/token/', obtain_jwt_token), + path('api/token/refresh/', refresh_jwt_token), + path('api/token/verify/', verify_jwt_token), + path('api/token/remove/', UserLogoutView.as_view()), + path('api/uploadfile/', UploadFileView.as_view()), + path('api/redirect/',redirect), + + # django后台 + path('django/admin/doc/', include('django.contrib.admindocs.urls')), + path('django/admin/', admin.site.urls), + path('django/api-auth/', include('rest_framework.urls')), + path('api/docs/', include_docs_urls(title="答题平台接口文档",authentication_classes=[], permission_classes=[])), ]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)+ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)