修复绑定域名上传失败问题

pull/12/head
youngS 4 years ago
parent b8d737e08b
commit 2cad11ba32
  1. BIN
      fir_client/src/assets/loading.gif
  2. 14
      fir_client/src/components/FirDownload.vue
  3. 14
      fir_client/src/components/ShortDownload.vue
  4. 5
      fir_ser/api/utils/app/supersignutils.py
  5. 2
      fir_ser/api/views/uploads.py

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 74 KiB

@ -70,7 +70,7 @@
<button type="button" v-else-if="wrong">{{ msg }}</button> <button type="button" v-else-if="wrong">{{ msg }}</button>
<div v-else> <div v-else>
<div v-if="isdownload"> <div v-if="isdownload" style="margin-top: 20%;margin-bottom: 20%">
<div v-if="gomobile"> <div v-if="gomobile">
<button disabled="" class="loading" <button disabled="" class="loading"
style="min-width: 42px; width: 42px; padding: 21px 0; border-top-color: transparent; border-left-color: transparent;"> style="min-width: 42px; width: 42px; padding: 21px 0; border-top-color: transparent; border-left-color: transparent;">
@ -649,13 +649,13 @@
.jiaocheng { .jiaocheng {
float: right; float: right;
width: 30px; width: 25px;
height: 30px; height: 25px;
text-align: center; text-align: center;
border-radius: 15px; border-radius: 20px;
background-color: #32b2a7; background-color: #a9b6cc;
margin-right: -30px; margin-left: -25px;
margin-top: 7px; margin-top: 10px;
} }
.wechat_tip, .wechat_tip > i { .wechat_tip, .wechat_tip > i {

@ -91,7 +91,7 @@
<button type="button" v-else-if="wrong">{{ msg }}</button> <button type="button" v-else-if="wrong">{{ msg }}</button>
<div v-else> <div v-else>
<div v-if="isdownload"> <div v-if="isdownload" style="margin-top: 20%;margin-bottom: 20%">
<div v-if="gomobile"> <div v-if="gomobile">
<button disabled="" class="loading" <button disabled="" class="loading"
style="min-width: 42px; width: 42px; padding: 21px 0; border-top-color: transparent; border-left-color: transparent;"> style="min-width: 42px; width: 42px; padding: 21px 0; border-top-color: transparent; border-left-color: transparent;">
@ -631,13 +631,13 @@
.jiaocheng { .jiaocheng {
float: right; float: right;
width: 30px; width: 25px;
height: 30px; height: 25px;
text-align: center; text-align: center;
border-radius: 15px; border-radius: 20px;
background-color: #32b2a7; background-color: #a9b6cc;
margin-right: -30px; margin-left: -25px;
margin-top: 7px; margin-top: 10px;
} }
.wechat_tip, .wechat_tip > i { .wechat_tip, .wechat_tip > i {

@ -463,9 +463,8 @@ class IosUtils(object):
return False, d_result return False, d_result
app_udid_obj = AppUDID.objects.filter(app_id=self.app_obj, udid=self.udid_info.get('udid')).first() app_udid_obj = AppUDID.objects.filter(app_id=self.app_obj, udid=self.udid_info.get('udid')).first()
if app_udid_obj and app_udid_obj.is_signed: if app_udid_obj and app_udid_obj.is_signed:
apptodev_obj = APPToDeveloper.objects.filter(app_id=self.app_obj).first() release_obj = AppReleaseInfo.objects.filter(app_id=self.app_obj, is_master=True).first()
if apptodev_obj: for apptodev_obj in APPToDeveloper.objects.filter(app_id=self.app_obj).all():
release_obj = AppReleaseInfo.objects.filter(app_id=self.app_obj, is_master=True).first()
if release_obj.release_id == apptodev_obj.release_file: if release_obj.release_id == apptodev_obj.release_file:
msg = "udid %s exists app_id %s" % (self.udid_info.get('udid'), self.app_obj) msg = "udid %s exists app_id %s" % (self.udid_info.get('udid'), self.app_obj)
d_result['msg'] = msg d_result['msg'] = msg

@ -74,7 +74,7 @@ class AppAnalyseView(APIView):
upload_file_tmp_name("set", png_key, request.user.id) upload_file_tmp_name("set", png_key, request.user.id)
upload_file_tmp_name("set", upload_key, request.user.id) upload_file_tmp_name("set", upload_key, request.user.id)
res.data = {"app_uuid": app_uuid, "short": short, res.data = {"app_uuid": app_uuid, "short": short,
"domain_name": get_redirect_server_domain(request, request.user, None), "domain_name": settings.SERVER_DOMAIN.get("FILE_UPLOAD_DOMAIN", None),
"upload_token": upload_token, "upload_token": upload_token,
"upload_key": upload_key, "upload_key": upload_key,
"png_token": png_token, "png_token": png_token,

Loading…
Cancel
Save