2du hace 4 años
padre
commit
261ff3c9e5
Se han modificado 4 ficheros con 14 adiciones y 14 borrados
  1. 8 9
      app.py
  2. 4 3
      route/login_pass_find.py
  3. 1 1
      route/login_pass_find_email.py
  4. 1 1
      version.json

+ 8 - 9
app.py

@@ -749,7 +749,7 @@ def user_star_doc_name(name = 'Test'):
 
 # login -> login/2fa -> login/2fa/email with login_id
 # register -> register/email -> regiter/email/check with reg_id
-# pass_find -> passfind/email with find_id
+# pass_find -> pass_find/email with find_id
 
 @app.route('/login', methods = ['POST', 'GET'])
 def login_login():
@@ -781,15 +781,14 @@ def login_register_email_check():
 def login_register_submit():
     return login_register_submit_2(conn)
 
-@app.route('/<regex("need_email"):tool>', methods = ['POST', 'GET'])
-@app.route('/<regex("pass_find"):tool>', methods = ['POST', 'GET'])
-def login_need_email(tool = 'pass_find'):
-    return login_need_email_2(conn, tool)
+# 개편 필요
+@app.route('/pass_find', methods = ['POST', 'GET'])
+def login_pass_find():
+    return login_pass_find_2(conn, 'pass_find')
 
-@app.route('/<regex("check_key"):tool>', methods = ['POST', 'GET'])
-@app.route('/<regex("check_pass_key"):tool>', methods = ['POST', 'GET'])
-def login_check_key(tool = 'check_pass_key'):
-    return login_check_key_2(conn, tool)
+@app.route('/pass_find/email', methods = ['POST', 'GET'])
+def login_pass_find_email():
+    return login_pass_find_email_2(conn, 'check_key')
 
 @app.route('/logout')
 def login_logout():

+ 4 - 3
route/login_need_email.py → route/login_pass_find.py

@@ -1,6 +1,7 @@
 from .tool.func import *
 
-def login_need_email_2(conn, tool):
+# 개편 필요
+def login_pass_find_2(conn, tool):
     curs = conn.cursor()
     
     if flask.request.method == 'POST':
@@ -53,7 +54,7 @@ def login_need_email_2(conn, tool):
             if send_email(user_email, t_text, i_text) == 0:
                 return re_error('/error/18')
 
-            return redirect('/check_key')
+            return redirect('/pass_find/email')
         else:
             curs.execute(db_change('select id from user_set where name = "email" and data = ?'), [user_email])
             if curs.fetchall():
@@ -70,7 +71,7 @@ def login_need_email_2(conn, tool):
 
             flask.session['c_email'] = user_email
 
-            return redirect('/check_key')
+            return redirect('/pass_find/email')
     else:
         if tool == 'pass_find':
             curs.execute(db_change('select data from other where name = "password_search_text"'))

+ 1 - 1
route/login_check_key.py → route/login_pass_find_email.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def login_check_key_2(conn, tool):
+def login_pass_find_email_2(conn, tool):
     curs = conn.cursor()
 
     if  flask.request.method == 'POST' or \

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev (stable1) (beta1) (dev3)",
+        "r_ver" : "v3.5.0-dev (stable1) (beta2) (dev3)",
         "c_ver" : "3500101",
         "s_ver" : "3500101"
     }