修改代码

dependabot/npm_and_yarn/fir_admin/dns-packet-1.3.4
youngS 4 years ago
parent e53e0843a3
commit 0baaaedc67
  1. 2
      fir_ser/api/utils/storage/aliyunApi.py
  2. 4
      fir_ser/api/views/receiveudids.py
  3. 2
      fir_ser/fir_ser/settings.py

@ -139,7 +139,7 @@ class AliYunOss(object):
self.token.request_id = j['RequestId'] self.token.request_id = j['RequestId']
self.token.expiration = oss2.utils.to_unixtime(j['Credentials']['Expiration'], '%Y-%m-%dT%H:%M:%SZ') self.token.expiration = oss2.utils.to_unixtime(j['Credentials']['Expiration'], '%Y-%m-%dT%H:%M:%SZ')
self.token.bucket = self.bucket_name self.token.bucket = self.bucket_name
self.token.endpoint = self.endpoint self.token.endpoint = self.endpoint.replace('-internal', '')
logger.info("get aliyun sts token %s" % self.token.__dict__) logger.info("get aliyun sts token %s" % self.token.__dict__)
return self.token.__dict__ return self.token.__dict__

@ -10,6 +10,8 @@ from django.views import View
from django.http import HttpResponsePermanentRedirect from django.http import HttpResponsePermanentRedirect
import logging import logging
from api.utils.baseutils import get_app_domain_name
logger = logging.getLogger(__file__) logger = logging.getLogger(__file__)
@ -26,7 +28,7 @@ class IosUDIDView(View):
app_info = Apps.objects.filter(short=short).first() app_info = Apps.objects.filter(short=short).first()
if app_info: if app_info:
server_domain = get_redirect_server_domain(request, None, app_info.domain_name) server_domain = get_redirect_server_domain(request, None, get_app_domain_name(app_info))
if app_info.issupersign and app_info.user_id.supersign_active: if app_info.issupersign and app_info.user_id.supersign_active:
ios_obj = IosUtils(format_udid_info, app_info.user_id, app_info) ios_obj = IosUtils(format_udid_info, app_info.user_id, app_info)
status, msg = ios_obj.sign() status, msg = ios_obj.sign()

@ -245,7 +245,7 @@ THIRD_PART_CONFIG = {
'secret_key': '2iLIxy9', 'secret_key': '2iLIxy9',
'bucket_name': 'fge', 'bucket_name': 'fge',
'sts_role_arn': 'ap-sage', 'sts_role_arn': 'ap-sage',
'endpoint': 'oss-cn-beijing.aliyuncs.com', 'endpoint': 'oss-cn-beijing-internal.aliyuncs.com', # 服务器和oss在同一个地区,填写内网的endpoint
'is_https': True, 'is_https': True,
'domain_name': 'aoud.xin', 'domain_name': 'aoud.xin',
'download_auth_type': 1, # 1:oss 2:cdn 'download_auth_type': 1, # 1:oss 2:cdn

Loading…
Cancel
Save