1

data_manage/operate.py

@@ -153,12 +153,22 @@ def get_channel(arg):
     for _ in rsp.json()['data']:
         print(_['resourceName'])
         # if name_cahnnel in _['resourceName']:
+        # if name_cahnnel and name_cahnnel in _['resourceName']:
+        #     print("1----------->" + _['resourceName'])
+        #     data1.append({'id': _['id'], 'nick_name': _['resourceName']})
+        # if not name_cahnnel:
+        #     print("2----------->" + _['resourceName'])
+        #     data1.append({'id': _['id'], 'nick_name': _['resourceName']})
+
+
         if name_cahnnel and name_cahnnel in _['resourceName']:
             print("1----------->" + _['resourceName'])
-            data1.append({'id': _['id'], 'nick_name': _['resourceName']})
-        if not name_cahnnel:
-            print("2----------->" + _['resourceName'])
-            data1.append({'id': _['id'], 'nick_name': _['resourceName']})
+            if not name_cahnnel in _['resourceName']:
+                print("2----------->" + _['resourceName'])
+                data1.append({'id': _['id'], 'nick_name': _['resourceName']})
+            elif name_cahnnel in _['nickName']:
+                print("3----------->" + _['resourceName'])
+                data1.append({'id': _['id'], 'nick_name': _['resourceName']})
         
 
     # # 加上配置的号
@@ -173,9 +183,7 @@ def get_channel(arg):
     #         data3.append({'id': int(_), 'nick_name': channel_dict[int(_)]})
     # data4=[]
     # data4 = data1 + data3
-    print("----------->")
-    print(len(data1))
-    return data1[:500000]
+    return data1
 
 
 def get_pitcher(arg):