merge: 合并notify和dev

Author: pedro

app/api/cms/admin.py

@@ -80,6 +80,8 @@ def delete_user(id):
     user = manager.user_model.get(id=id)
     if user is None:
         raise NotFound(msg='用户不存在')
+    # user.delete(commit=True)
+    # 此处我们使用硬删除，一般情况下，推荐使用软删除即，上一行注释的代码
     user.hard_delete(commit=True)
     return Success(msg='操作成功')
 

app/plugins/poem/app/model.py

@@ -34,7 +34,6 @@ def get_all(self, form):
 
         if not poems:
             raise NotFound(msg='没有找到相关诗词')
-
         return poems
 
     def search(self, q):

tests/test_admin.py

@@ -18,11 +18,21 @@ def test_authority():
         assert rv.status_code == 200
 
 
+def test_delete_user():
+    with app.test_client() as c:
+        rv = c.delete('/cms/admin/6', headers={
+            'Authorization': 'Bearer ' + get_token()
+        })
+        json_data = rv.get_json()
+        print(json_data)
+        assert rv.status_code == 201
+
+
 def test_get_admin_users():
     with app.test_client() as c:
         rv = c.get('/cms/admin/users', headers={
             'Authorization': 'Bearer ' + get_token()
         })
         json_data = rv.get_json()
-        print(json_data)
+        print(len(json_data['collection']))
         assert rv.status_code == 200

tests/token.json

@@ -1,4 +1 @@
-{
-  "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NDc1NjMwMjEsIm5iZiI6MTU0NzU2MzAyMSwianRpIjoiZjIwMjAzYWQtOTg0Ny00Nzg3LTlkM2YtYmUyY2ZkOThiYzY1IiwiZXhwIjoxNTQ3NTY2NjIxLCJpZGVudGl0eSI6MSwiZnJlc2giOmZhbHNlLCJ0eXBlIjoiYWNjZXNzIn0.vAy2znthIUZW6Fm5Jsq1Jcg8FTaubAuNd0WYTPNW9_U",
-  "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NDc1NjMwMjEsIm5iZiI6MTU0NzU2MzAyMSwianRpIjoiZDIzZmRhZTctYTI5Ni00NjRlLWE3ZDItMzlkYWJiNTc5MWFhIiwiZXhwIjoxNTUwMTU1MDIxLCJpZGVudGl0eSI6MSwidHlwZSI6InJlZnJlc2gifQ.cXfLXc5jT_kOg1Xko1L73_o0F-2ACWtlMFj-OJTRoxI"
-}
+{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NDg4MzQxNzQsIm5iZiI6MTU0ODgzNDE3NCwianRpIjoiNWI5OTAyMTAtZDg1YS00ZGUzLTgwMWQtYTAwMzc0ZDViODZkIiwiZXhwIjoxNTQ4ODM3Nzc0LCJpZGVudGl0eSI6MSwiZnJlc2giOmZhbHNlLCJ0eXBlIjoiYWNjZXNzIn0.CXd3YAKstysb3SoU5yv7btdToSnCOnDnyenCrjKDZpM", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NDg4MzQxNzQsIm5iZiI6MTU0ODgzNDE3NCwianRpIjoiOTcyZjEwZjMtYWJiYy00NWUyLWFkMzQtYTY4ZTIyNzc3OGYwIiwiZXhwIjoxNTUxNDI2MTc0LCJpZGVudGl0eSI6MSwidHlwZSI6InJlZnJlc2gifQ.sqN6tD5exnhS6BmBQcsZKZlFHWnodY9nkGAKjFEYD9g"}