Merge branch 'haow/dev' into 'test'

Haow/dev

See merge request alpha/saturn!9

api/urls.py

@@ -6,7 +6,15 @@ from .views import topic
 from .views import tag
 
 urlpatterns = [
+    # grasp
     url(r'^v1/update_grasp_status$', user.UpdateGraspStatus.as_view(), name='update_grasp_status$'),
+
+    # topic
     url(r'^v1/create_topic_for_batch$', topic.CreateTopicForBatch.as_view(), name='create_topic_for_batch'),
+
+    # tag
     url(r'^v1/create_tag_for_batch$', tag.CreateTagForBatch.as_view(), name='create_tag_for_batch'),
+
+    # user
+    url(r'^v1/user/shadow/list$', user.ShadowUserList.as_view(), name='create_tag_for_batch'),
 ]

api/utils/read_excel.py

@@ -11,7 +11,7 @@ PAGE_SIZE = 100
 
 
 def read_excel():
-    wb = open_workbook(filename='/Users/apple/Desktop/nice_tag20181225.xlsx')
+    wb = open_workbook(filename='/Users/haowei/Desktop/nice_tag20181225.xlsx')
 
     sheet1 = wb.sheet_by_index(0)
 
@@ -27,7 +27,7 @@ def read_excel():
 
 
 def create_tags(tags):
-    url='http://127.0.0.1:8090/api/v1/create_tag_for_batch'
+    url='http://39.107.208.122:80/api/v1/create_tag_for_batch'
 
     post_data = json.dumps(tags)
     textmod= {"tags": post_data}
@@ -44,10 +44,6 @@ def process():
     count = math.ceil(len(tags) / PAGE_SIZE)
     print(count)
     for i in range(0, count):
-        if i == 5:
-            break
-        if i < 4:
-            continue
         print(i)
         item = tags[PAGE_SIZE * i: PAGE_SIZE * i + PAGE_SIZE]
         # print(item, len(item))

api/views/base_view.py

@@ -380,3 +380,19 @@ class BaseViewLoginRequired(LoginRequiredMixin, BaseView):
 
     def __init__(self, *args, **kwargs):
         super(BaseViewLoginRequired, self).__init__(*args, **kwargs)
+
+
+def get_offset_count(request):
+
+    try:
+        page = int(request.GET.get('page', 1))
+    except:
+        page = 1
+    try:
+        count = int(request.GET.get('count', 10))
+    except:
+        count = 10
+
+    offset = count * (page-1)
+
+    return offset, count

api/views/user.py

 
-from api.views.base_view import BaseView
+from api.views.base_view import BaseView, get_offset_count
 
 
 class UpdateGraspStatus(BaseView):
@@ -18,3 +18,23 @@ class UpdateGraspStatus(BaseView):
             return self.error(error)
 
         return self.ok(data=_data)
+
+
+class ShadowUserList(BaseView):
+    '''
+    列表获取马甲用户
+    '''
+    def get(self, request):
+        offset, count = get_offset_count(request)
+        error, _data = self.call_rpc(
+            "venus/community/user/shadow/list", offset=offset, count=count
+        )
+        if error:
+            return self.error(error)
+        users = _data.get('users')
+        result = {
+            'users': [{'user_id': item.get('user_id')} for item in users if item],
+            'total': _data.get('total')
+            }
+
+        return self.ok(data=result)