Skip to content
Snippets Groups Projects
Commit 6d08df3d authored by ktongxue2018's avatar ktongxue2018
Browse files

modified: app/models.py 

	modified:   app/views.py
parent a8ad9389
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 23
− 20
View file @ 6d08df3d
......@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ce95be28-16fc-41cd-8c98-36369485281e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/app/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/views.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -27,13 +28,13 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="html" value="2" />
<entry key="py" value="482" />
<entry key="py" value="585" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="HTML" value="2" />
<entry key="Python" value="482" />
<entry key="Python" value="585" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
......@@ -52,11 +53,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="37" column="13" lean-forward="true" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
<state relative-caret-position="228">
<caret line="38" column="37" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="37" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
......@@ -152,13 +153,14 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="75" column="30" selection-start-line="75" selection-start-column="22" selection-end-line="75" selection-end-column="30" />
<state relative-caret-position="130">
<caret line="100" column="27" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
<folding>
<element signature="e#0#72#0" expanded="true" />
<marker date="1554563372847" expanded="true" signature="2166:2317" ph="..." />
</folding>
</state>
</provider>
......@@ -199,12 +201,12 @@
<option value="$PROJECT_DIR$/config.py" />
<option value="$PROJECT_DIR$/test.py" />
<option value="$PROJECT_DIR$/app/static/reg.html" />
<option value="$PROJECT_DIR$/app/models.py" />
<option value="$PROJECT_DIR$/app/views.py" />
<option value="$PROJECT_DIR$/app/models.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="36" />
<option name="y" value="32" />
<option name="width" value="1940" />
......@@ -389,7 +391,7 @@
<option name="totallyTimeSpent" value="27459000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="878" extended-state="7" />
<frame x="-7" y="-7" width="1550" height="878" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17965654" />
......@@ -397,7 +399,7 @@
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.50402147" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3941019" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
......@@ -541,22 +543,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models.py">
<entry file="file://$PROJECT_DIR$/app/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="75" column="30" selection-start-line="75" selection-start-column="22" selection-end-line="75" selection-end-column="30" />
<state relative-caret-position="228">
<caret line="38" column="37" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="37" />
<folding>
<element signature="e#0#72#0" expanded="true" />
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views.py">
<entry file="file://$PROJECT_DIR$/app/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="37" column="13" lean-forward="true" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
<state relative-caret-position="130">
<caret line="100" column="27" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<element signature="e#0#72#0" expanded="true" />
<marker date="1554563372847" expanded="true" signature="2166:2317" ph="..." />
</folding>
</state>
</provider>
......
app/__pycache__/models.cpython-37.pyc
+ 0
− 0
View file @ 6d08df3d
No preview for this file type
app/__pycache__/views.cpython-37.pyc
+ 0
− 0
View file @ 6d08df3d
No preview for this file type
app/models.py
+ 11
− 8
View file @ 6d08df3d
......@@ -74,16 +74,18 @@ class ldap_control:
return result
def check_in(self,username,email):
username = self.select_email_or_name(username)
email = self.select_email_or_name(email)
self.c.search(self.user_dn,f'({username})')
"""
if (self.c.entries == []):
self.c.search(self.user_dn,f'({email})')
if (self.c.entries == []):
return 1
else:
:param username:
:param email:
:return: 0验证失败 1验证成功
"""
if (self.mail_to_username(email)):
return 0
if (self.name_to_mail(username)):
return 0
return 1
def add_user(self,username,email,description,passwd):
"""
......@@ -96,6 +98,7 @@ class ldap_control:
self.keep()
if self.check_in(username,email) == 0:
print('userexixt')
return 0
att ={"cn":f'{username}',
"Mail":f"{email}",
......
app/views.py
+ 3
− 2
View file @ 6d08df3d
......@@ -34,8 +34,9 @@ def set_token():
return send_file('./static/reset.html')
elif request.method == "POST":
mail = request.form['mail']
username = l.mail_to_username(mail)
if ( l.check_in(mail,username)):
if ( l.mail_to_username(mail) ):
token = ts.dumps(mail,salt=salt )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment