diff --git a/fir_client/src/components/apps/FirApps.vue b/fir_client/src/components/apps/FirApps.vue index d25a95f..181a9d9 100644 --- a/fir_client/src/components/apps/FirApps.vue +++ b/fir_client/src/components/apps/FirApps.vue @@ -66,7 +66,7 @@ + width="666px"> 该应用开启了超级签名,执行删除操作,将会删除相关开发者账户下的证书等数据,可能会导致已经下载的APP闪退,并且删除后不可恢复,请谨慎操作 删除后不可恢复,请谨慎操作 @@ -83,7 +83,7 @@ :visible.sync="willuploadApp" :destroy-on-close="true" :show-close="!uploading" - width="40%" + width="666px" :close-on-click-modal="false" @closed="closeUpload">
@@ -135,7 +135,7 @@ - + @@ -646,17 +646,10 @@ getuploadtoken(loading) { analyseApps(data => { if (data.code === 1000) { - this.analyseappinfo.short = data.data.short; this.short = data.data.short; - this.analyseappinfo.domain_name = data.data.domain_name; - this.analyseappinfo.app_uuid = data.data.app_uuid; - this.analyseappinfo.upload_token = data.data.upload_token; - this.analyseappinfo.upload_key = data.data.upload_key; - this.analyseappinfo.png_key = data.data.png_key; - this.analyseappinfo.png_token = data.data.png_token; - this.analyseappinfo.storage = data.data.storage; - this.analyseappinfo.is_new = data.data.is_new; - this.analyseappinfo.binary_url = data.data.binary_url; + for(let name of Object.keys(data.data)){ + this.analyseappinfo[name] = data.data[name] + } this.willuploadApp = true; } else { this.$message.error("上传token获取失败,请刷新重试") diff --git a/fir_ser/api/views/uploads.py b/fir_ser/api/views/uploads.py index 1fcba60..a7fadfc 100644 --- a/fir_ser/api/views/uploads.py +++ b/fir_ser/api/views/uploads.py @@ -74,13 +74,15 @@ class AppAnalyseView(APIView): upload_file_tmp_name("set", png_key, request.user.id) upload_file_tmp_name("set", upload_key, request.user.id) res.data = {"app_uuid": app_uuid, "short": short, - "domain_name": settings.SERVER_DOMAIN.get("FILE_UPLOAD_DOMAIN", None), + "short_domain_name": get_redirect_server_domain(request, request.user), "upload_token": upload_token, "upload_key": upload_key, "png_token": png_token, "png_key": png_key, "storage": storage_type, "is_new": is_new, "binary_url": binary_url} + if storage_type not in [1, 2]: + res.data['domain_name'] = settings.SERVER_DOMAIN.get("FILE_UPLOAD_DOMAIN", None) else: res.code = 1003