Procházet zdrojové kódy

효율적인 방안으로 수정

잉여개발기 před 1 rokem
rodič
revize
1582b863e2

+ 4 - 4
app.py

@@ -799,8 +799,8 @@ app.route('/api/xref_this/<int:page>/<everything:name>', defaults = { 'xref_type
 app.route('/api/random')(api_w_random)
 
 app.route('/api/bbs/w/<sub_code>')(api_bbs_w)
-app.route('/api/bbs/w/comment/<sub_code>')(api_bbs_w_comment)
-app.route('/api/bbs/w/comment_one/<sub_code>')(api_bbs_w_comment_one)
+app.route('/api/bbs/w/comment/<sub_code>')(api_bbs_w_comment_exter)
+app.route('/api/bbs/w/comment_one/<sub_code>')(api_bbs_w_comment_one_exter)
 
 app.route('/api/version', defaults = { 'version_list' : version_list })(api_version)
 app.route('/api/skin_info')(api_skin_info)
@@ -859,8 +859,8 @@ app.route('/api/v2/bbs/set/<int:bbs_num>/<name>', methods = ['GET', 'PUT'])(api_
 app.route('/api/v2/bbs/in/<int:bbs_num>/<int:page>')(api_bbs)
 app.route('/api/v2/bbs/w/<sub_code>', defaults = { 'legacy' : '' })(api_bbs_w)
 app.route('/api/v2/bbs/w/tabom/<sub_code>', methods = ['GET', 'POST'])(api_bbs_w_tabom)
-app.route('/api/v2/bbs/w/comment/<sub_code>/<tool>', defaults = { 'legacy' : '' })(api_bbs_w_comment)
-app.route('/api/v2/bbs/w/comment_one/<sub_code>/<tool>', defaults = { 'legacy' : '' })(api_bbs_w_comment_one)
+app.route('/api/v2/bbs/w/comment/<sub_code>/<tool>', defaults = { 'legacy' : '' })(api_bbs_w_comment_exter)
+app.route('/api/v2/bbs/w/comment_one/<sub_code>/<tool>', defaults = { 'legacy' : '' })(api_bbs_w_comment_one_exter)
 
 app.route('/api/v2/doc_star_doc/<int:num>/<everything:name>', defaults = { 'do_type' : 'star_doc' })(api_w_watch_list)
 app.route('/api/v2/doc_watch_list/<int:num>/<everything:name>')(api_w_watch_list)

+ 2 - 2
route/__init__.py

@@ -208,8 +208,8 @@ from route.go_api_bbs_list import api_bbs_list
 from route.go_api_bbs_w import api_bbs_w
 from route.go_api_bbs_w_set import api_bbs_w_set
 from route.go_api_bbs_w_tabom import api_bbs_w_tabom
-from route.go_api_bbs_w_comment import api_bbs_w_comment
-from route.go_api_bbs_w_comment_one import api_bbs_w_comment_one
+from route.go_api_bbs_w_comment import api_bbs_w_comment, api_bbs_w_comment_exter
+from route.go_api_bbs_w_comment_one import api_bbs_w_comment_one, api_bbs_w_comment_one_exter
 
 from route.go_api_setting import api_setting
 

+ 2 - 2
route/bbs_w_edit.py

@@ -19,7 +19,7 @@ async def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
             return redirect(conn, '/bbs/main')
         
         if comment_num != '':
-            temp_dict = orjson.loads((await api_bbs_w_comment_one(bbs_num_str + '-' + post_num_str + '-' + comment_num)).get_data(as_text = True))
+            temp_dict = await api_bbs_w_comment_one(bbs_num_str + '-' + post_num_str + '-' + comment_num)
             if 'comment_user_id' in temp_dict:
                 if not temp_dict['comment_user_id'] == ip and acl_check('', 'owner_auth', '', '') == 1:
                     return re_error(conn, 0)
@@ -92,7 +92,7 @@ async def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
             option_display = ''
 
             if comment_num != '':
-                temp_dict = orjson.loads((await api_bbs_w_comment_one(bbs_num_str + '-' + post_num_str + '-' + comment_num)).get_data(as_text = True))
+                temp_dict = await api_bbs_w_comment_one(bbs_num_str + '-' + post_num_str + '-' + comment_num)
 
                 title = ''
                 data = temp_dict['comment']

+ 1 - 1
route/bbs_w_post.py

@@ -14,7 +14,7 @@ async def bbs_w_post_comment(conn, user_id, sub_code, comment_num, bbs_num_str,
     comment_count = 0
     comment_add_count = 0
 
-    thread_data = orjson.loads((await api_bbs_w_comment(sub_code)).get_data(as_text = True))
+    thread_data = await api_bbs_w_comment(sub_code)
 
     for temp_dict in thread_data:
         if temp_dict['comment_user_id'] != '':

+ 4 - 1
route/go_api_bbs_w_comment.py

@@ -7,4 +7,7 @@ async def api_bbs_w_comment(sub_code = '', tool = "", legacy = 'on'):
     other_set["legacy"] = legacy
     other_set["ip"] = ip_check()
 
-    return flask.Response(response = (await python_to_golang(sys._getframe().f_code.co_name, other_set)), status = 200, mimetype = 'application/json')
+    return await python_to_golang(sys._getframe().f_code.co_name, other_set)
+
+async def api_bbs_w_comment_exter(sub_code = '', tool = "", legacy = 'on'):
+    return flask.Response(response = await api_bbs_w_comment(sub_code, tool, legacy), status = 200, mimetype = 'application/json')

+ 4 - 1
route/go_api_bbs_w_comment_one.py

@@ -7,4 +7,7 @@ async def api_bbs_w_comment_one(sub_code = '', legacy = 'on', tool = ''):
     other_set["tool"] = tool
     other_set["ip"] = ip_check()
 
-    return flask.Response(response = (await python_to_golang(sys._getframe().f_code.co_name, other_set)), status = 200, mimetype = 'application/json')
+    return await python_to_golang(sys._getframe().f_code.co_name, other_set)
+
+async def api_bbs_w_comment_one_exter(sub_code = '', legacy = 'on', tool = ''):
+    return flask.Response(response = await api_bbs_w_comment_one(sub_code, legacy, tool), status = 200, mimetype = 'application/json')

+ 1 - 1
route/view_raw.py

@@ -67,7 +67,7 @@ async def view_raw(name = '', topic_num = '', num = '', doc_acl = 0, bbs_num = '
 
         if bbs_num != '' and post_num != '':
             if comment_num != '':
-                data = orjson.loads((await api_bbs_w_comment_one(bbs_num_str + '-' + post_num_str + '-' + comment_num)).get_data(as_text = True))
+                data = await api_bbs_w_comment_one(bbs_num_str + '-' + post_num_str + '-' + comment_num)
                 sub_data = orjson.loads(api_bbs_w(bbs_num_str + '-' + post_num_str).data)
             else:
                 data = orjson.loads(api_bbs_w(bbs_num_str + '-' + post_num_str).data)