kahluaband#21 Feat: merge conflict 08.10

kjiyun · Aug 10, 2023 · 75ce31f · 75ce31f
2 parents e75c3d0 + beab4b5
commit 75ce31f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/kahluaproject/settings.py b/kahluaproject/settings.py
@@ -30,6 +30,11 @@
 IAMPORT_KEY = env('IAMPORT_KEY')
 IAMPORT_SECRET = env('IAMPORT_SECRET')
 
+NCP_SERVICE_ID = env('NCP_SERVICE_ID')
+NCP_SECRET_KEY = env('NCP_SECRET_KEY')
+NCP_ACCESS_KEY_ID = env('NCP_ACCESS_KEY_ID')
+
+SENDER_PHONE_NUM = env('SENDER_PHONE_NUM')
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/

diff --git a/users/views/base_views.py b/users/views/base_views.py
@@ -6,6 +6,7 @@
 from rest_framework import serializers
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.generics import CreateAPIView, GenericAPIView, RetrieveAPIView, UpdateAPIView
+from rest_framework_simplejwt.tokens import RefreshToken
 
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema