Surplus_Up (2DU) 7 лет назад
Родитель
Сommit
e5c52e44c8
2 измененных файлов с 21 добавлено и 8 удалено
  1. 3 4
      .gitignore
  2. 18 4
      route/api_topic_sub.py

+ 3 - 4
.gitignore

@@ -1,11 +1,10 @@
-set.json
-
 __pycache__
 /app_session
 .vscode
 
 *.db
 *.db-journal
+
 images
 robots.txt
 
@@ -14,5 +13,5 @@ views/yousoro
 views/super_lite
 views/buma
 views/before_namu
-views/acme/
-views/sl-open/
+views/acme
+views/sl-open

+ 18 - 4
route/api_topic_sub.py

@@ -3,17 +3,31 @@ from .tool.func import *
 def api_topic_sub_2(conn, name, sub, time):
     curs = conn.cursor()
 
-    if flask.request.args.get('time', None):
-        curs.execute("select id, data, ip from topic where title = ? and sub = ? and date >= ? order by id + 0 asc", [name, sub, flask.request.args.get('time', None)])
+    if flask.request.args.get('num', None):
+        if flask.request.args.get('over', '0') == '0':
+            curs.execute("select id, data, date, ip from topic where title = ? and sub = ? and id + 0 = ? + 0 order by id + 0 asc", [name, sub, flask.request.args.get('num', '')])
+        elif flask.request.args.get('over', '0') == '1':
+            curs.execute("select id, data, date, ip from topic where title = ? and sub = ? and id + 0 >= ? + 0 order by id + 0 asc", [name, sub, flask.request.args.get('num', '')])
+        else:
+            curs.execute("select id, data, date, ip from topic where title = ? and sub = ? and id + 0 <= ? + 0 order by id + 0 asc", [name, sub, flask.request.args.get('num', '')])
+    elif flask.request.args.get('time', None):
+        if flask.request.args.get('over', '0') == '0':
+            curs.execute("select id, data, date, ip from topic where title = ? and sub = ? and date = ? order by id + 0 asc", [name, sub, flask.request.args.get('time', '')])
+        if flask.request.args.get('over', '0') == '1':
+            curs.execute("select id, data, date, ip from topic where title = ? and sub = ? and date >= ? order by id + 0 asc", [name, sub, flask.request.args.get('time', '')])
+        else:
+            curs.execute("select id, data, date, ip from topic where title = ? and sub = ? and date <= ? order by id + 0 asc", [name, sub, flask.request.args.get('time', '')])
     else:
-        curs.execute("select id, data, ip from topic where title = ? and sub = ? order by id + 0 asc", [name, sub])
+        curs.execute("select id, data, date, ip from topic where title = ? and sub = ? order by id + 0 asc", [name, sub])
+
     data = curs.fetchall()
     if data:
         json_data = {}
         for i in data:
             json_data[i[0]] =   {
                 "data" : i[1],
-                "id" : i[2]
+                "date" : i[2],
+                "id" : i[3]
             }
 
         return flask.jsonify(json_data)