diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue index 1a9de05..94e721a 100644 --- a/fir_client/src/components/FirDownload.vue +++ b/fir_client/src/components/FirDownload.vue @@ -79,7 +79,7 @@
正在安装,请按 Home 键在桌面查看
+
diff --git a/fir_client/src/components/FirSuperSignBase.vue b/fir_client/src/components/FirSuperSignBase.vue index 4caac7d..425a0b4 100644 --- a/fir_client/src/components/FirSuperSignBase.vue +++ b/fir_client/src/components/FirSuperSignBase.vue @@ -586,7 +586,11 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { - this.iosdeveloperFun({"methods": "DELETE", "data": {"email": developer_info.email}}); + let data={"email": developer_info.email}; + if(developer_info.issuer_id){ + data={"issuer_id": developer_info.issuer_id}; + } + this.iosdeveloperFun({"methods": "DELETE", "data": data}); }).catch(() => { this.$message({ type: 'info', diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue index ba5e34c..f9a67e1 100644 --- a/fir_client/src/components/ShortDownload.vue +++ b/fir_client/src/components/ShortDownload.vue @@ -79,8 +79,8 @@ 正在安装,请按 Home 键在桌面查看 - - + + 安装完成后,需立即信任 diff --git a/fir_ser/api/utils/app/iossignapi.py b/fir_ser/api/utils/app/iossignapi.py index 18c9088..4fa7711 100644 --- a/fir_ser/api/utils/app/iossignapi.py +++ b/fir_ser/api/utils/app/iossignapi.py @@ -159,7 +159,7 @@ class AppDeveloperApiV2(object): key.generate_key(TYPE_RSA, 2048) # Generate CSR req = X509Req() - req.get_subject().CN = 'BJ' + req.get_subject().CN = 'FLY APP' req.get_subject().O = 'FLY APP Inc' req.get_subject().OU = 'IT' req.get_subject().L = 'BJ' diff --git a/fir_ser/api/utils/app/supersignutils.py b/fir_ser/api/utils/app/supersignutils.py index d2c4ec3..3cf81f8 100644 --- a/fir_ser/api/utils/app/supersignutils.py +++ b/fir_ser/api/utils/app/supersignutils.py @@ -429,7 +429,7 @@ class IosUtils(object): IosUtils.clean_app_by_developer_obj(app_obj, developer_obj) delete_app_to_dev_and_file(developer_obj, app_obj.id) IosUtils.clean_udid_by_app_obj(app_obj, developer_obj) - full_path = file_format_path(user_obj, email=developer_obj.email) + full_path = file_format_path(user_obj, get_auth_form_developer(developer_obj)) try: for root, dirs, files in os.walk(full_path, topdown=False): for name in files: diff --git a/fir_ser/api/views/supersign.py b/fir_ser/api/views/supersign.py index 8863b1f..1d151a2 100644 --- a/fir_ser/api/views/supersign.py +++ b/fir_ser/api/views/supersign.py @@ -198,13 +198,19 @@ class DeveloperView(APIView): def delete(self, request): email = request.query_params.get("email", None) + issuer_id = request.query_params.get("issuer_id", None) if email: developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user, email=email).first() - if developer_obj: - logger.error("user %s delete developer %s " % ( - request.user, developer_obj)) - IosUtils.clean_developer(developer_obj, request.user) - developer_obj.delete() + elif issuer_id: + developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user, issuer_id=issuer_id).first() + else: + return self.get(request) + + if developer_obj: + logger.error("user %s delete developer %s " % ( + request.user, developer_obj)) + IosUtils.clean_developer(developer_obj, request.user) + developer_obj.delete() return self.get(request)
- + + 安装完成后,需立即信任 diff --git a/fir_ser/api/utils/app/iossignapi.py b/fir_ser/api/utils/app/iossignapi.py index 18c9088..4fa7711 100644 --- a/fir_ser/api/utils/app/iossignapi.py +++ b/fir_ser/api/utils/app/iossignapi.py @@ -159,7 +159,7 @@ class AppDeveloperApiV2(object): key.generate_key(TYPE_RSA, 2048) # Generate CSR req = X509Req() - req.get_subject().CN = 'BJ' + req.get_subject().CN = 'FLY APP' req.get_subject().O = 'FLY APP Inc' req.get_subject().OU = 'IT' req.get_subject().L = 'BJ' diff --git a/fir_ser/api/utils/app/supersignutils.py b/fir_ser/api/utils/app/supersignutils.py index d2c4ec3..3cf81f8 100644 --- a/fir_ser/api/utils/app/supersignutils.py +++ b/fir_ser/api/utils/app/supersignutils.py @@ -429,7 +429,7 @@ class IosUtils(object): IosUtils.clean_app_by_developer_obj(app_obj, developer_obj) delete_app_to_dev_and_file(developer_obj, app_obj.id) IosUtils.clean_udid_by_app_obj(app_obj, developer_obj) - full_path = file_format_path(user_obj, email=developer_obj.email) + full_path = file_format_path(user_obj, get_auth_form_developer(developer_obj)) try: for root, dirs, files in os.walk(full_path, topdown=False): for name in files: diff --git a/fir_ser/api/views/supersign.py b/fir_ser/api/views/supersign.py index 8863b1f..1d151a2 100644 --- a/fir_ser/api/views/supersign.py +++ b/fir_ser/api/views/supersign.py @@ -198,13 +198,19 @@ class DeveloperView(APIView): def delete(self, request): email = request.query_params.get("email", None) + issuer_id = request.query_params.get("issuer_id", None) if email: developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user, email=email).first() - if developer_obj: - logger.error("user %s delete developer %s " % ( - request.user, developer_obj)) - IosUtils.clean_developer(developer_obj, request.user) - developer_obj.delete() + elif issuer_id: + developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user, issuer_id=issuer_id).first() + else: + return self.get(request) + + if developer_obj: + logger.error("user %s delete developer %s " % ( + request.user, developer_obj)) + IosUtils.clean_developer(developer_obj, request.user) + developer_obj.delete() return self.get(request)
+ 安装完成后,需立即信任 diff --git a/fir_ser/api/utils/app/iossignapi.py b/fir_ser/api/utils/app/iossignapi.py index 18c9088..4fa7711 100644 --- a/fir_ser/api/utils/app/iossignapi.py +++ b/fir_ser/api/utils/app/iossignapi.py @@ -159,7 +159,7 @@ class AppDeveloperApiV2(object): key.generate_key(TYPE_RSA, 2048) # Generate CSR req = X509Req() - req.get_subject().CN = 'BJ' + req.get_subject().CN = 'FLY APP' req.get_subject().O = 'FLY APP Inc' req.get_subject().OU = 'IT' req.get_subject().L = 'BJ' diff --git a/fir_ser/api/utils/app/supersignutils.py b/fir_ser/api/utils/app/supersignutils.py index d2c4ec3..3cf81f8 100644 --- a/fir_ser/api/utils/app/supersignutils.py +++ b/fir_ser/api/utils/app/supersignutils.py @@ -429,7 +429,7 @@ class IosUtils(object): IosUtils.clean_app_by_developer_obj(app_obj, developer_obj) delete_app_to_dev_and_file(developer_obj, app_obj.id) IosUtils.clean_udid_by_app_obj(app_obj, developer_obj) - full_path = file_format_path(user_obj, email=developer_obj.email) + full_path = file_format_path(user_obj, get_auth_form_developer(developer_obj)) try: for root, dirs, files in os.walk(full_path, topdown=False): for name in files: diff --git a/fir_ser/api/views/supersign.py b/fir_ser/api/views/supersign.py index 8863b1f..1d151a2 100644 --- a/fir_ser/api/views/supersign.py +++ b/fir_ser/api/views/supersign.py @@ -198,13 +198,19 @@ class DeveloperView(APIView): def delete(self, request): email = request.query_params.get("email", None) + issuer_id = request.query_params.get("issuer_id", None) if email: developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user, email=email).first() - if developer_obj: - logger.error("user %s delete developer %s " % ( - request.user, developer_obj)) - IosUtils.clean_developer(developer_obj, request.user) - developer_obj.delete() + elif issuer_id: + developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user, issuer_id=issuer_id).first() + else: + return self.get(request) + + if developer_obj: + logger.error("user %s delete developer %s " % ( + request.user, developer_obj)) + IosUtils.clean_developer(developer_obj, request.user) + developer_obj.delete() return self.get(request)