diff --git a/backend/api/emus/GconfigEnum.py b/backend/api/emus/GconfigEnum.py deleted file mode 100644 index e69de29b..00000000 diff --git a/backend/api/emus/RouterConfigEnum.py b/backend/api/emus/RouterConfigEnum.py new file mode 100644 index 00000000..f259616a --- /dev/null +++ b/backend/api/emus/RouterConfigEnum.py @@ -0,0 +1,14 @@ +class RouterConfigEnum: + + CASE = "case" + DATABASE = "database" + ENV = "env" + FUNCTION = "function" + HTTP = "http" + NOTICE = "notice" + PLAN = "plan" + PROJECT = "project" + REPORT = "report" + STATISTICS = "statistics" + TREE = "tree" + USER = "user" diff --git a/backend/api/routers/case.py b/backend/api/routers/case.py index 28c742c4..8535789e 100644 --- a/backend/api/routers/case.py +++ b/backend/api/routers/case.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.https import ( SaveOrUpdateCaseView, DelCaseView, @@ -20,5 +21,5 @@ ] -app_name = "case" +app_name = RouterConfigEnum.CASE urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/database.py b/backend/api/routers/database.py index 79a2327d..963afaa8 100644 --- a/backend/api/routers/database.py +++ b/backend/api/routers/database.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.setting import ( DataSourceListViewSet, DataSourceDestroyViewSet, @@ -20,5 +21,5 @@ ] -app_name = "database" +app_name = RouterConfigEnum.DATABASE urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/env.py b/backend/api/routers/env.py index a1329330..1496f52a 100644 --- a/backend/api/routers/env.py +++ b/backend/api/routers/env.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.setting import ( TestEnvironmentListViewSet, TestEnvironmentDestroyViewSet, @@ -18,5 +19,5 @@ ] -app_name = "env" +app_name = RouterConfigEnum.ENV urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/function.py b/backend/api/routers/function.py index 144c02a0..ae1aa3ba 100644 --- a/backend/api/routers/function.py +++ b/backend/api/routers/function.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.setting import ( FunctionsListViewSet, DebugFunctionApiView, @@ -18,5 +19,5 @@ ] -app_name = "function" +app_name = RouterConfigEnum.FUNCTION urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/http.py b/backend/api/routers/http.py index b7375bbf..f906605b 100644 --- a/backend/api/routers/http.py +++ b/backend/api/routers/http.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.https import ( ApiFastView, DelApiView, @@ -26,5 +27,5 @@ ] -app_name = "http" +app_name = RouterConfigEnum.HTTP urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/notice.py b/backend/api/routers/notice.py index 318fa675..00263da7 100644 --- a/backend/api/routers/notice.py +++ b/backend/api/routers/notice.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.setting import ( NoticeListViewSet, NoticeDestroyViewSet, @@ -18,5 +19,5 @@ ] -app_name = "notice" +app_name = RouterConfigEnum.NOTICE urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/plan.py b/backend/api/routers/plan.py index e0ee56b7..aaec19a9 100644 --- a/backend/api/routers/plan.py +++ b/backend/api/routers/plan.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.plan import ( SaveOrUpdatePlanView, UpdatePlanStateView, @@ -22,5 +23,5 @@ ] -app_name = "plan" +app_name = RouterConfigEnum.PLAN urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/project.py b/backend/api/routers/project.py index 4b21dccb..7e3da652 100644 --- a/backend/api/routers/project.py +++ b/backend/api/routers/project.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.project import ( ProjectListViewSet, ProjectDestroyViewSet, @@ -24,5 +25,5 @@ ] -app_name = "project" +app_name = RouterConfigEnum.PROJECT urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/report.py b/backend/api/routers/report.py index 74f20e25..5f4c6981 100644 --- a/backend/api/routers/report.py +++ b/backend/api/routers/report.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.report import ( ReportDetailView, ReportListViewSet @@ -14,5 +15,5 @@ ] -app_name = "report" +app_name = RouterConfigEnum.REPORT urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/statistics.py b/backend/api/routers/statistics.py index 7c71095a..1010b631 100644 --- a/backend/api/routers/statistics.py +++ b/backend/api/routers/statistics.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.dashboard import StatisticsView @@ -10,5 +11,5 @@ ] -app_name = "statistics" +app_name = RouterConfigEnum.STATISTICS urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/tree.py b/backend/api/routers/tree.py index 7aa432a7..43fec9f1 100644 --- a/backend/api/routers/tree.py +++ b/backend/api/routers/tree.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.https import ( TreeView ) @@ -12,5 +13,5 @@ ] -app_name = "tree" +app_name = RouterConfigEnum.TREE urlpatterns = app_urls + router.urls diff --git a/backend/api/routers/user.py b/backend/api/routers/user.py index 7b60f9e7..4e4ab0f4 100644 --- a/backend/api/routers/user.py +++ b/backend/api/routers/user.py @@ -1,5 +1,6 @@ from django.urls import path from rest_framework.routers import DefaultRouter +from api.emus.RouterConfigEnum import RouterConfigEnum from api.service.user import ( CustomJsonWebToken, UserListViewSet @@ -14,5 +15,5 @@ ] -app_name = "user" +app_name = RouterConfigEnum.USER urlpatterns = app_urls + router.urls diff --git a/backend/logs/EasyPost.log b/backend/logs/EasyPost.log index 90dcc9d4..bd405d24 100644 --- a/backend/logs/EasyPost.log +++ b/backend/logs/EasyPost.log @@ -8652,3 +8652,83 @@ Quit the server with CTRL-BREAK. \/_____/ \/_/\/_/ \/_____/ \/_____/ \/_/ \/_____/ \/_____/ \/_/ 2024-04-28 13:57:48 [django-main-thread]-[runserver.inner_run:124]-[INFO]:Daphne running, listening on %s:%s +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:02:51 [django-main-thread]-[runserver.log_action:171]-[INFO]:HTTP %(method)s %(path)s %(status)s [%(time_taken).2f, %(client)s] +2024-04-28 14:06:27 [django-main-thread]-[runserver.inner_run:91]-[INFO]:Performing system checks... + + +2024-04-28 14:06:27 [MainThread]-[base.start:181]-[INFO]:Scheduler started +2024-04-28 14:06:27 [APScheduler]-[base._process_jobs:954]-[DEBUG]:Looking for jobs to run +2024-04-28 14:06:27 [APScheduler]-[base._process_jobs:1030]-[DEBUG]:No jobs; waiting until a job is added +2024-04-28 14:06:27 [django-main-thread]-[runserver.inner_run:97]-[INFO]:April 28, 2024 - 14:06:27 +2024-04-28 14:06:27 [django-main-thread]-[runserver.inner_run:98]-[INFO]:Django version 5.0.4, using settings 'config.settings' +Starting ASGI/Daphne version 4.1.2 development server at http://localhost:8000/ +Quit the server with CTRL-BREAK. + + ______ ______ ______ __ __ ______ ______ ______ ______ + /\ ___\ /\ __ \ /\ ___\ /\ \_\ \ /\ == \ /\ __ \ /\ ___\ /\__ _\ + \ \ __\ \ \ __ \ \ \___ \ \ \____ \ \ \ _-/ \ \ \/\ \ \ \___ \ \/_/\ \/ + \ \_____\ \ \_\ \_\ \/\_____\ \/\_____\ \ \_\ \ \_____\ \/\_____\ \ \_\ + \/_____/ \/_/\/_/ \/_____/ \/_____/ \/_/ \/_____/ \/_____/ \/_/ + +2024-04-28 14:06:27 [django-main-thread]-[runserver.inner_run:124]-[INFO]:Daphne running, listening on %s:%s +2024-04-28 14:06:33 [django-main-thread]-[runserver.inner_run:91]-[INFO]:Performing system checks... + + +2024-04-28 14:06:34 [MainThread]-[base.start:181]-[INFO]:Scheduler started +2024-04-28 14:06:34 [APScheduler]-[base._process_jobs:954]-[DEBUG]:Looking for jobs to run +2024-04-28 14:06:34 [APScheduler]-[base._process_jobs:1030]-[DEBUG]:No jobs; waiting until a job is added +2024-04-28 14:06:34 [django-main-thread]-[runserver.inner_run:97]-[INFO]:April 28, 2024 - 14:06:34 +2024-04-28 14:06:34 [django-main-thread]-[runserver.inner_run:98]-[INFO]:Django version 5.0.4, using settings 'config.settings' +Starting ASGI/Daphne version 4.1.2 development server at http://localhost:8000/ +Quit the server with CTRL-BREAK. + + ______ ______ ______ __ __ ______ ______ ______ ______ + /\ ___\ /\ __ \ /\ ___\ /\ \_\ \ /\ == \ /\ __ \ /\ ___\ /\__ _\ + \ \ __\ \ \ __ \ \ \___ \ \ \____ \ \ \ _-/ \ \ \/\ \ \ \___ \ \/_/\ \/ + \ \_____\ \ \_\ \_\ \/\_____\ \/\_____\ \ \_\ \ \_____\ \/\_____\ \ \_\ + \/_____/ \/_/\/_/ \/_____/ \/_____/ \/_/ \/_____/ \/_____/ \/_/ + +2024-04-28 14:06:34 [django-main-thread]-[runserver.inner_run:124]-[INFO]:Daphne running, listening on %s:%s +2024-04-28 14:13:25 [django-main-thread]-[runserver.inner_run:91]-[INFO]:Performing system checks... + + +2024-04-28 14:13:25 [MainThread]-[base.start:181]-[INFO]:Scheduler started +2024-04-28 14:13:25 [APScheduler]-[base._process_jobs:954]-[DEBUG]:Looking for jobs to run +2024-04-28 14:13:25 [APScheduler]-[base._process_jobs:1030]-[DEBUG]:No jobs; waiting until a job is added +2024-04-28 14:13:26 [django-main-thread]-[runserver.inner_run:97]-[INFO]:April 28, 2024 - 14:13:26 +2024-04-28 14:13:26 [django-main-thread]-[runserver.inner_run:98]-[INFO]:Django version 5.0.4, using settings 'config.settings' +Starting ASGI/Daphne version 4.1.2 development server at http://localhost:8000/ +Quit the server with CTRL-BREAK. + + ______ ______ ______ __ __ ______ ______ ______ ______ + /\ ___\ /\ __ \ /\ ___\ /\ \_\ \ /\ == \ /\ __ \ /\ ___\ /\__ _\ + \ \ __\ \ \ __ \ \ \___ \ \ \____ \ \ \ _-/ \ \ \/\ \ \ \___ \ \/_/\ \/ + \ \_____\ \ \_\ \_\ \/\_____\ \/\_____\ \ \_\ \ \_____\ \/\_____\ \ \_\ + \/_____/ \/_/\/_/ \/_____/ \/_____/ \/_/ \/_____/ \/_____/ \/_/ + +2024-04-28 14:13:26 [django-main-thread]-[runserver.inner_run:124]-[INFO]:Daphne running, listening on %s:%s +2024-04-28 14:17:52 [django-main-thread]-[runserver.inner_run:91]-[INFO]:Performing system checks... + + +2024-04-28 14:17:53 [MainThread]-[base.start:181]-[INFO]:Scheduler started +2024-04-28 14:17:53 [APScheduler]-[base._process_jobs:954]-[DEBUG]:Looking for jobs to run +2024-04-28 14:17:53 [APScheduler]-[base._process_jobs:1030]-[DEBUG]:No jobs; waiting until a job is added +2024-04-28 14:17:53 [django-main-thread]-[runserver.inner_run:97]-[INFO]:April 28, 2024 - 14:17:53 +2024-04-28 14:17:53 [django-main-thread]-[runserver.inner_run:98]-[INFO]:Django version 5.0.4, using settings 'config.settings' +Starting ASGI/Daphne version 4.1.2 development server at http://localhost:8000/ +Quit the server with CTRL-BREAK. + + ______ ______ ______ __ __ ______ ______ ______ ______ + /\ ___\ /\ __ \ /\ ___\ /\ \_\ \ /\ == \ /\ __ \ /\ ___\ /\__ _\ + \ \ __\ \ \ __ \ \ \___ \ \ \____ \ \ \ _-/ \ \ \/\ \ \ \___ \ \/_/\ \/ + \ \_____\ \ \_\ \_\ \/\_____\ \/\_____\ \ \_\ \ \_____\ \/\_____\ \ \_\ + \/_____/ \/_/\/_/ \/_____/ \/_____/ \/_/ \/_____/ \/_____/ \/_/ + +2024-04-28 14:17:53 [django-main-thread]-[runserver.inner_run:124]-[INFO]:Daphne running, listening on %s:%s diff --git a/backend/logs/EasyPost_collect.log b/backend/logs/EasyPost_collect.log index 6a51c9d2..78f16f72 100644 --- a/backend/logs/EasyPost_collect.log +++ b/backend/logs/EasyPost_collect.log @@ -7201,3 +7201,11 @@ WARNING [2024-04-28 13:53:10,707] [69a533215b9740e4be748f42ed738e30] django.req WARNING [2024-04-28 13:53:14,412] [ddd00d3c1d0c4ae3b58bfd989d649519] django.request: Not Found: /media/avatar/default.png INFO [2024-04-28 13:57:46,209] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\backend\config\asgi.py changed, reloading. INFO [2024-04-28 13:57:47,364] [none] django.utils.autoreload: Watching for file changes with StatReloader +INFO [2024-04-28 14:06:26,058] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\backend\api\emus\__init__.py changed, reloading. +INFO [2024-04-28 14:06:27,005] [none] django.utils.autoreload: Watching for file changes with StatReloader +INFO [2024-04-28 14:06:32,583] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\backend\api\emus\__init__.py changed, reloading. +INFO [2024-04-28 14:06:33,564] [none] django.utils.autoreload: Watching for file changes with StatReloader +INFO [2024-04-28 14:13:24,366] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\backend\api\routers\database.py changed, reloading. +INFO [2024-04-28 14:13:25,374] [none] django.utils.autoreload: Watching for file changes with StatReloader +INFO [2024-04-28 14:17:51,596] [none] django.utils.autoreload: C:\Users\86135\Desktop\EasyPost\backend\api\routers\report.py changed, reloading. +INFO [2024-04-28 14:17:52,599] [none] django.utils.autoreload: Watching for file changes with StatReloader