Merge remote-tracking branch 'origin/dev' into dev

eed859c0 · 赵杰 · 4770717b · 46c2c770 · eed859c0 · eed859c0
Commit eed859c0 authored Nov 23, 2020 by 赵杰
9 changed files
--- a/app/api/__main__.py
+++ b/app/api/__main__.py
@@ -9,4 +9,5 @@
 from app.api.app import app
 if __name__ == '__main__':
-    app.run('127.0.0.1', port=8000)
+    app.run('127.0.0.1', port=8000, debug=True)
--- a/app/api/app.py
+++ b/app/api/app.py
@@ -9,7 +9,9 @@
 from flask import Flask
 from flask_restful import Api
+from app.router.version1 import add_route
+from app.api.engine import work_dir
-app = Flask(__name__)
+app = Flask(__name__, template_folder=work_dir+'/app/templates')
 api = Api(app)
+add_route(api)
--- a/app/controller/order.py
+++ b/app/controller/order.py
@@ -7,7 +7,8 @@
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
 from flask_restful import Resource, reqparse
-from flask import request
+from flask import request, render_template
+from flask import make_response
 class OrderHandlers(Resource):
@@ -19,10 +20,17 @@ class OrderHandlers(Resource):
    def get(self):
        """."""
-        self.parser.add_argument('product_id',type=str,required=True,help='商品ID不能为空')
+        # self.parser.add_argument('product_id',type=str,required=True,help='商品ID不能为空')
-        args = self.parser.parse_args()
+        # args = self.parser.parse_args()
-        print(args)
+        STUDENT_LIST = [
-        return {'data': 'world'}
+            {'name': 'pj', 'age': 38, 'gender': '中'},
+            {'name': 'lc', 'age': 73, 'gender': '男'},
+            {'name': 'fy', 'age': 84, 'gender': '女'}
+        ]
+        params = {'a': 'hello', 'b': 'world'}
+        resp = make_response(render_template('student.html', student=STUDENT_LIST, params=params))
+        resp.headers['Content-Type'] = 'text/html'
+        return resp
    def post(self):
        """."""

--- a/app/router/version1.0.py
+++ b/app/router/version1.0.py
@@ -7,7 +7,8 @@
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
-from app.api.app import api
 from app.controller.order import *
-api.add_resource(OrderHandlers, '/tamp_course_order/order')
+def add_route(api):
+    """注册路由"""
+    api.add_resource(OrderHandlers, '/tamp_course_order/order')
--- a/app/templates/__init__.py
+++ b/app/templates/__init__.py
+# -*- encoding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# @File Name  : __init__.py.py
+# @Time       : 2020/11/23 下午2:54
+# @Author     : X. Peng
+# @Email      : acepengxiong@163.com
+# @Software   : PyCharm
+# -----------------------------------------------------------------------------
--- a/app/templates/student.html
+++ b/app/templates/student.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Old Boy EDU</title>
+</head>
+<body>
+Welcome to Old Boy EDU
+{{params.a}}{{params.b}}
+<div>{{ student }}</div>
+<table border="1xp">
+    {% for foo in student %}
+        <tr>
+            <td>{{ foo.name }}</td>
+            <td>{{ foo.get("age") }}</td>
+            <td>{{ foo["gender"] }}</td>
+        </tr>
+    {% endfor %}
+</table>
+</body>
+</html>
\ No newline at end of file
--- a/app/utils/draw.py
+++ b/app/utils/draw.py
--- a/app/utils/html_to_pdf.py
+++ b/app/utils/html_to_pdf.py
@@ -24,9 +24,9 @@ def html_to_pdf():
    }
    url1 = 'http://www.qimontech.com'
    # url = 'http://baidu.com'
-    # url2 = 'https://www.cnblogs.com/zzb-yp/p/11512616.html'
+    url2 = 'https://manage.meerkat.top'
-    # pdfkit.from_url(url1, '/Users/pengxiong/Desktop/out5.pdf', options=options)
+    pdfkit.from_url(url1, '/Users/pengxiong/Desktop/out5.pdf', options=options)
-    pdfkit.from_file('/Users/pengxiong/Desktop/monthReport.html', '/Users/pengxiong/Desktop/out5.pdf', options=options)
+    # pdfkit.from_file('/Users/pengxiong/Desktop/monthReport.html', '/Users/pengxiong/Desktop/out5.pdf', options=options)
 def merge_pdf(pdfFiles, target_file='/Users/pengxiong/Desktop/combine.pdf'):
    """"""
    merger = PdfFileMerger()

--- a/logs/tamp_course_order.log
+++ b/logs/tamp_course_order.log