diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..0e40fe8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ + +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/ad-password-self-service.iml b/.idea/ad-password-self-service.iml new file mode 100644 index 0000000..73b1a3d --- /dev/null +++ b/.idea/ad-password-self-service.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 0000000..39466c1 --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8656114 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..73f30b2 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/resetpwd/utils/__init__.py b/resetpwd/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/resetpwd/ad.py b/resetpwd/utils/ad.py similarity index 100% rename from resetpwd/ad.py rename to resetpwd/utils/ad.py diff --git a/resetpwd/crypto.py b/resetpwd/utils/crypto.py similarity index 100% rename from resetpwd/crypto.py rename to resetpwd/utils/crypto.py diff --git a/resetpwd/dingding.py b/resetpwd/utils/dingding.py similarity index 100% rename from resetpwd/dingding.py rename to resetpwd/utils/dingding.py diff --git a/resetpwd/form.py b/resetpwd/utils/form.py similarity index 100% rename from resetpwd/form.py rename to resetpwd/utils/form.py diff --git a/resetpwd/pwdcheck.py b/resetpwd/utils/pwdcheck.py similarity index 97% rename from resetpwd/pwdcheck.py rename to resetpwd/utils/pwdcheck.py index 0c611eb..fadea44 100644 --- a/resetpwd/pwdcheck.py +++ b/resetpwd/utils/pwdcheck.py @@ -2,7 +2,7 @@ from django.shortcuts import render, reverse, HttpResponsePermanentRedirect, red from django.http import * from django.contrib import messages from dingtalk import * -from .models import * +from resetpwd.models import * from .crypto import Crypto from .ad import ad_get_user_locked_status_by_mail, ad_unlock_user_by_mail, ad_reset_user_pwd_by_mail, \ ad_get_user_status_by_mail, ad_ensure_user_by_mail, ad_modify_user_pwd_by_mail diff --git a/resetpwd/views.py b/resetpwd/views.py index a72ec02..af6c63c 100644 --- a/resetpwd/views.py +++ b/resetpwd/views.py @@ -1,12 +1,12 @@ from django.shortcuts import render from django.http import * -from .crypto import Crypto -from .ad import ad_get_user_locked_status_by_mail, ad_unlock_user_by_mail, ad_reset_user_pwd_by_mail, \ +from resetpwd.utils.crypto import Crypto +from resetpwd.utils.ad import ad_get_user_locked_status_by_mail, ad_unlock_user_by_mail, ad_reset_user_pwd_by_mail, \ ad_get_user_status_by_mail, ad_ensure_user_by_mail, ad_modify_user_pwd_by_mail -from .dingding import ding_get_userinfo_detail, ding_get_userid_by_unionid, \ +from resetpwd.utils.dingding import ding_get_userinfo_detail, ding_get_userid_by_unionid, \ ding_get_persistent_code, ding_get_access_token from pwdselfservice.local_settings import * -from .form import CheckForm +from resetpwd.utils.form import CheckForm import logging