Merge branch 'feature-notify' into dev

merge: 合并feature-notify到dev分支"

Author: pedro

app/plugins/poem/README.md

@@ -5,7 +5,7 @@
 
 ## 获取所有诗词接口
 URL:
->GET http://localhost:5000/plugin/poem/demo/all
+>GET http://localhost:5000/plugin/poem/all
 
 Parameters:
 - count: （可选）获取的数量，最小1，最大100，默认5
@@ -15,26 +15,63 @@ Response:
 ```json
 [
     {
-        "author": "苏轼",
-        "content": "一别都门三改火/天涯踏尽红尘/依然一笑作春温/无波真古井/有节是秋筠/惆怅孤帆连夜发/送行淡月微云/尊前不用翠眉颦/人生如逆旅/我亦是行人",
+        "author": "欧阳修",
+        "content": [
+            [
+                "去年元夜时",
+                "花市灯如昼",
+                "月上柳梢头",
+                "人约黄昏后"
+            ],
+            [
+                "今年元夜时",
+                "月与灯依旧",
+                "不见去年人",
+                "泪湿春衫袖"
+            ]
+        ],
         "create_time": 1549438754000,
         "dynasty": "宋代",
-        "id": 2,
+        "id": 1,
         "image": "",
-        "title": "临江仙·送钱穆父"
+        "title": "生查子·元夕"
     },
     {
         "author": "苏轼",
-        "content": "花褪残红青杏小/燕子飞时/绿水人家绕/枝上柳绵吹又少/天涯何处无芳草/墙里秋千墙外道/墙外行人/墙里佳人笑/笑渐不闻声渐悄/多情却被无情恼",
+        "content": [
+            [
+                "一别都门三改火",
+                "天涯踏尽红尘",
+                "依然一笑作春温",
+                "无波真古井",
+                "有节是秋筠"
+            ],
+            [
+                "惆怅孤帆连夜发",
+                "送行淡月微云",
+                "尊前不用翠眉颦",
+                "人生如逆旅",
+                "我亦是行人"
+            ]
+        ],
         "create_time": 1549438754000,
         "dynasty": "宋代",
-        "id": 8,
+        "id": 2,
         "image": "",
-        "title": "蝶恋花·春景"
+        "title": "临江仙·送钱穆父"
     }
 ]
 ```
 
+Response_description:
+- author: 作者
+- content: 内容。是一个二维数组，第一维数组用来区分词的每一阙（如果是古诗，那么第一维数组中只有一个元素），第二维数组用来区分古诗词的每一句。
+- create_time: 创建时间
+- dynasty: 作者所属朝代
+- id: id号码
+- image: 配图
+- title: 标题
+
 
 ## 获取所有作者接口
 URL:
@@ -51,33 +88,3 @@ Response:
     "薛涛"
 ]
 ```
-
-## 搜索诗词接口
->GET http://localhost:5000/plugin/poem/search?q=浣溪沙
-
-Parameters:
-- q: （必填）查询关键字
-
-Response:
-```json
-[
-    {
-        "author": "晏殊",
-        "content": "一曲新词酒一杯/去年天气旧亭台/夕阳西下几时回/无可奈何花落去/似曾相识燕归来/小园香径独徘徊",
-        "create_time": 1549438754000,
-        "dynasty": "宋代",
-        "id": 6,
-        "image": "",
-        "title": "浣溪沙·一曲新词酒一杯"
-    },
-    {
-        "author": "纳兰性德",
-        "content": "残雪凝辉冷画屏/落梅横笛已三更/更无人处月胧明/我是人间惆怅客/知君何事泪纵横/断肠声里忆平生",
-        "create_time": 1549438754000,
-        "dynasty": "清代",
-        "id": 7,
-        "image": "",
-        "title": "浣溪沙·残雪凝辉冷画屏"
-    }
-]
-```

app/plugins/poem/app/model.py

@@ -10,9 +10,17 @@ class Poem(Base):
     title = Column(String(50), nullable=False, comment='标题')
     author = Column(String(50), default='未名', comment='作者')
     dynasty = Column(String(50), default='未知', comment='朝代')
-    content = Column(Text, nullable=False, comment='内容')
+    _content = Column('content', Text, nullable=False, comment='内容，以/来分割每一句，以|来分割宋词的上下片')
     image = Column(String(255), default='', comment='配图')
 
+    @property
+    def content(self):
+        ret = []
+        lis = self._content.split('|')
+        for x in lis:
+            ret.append(x.split('/'))
+        return ret
+
     def get_all(self, form):
         query = self.query.filter_by(delete_time=None)