|
|
@@ -112,9 +112,6 @@ def get_channel(arg):
|
|
|
user_id = arg.get('user_id')
|
|
|
name_cahnnel = arg.get('name')
|
|
|
pitcher_id = arg.get('pitcher_id')
|
|
|
- print("0------------------------->")
|
|
|
- print(user_id)
|
|
|
- print(pitcher_id)
|
|
|
# 获取公众号列表
|
|
|
g_time = int(time.time())
|
|
|
base_url = 'https://api.zanxiangnet.com'
|
|
|
@@ -122,7 +119,6 @@ def get_channel(arg):
|
|
|
g_token = get_g_token_sha256(g_time, params)
|
|
|
params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token, 'g_account': sha256_account})
|
|
|
url = base_url + params + '?' + params_other_urlencode
|
|
|
- print("1------------------------->"+url)
|
|
|
rsp = requests.get(url)
|
|
|
channel_list_all = []
|
|
|
channel_dict = {}
|
|
|
@@ -134,16 +130,13 @@ def get_channel(arg):
|
|
|
channel_list_all.append({'id': _['id'], 'nick_name': _['resourceName']})
|
|
|
channel_dict[_['id']] = _['resourceName']
|
|
|
|
|
|
- print("2------------------------->")
|
|
|
if user_id in super_auth() and not pitcher_id:
|
|
|
- print("10------------------------->")
|
|
|
# return channel_list_all[:100]
|
|
|
return channel_list_all
|
|
|
select_id = user_id
|
|
|
# 通过pitcher_id,来添加
|
|
|
if pitcher_id:
|
|
|
select_id = pitcher_id
|
|
|
- print("3------------------------->")
|
|
|
|
|
|
# 普通权限------java,获取本人对应拥有的公众号
|
|
|
g_time = int(time.time())
|
|
|
@@ -166,16 +159,21 @@ def get_channel(arg):
|
|
|
elif name_cahnnel in _['nickName']:
|
|
|
data1.append({'id': _['id'], 'nick_name': _['resourceName']})
|
|
|
|
|
|
+ print("10------------------------->")
|
|
|
# # 加上配置的号
|
|
|
sql2 = f"""select GROUP_CONCAT(channel_ids) from user_channel_group_auth a
|
|
|
left join channel_group b on a.channel_group_id=b.id
|
|
|
where user_id={select_id}"""
|
|
|
+ print("11------------------------->")
|
|
|
data2 = db.quchen_text.getOne(sql2)
|
|
|
+ print("12------------------------->")
|
|
|
data3 = []
|
|
|
if data2:
|
|
|
+ print("14------------------------->")
|
|
|
data2_2 = tuple(data2.split(','))
|
|
|
for _ in data2_2:
|
|
|
data3.append({'id': int(_), 'nick_name': channel_dict[int(_)]})
|
|
|
+ print("13------------------------->")
|
|
|
data4 = data1 + data3
|
|
|
print("5------------------------->"+data4)
|
|
|
return data4[:100] # 给100个
|
cola