lei_y601/yj_room_agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复https请求忽略证书

Browse Source
This commit is contained in:
雷雨
2025-06-19 11:42:18 +08:00
parent 616ff34270
commit 11272b392d
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -7,4 +7,4 @@ RUN apt-get update && pip install -r requirements.txt -i https://mirrors.aliyun.
&& pip install yonyouopenapisdk-1.1.1-py3-none-any.whl -i https://mirrors.aliyun.com/pypi/simple/
RUN mkdir -p /app/logs && touch /app/logs/yj_room_agent.log
EXPOSE 9000
CMD ["gunicorn","-w 3","-b 0.0.0.0:9000","-t 1200", "yj_room_agent.wsgi"]
CMD ["gunicorn","-w 5","-b 0.0.0.0:9000","-t 1200", "yj_room_agent.wsgi"]

32
yj_room_agent/tools/getinfo.py
View File

@@ -5,7 +5,9 @@ import requests
from decouple import config
from yj_room_agent.yj_logger import logger
from copy import deepcopy
import urllib3
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
APPKEY = config('APPKEY', default="")
APPSECRET = config('APPSECRET', default="")
@@ -69,7 +71,7 @@ def get_access_token(tenant_id):
raise Exception("该租户无法获取中心域名=>detail error: " + f"{str(ex)}")
headers = {'Content-Type': 'application/json'}
respones = requests.get(url=request_url, params=params, headers=headers)
respones = requests.get(url=request_url, params=params, headers=headers,verify=False)
logger.info("Get token response => {0}".format(respones))
logger.info(f"status_code: {respones.status_code}")
if respones.status_code == 200:
@@ -80,7 +82,7 @@ def get_access_token(tenant_id):
else:
logger.error(f"请求失败 状态码: {respones.status_code}")
raise Exception(f"请求获取token失败 status_code: {respones.status_code} "
f"message: {respones}")
f"message: {respones.content}")
'''
@@ -95,7 +97,7 @@ def get_domain(params):
logger.info("url => {0} params = > {1}".format(request_url,params))
respones = requests.get(url=request_url,
params=params,
headers=headers)
headers=headers,verify=False)
logger.info("Get domain respones => {0}".format(respones))
if respones.status_code == 200:
@@ -109,7 +111,7 @@ def get_domain(params):
else:
logger.error(f"请求失败 状态码: {respones.status_code}")
raise Exception(f"请求获取domain失败 status_code: {respones.status_code} "
f"message: {respones}")
f"message: {respones.content}")
'''
@@ -128,7 +130,7 @@ def query_meetingroom_type(params: dict):
gateway_url, token_url = get_domain({"tenantId": tenant_id})
request_url = gateway_url + QUERY_MEETING_ROOM_TYPE
respones = requests.get(url=request_url, params=params,
headers=header)
headers=header,verify=False)
logger.info("meeting type respones => {0}".format(respones.json()))
return respones.json()
@@ -148,11 +150,11 @@ def query_meetingroom(params: dict):
tenant_id = params.get("ytenantId", None)
gateway_url, token_url = get_domain({"tenantId": tenant_id})
request_url = gateway_url + QUERY_MEETING_ROOM
logger.debug("request url => {0}".format(request_url))
logger.info("request url => {0}".format(request_url))
params['pageSize'] = page_size
logger.debug("query_meetingroom params => {0}".format(params))
respones = requests.get(url=request_url, params=params,
headers=header)
headers=header,verify=False)
logger.info("meeting room respones => {0}".format(respones.json()))
return respones.json()
@@ -173,12 +175,12 @@ def query_meetingbooking_info(params: dict):
tenant_id = params.get("ytenantId", None)
gateway_url, token_url = get_domain({"tenantId": tenant_id})
request_url = gateway_url + QUERY_MEETINGBOOKING_INFO
logger.debug("request url => {0}".format(request_url))
logger.info("request url => {0}".format(request_url))
params['pageSize'] = 800
logger.debug("query_meetingbooking_info params => {0}".format(params))
respones = requests.get(url=request_url, params=params,
headers=header)
logger.info("meeting room respones => {0}".format(respones.json()))
headers=header,verify=False)
logger.debug("meeting room respones => {0}".format(respones.json()))
return respones.json()
@@ -200,8 +202,8 @@ def book_meeting(params: dict, data: dict):
logger.debug("request url => {0}".format(request_url))
logger.debug("book_meeting params => {0}".format(params))
respones = requests.post(url=request_url, params=params,
headers=header, data=json.dumps(data))
logger.info("book meeting respones => {0}".format(respones.json()))
headers=header, data=json.dumps(data),verify=False)
logger.debug("book meeting respones => {0}".format(respones.json()))
return respones.json()
@@ -220,11 +222,11 @@ def edit_meeting_info(params: dict, data: dict):
tenant_id = params.get("tenantId", None)
gateway_url, token_url = get_domain({"tenantId": tenant_id})
request_url = gateway_url + EDIT_MEETING
logger.debug("request url => {0}".format(request_url))
logger.info("request url => {0}".format(request_url))
logger.debug("edit_meeting_info params => "
"{0} data => {1}".format(params,data))
respones = requests.post(url=request_url, params=params,
headers=header, data=json.dumps(data))
headers=header, data=json.dumps(data),verify=False)
logger.info(f"edit_meeting_info respone is {respones} ")
return respones.json()
@@ -249,6 +251,6 @@ def cancel_meeting(params: dict):
params['isSendMail'] = True
params['isSendMsg'] = True
respones = requests.get(url=request_url, params=params,
headers=header)
headers=header,verify=False)
logger.info("cancel meeting respones => {0}".format(respones))
return respones.json()