|
@@ -1,4 +1,7 @@
|
|
|
import requests
|
|
|
+import time
|
|
|
+from urllib.parse import urlencode
|
|
|
+from model.UserAuthUtils import get_g_token
|
|
|
from model.DateUtils import DateUtils
|
|
|
from model.DataBaseUtils import *
|
|
|
from model.UserAuthUtils import super_auth
|
|
@@ -7,19 +10,33 @@ du = DateUtils()
|
|
|
|
|
|
|
|
|
def user_channel(arg):
|
|
|
- rsp = requests.get('http://api.zanxiangnet.com/system/api/mp/mpAccount/search/3')
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = '/erp/api/resource/search/3'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ url = base_url + params + '?' + params_other_urlencode
|
|
|
+ rsp = requests.get(url)
|
|
|
channel_list = []
|
|
|
for _ in rsp.json()['data']:
|
|
|
- channel_list.append({'id': _['id'], 'nick_name': _['nickName']})
|
|
|
+ channel_list.append({'id': _['id'], 'nick_name': _['resourceName']})
|
|
|
return channel_list
|
|
|
|
|
|
|
|
|
def user_channel_group(arg):
|
|
|
db = MysqlUtils()
|
|
|
- rsp = requests.get('http://api.zanxiangnet.com/system/api/mp/mpAccount/search/3')
|
|
|
+
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = '/erp/api/resource/search/3'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ url = base_url + params + '?' + params_other_urlencode
|
|
|
+ rsp = requests.get(url)
|
|
|
+
|
|
|
channel_dict = {}
|
|
|
for _ in rsp.json()['data']:
|
|
|
- channel_dict[str(_['id'])] = _['nickName']
|
|
|
+ channel_dict[str(_['id'])] = _['resourceName']
|
|
|
user_id = arg.get('user_id')
|
|
|
if user_id:
|
|
|
sql = f"""SELECT id,name,channel_ids from channel_group where id in
|
|
@@ -39,7 +56,14 @@ def user_channel_group(arg):
|
|
|
def user(arg):
|
|
|
# 在2021-9月之后不被前端使用
|
|
|
# 返回所有用户
|
|
|
- rsp = requests.get('http://api.zanxiangnet.com/erp/api/user/search/3?powerLevelMin=0')
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = '/erp/api/user/search/3'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ url = base_url + params + '?' + params_other_urlencode
|
|
|
+ rsp = requests.get(url)
|
|
|
+
|
|
|
user_list = []
|
|
|
for _ in rsp.json()['data']:
|
|
|
user_list.append({'user_id': _['userId'], 'nick_name': _['nickName']})
|
|
@@ -79,23 +103,31 @@ def group_auth_del(arg):
|
|
|
group_id = arg.get("group_id")
|
|
|
if user_id and group_id:
|
|
|
sql = f"delete from user_channel_group_auth where user_id={user_id} and channel_group_id={group_id}"
|
|
|
- # print(sql)
|
|
|
db.quchen_text.execute(sql)
|
|
|
|
|
|
|
|
|
def get_channel(arg):
|
|
|
db = MysqlUtils()
|
|
|
user_id = arg.get('user_id')
|
|
|
- name = arg.get('name')
|
|
|
+ name_cahnnel = arg.get('name')
|
|
|
pitcher_id = arg.get('pitcher_id')
|
|
|
# 获取公众号列表
|
|
|
- rsp = requests.get('http://api.zanxiangnet.com/system/api/mp/mpAccount/search/3')
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = '/erp/api/resource/search/3'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ url = base_url + params + '?' + params_other_urlencode
|
|
|
+ rsp = requests.get(url)
|
|
|
channel_list_all = []
|
|
|
channel_dict = {}
|
|
|
for _ in rsp.json()['data']:
|
|
|
# channel_list.append((_['id'], _['nickName']))
|
|
|
- channel_list_all.append({'id': _['id'], 'nick_name': _['nickName']})
|
|
|
- channel_dict[_['id']] = _['nickName']
|
|
|
+ if name_cahnnel and name_cahnnel in _['resourceName']:
|
|
|
+ channel_list_all.append({'id': _['id'], 'nick_name': _['resourceName']})
|
|
|
+ if not name_cahnnel:
|
|
|
+ channel_list_all.append({'id': _['id'], 'nick_name': _['resourceName']})
|
|
|
+ channel_dict[_['id']] = _['resourceName']
|
|
|
if user_id in super_auth() and not pitcher_id:
|
|
|
return channel_list_all[:100]
|
|
|
select_id = user_id
|
|
@@ -104,12 +136,23 @@ def get_channel(arg):
|
|
|
select_id = pitcher_id
|
|
|
|
|
|
# 普通权限------java,获取本人对应拥有的公众号
|
|
|
- rsp = requests.get(f'http://api.zanxiangnet.com/system/api/mp/mpAccount/subAccountWithUser/3/{select_id}')
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = '/erp/api/resource/search/3'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ params_other = f'?userIds={user_id}'
|
|
|
+ url = base_url + params + params_other + '&' + params_other_urlencode
|
|
|
+ rsp = requests.get(url)
|
|
|
+
|
|
|
channel_list = rsp.json()['data']
|
|
|
data1 = []
|
|
|
for _ in channel_list:
|
|
|
- if name in _['nickName']:
|
|
|
- data1.append({'id': _['id'], 'nick_name': _['nickName']})
|
|
|
+ if name_cahnnel in _['resourceName']:
|
|
|
+ if not name_cahnnel:
|
|
|
+ data1.append({'id': _['id'], 'nick_name': _['resourceName']})
|
|
|
+ elif name_cahnnel in _['nickName']:
|
|
|
+ data1.append({'id': _['id'], 'nick_name': _['resourceName']})
|
|
|
|
|
|
# # 加上配置的号
|
|
|
sql2 = f"""select GROUP_CONCAT(channel_ids) from user_channel_group_auth a
|
|
@@ -129,22 +172,43 @@ def get_pitcher(arg):
|
|
|
user_id = arg.get('user_id')
|
|
|
if user_id in super_auth():
|
|
|
user_list = []
|
|
|
- url = 'http://api.zanxiangnet.com/system/api/mp/mpAccount/allPutUser/3'
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = '/erp/api/user/search/3'
|
|
|
+ params_others = '?resourceTags=投手'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ url = base_url + params + params_others + '&' + params_other_urlencode
|
|
|
rsp = requests.get(url)
|
|
|
+
|
|
|
for _ in rsp.json()['data']:
|
|
|
user_list.append({'user_id': _['userId'], 'nick_name': _['nickName']})
|
|
|
return user_list
|
|
|
|
|
|
user_list = []
|
|
|
- rsp = requests.get(url=f'http://api.zanxiangnet.com/erp/api/user/subUser/3/{user_id}')
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = f'/erp/api/user/subUser/3/{user_id}'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ url = base_url + params + '?' + params_other_urlencode
|
|
|
+ rsp = requests.get(url)
|
|
|
+
|
|
|
for _ in rsp.json()['data']:
|
|
|
user_list.append({'user_id': _['userId'], 'nick_name': _['nickName']})
|
|
|
return user_list
|
|
|
|
|
|
|
|
|
def get_user_name_by_id(user_id):
|
|
|
- rsp = requests.get(url=f'http://api.zanxiangnet.com/erp/api/user/subUser/3/{user_id}')
|
|
|
+ g_time = int(time.time())
|
|
|
+ base_url = 'https://api.zanxiangnet.com'
|
|
|
+ params = f'/erp/api/user/subUser/3/{user_id}'
|
|
|
+ g_token = get_g_token(g_time, params)
|
|
|
+ params_other_urlencode = urlencode({'g_time': g_time, 'g_token': g_token})
|
|
|
+ url = base_url + params + '?' + params_other_urlencode
|
|
|
+ rsp = requests.get(url)
|
|
|
nick_name = None
|
|
|
+
|
|
|
for _ in rsp.json()['data']:
|
|
|
if str(_['userId']) == str(user_id):
|
|
|
nick_name = _['nickName']
|
|
@@ -152,14 +216,6 @@ def get_user_name_by_id(user_id):
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
- # print(get_pitcher({'user_id':78}))
|
|
|
- # print(get_user_name_by_id(78))
|
|
|
- # user_channel_group({})
|
|
|
- # user()
|
|
|
- db = MysqlUtils()
|
|
|
- sql3 = f"""select id,nick_name from t_mp_account limit 100"""
|
|
|
- data3 = db.zx.getData_json(sql3)
|
|
|
- print(data3)
|
|
|
-
|
|
|
-# xx=db.quchen_text.getData_json(sql='''select order_id,amount from ods_order oo limit 100''')
|
|
|
-# print(xx)
|
|
|
+ # print(get_channel({'user_id':1}))
|
|
|
+ # print(get_user_name_by_id({'user_id':78,'name':''}))
|
|
|
+ print(get_user_name_by_id(78))
|