From 9cdc609eb55835cdbf659e67f8f55593225d9508 Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Mon, 4 May 2020 21:32:25 +0800
Subject: [PATCH] fix some bugs

---
 fir_client/src/components/FirDownload.vue     |  8 ++--
 fir_client/src/restful/index.js               |  7 +---
 fir_download/src/components/FirDownload.vue   | 31 ++++++++++-----
 fir_download/src/restful/download.js          | 10 ++---
 .../api/migrations/0004_auto_20200504_2054.py | 22 +++++++++++
 fir_ser/api/models.py                         |  2 +-
 fir_ser/api/utils/app/shellcmds.py            |  4 +-
 fir_ser/api/utils/app/supersignutils.py       | 38 ++++++-------------
 fir_ser/api/utils/serializer.py               |  5 ++-
 fir_ser/api/utils/storage/caches.py           |  7 ++--
 fir_ser/api/views/download.py                 | 16 +++++---
 fir_ser/fir_ser/settings.py                   |  8 +++-
 12 files changed, 89 insertions(+), 69 deletions(-)
 create mode 100644 fir_ser/api/migrations/0004_auto_20200504_2054.py

diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index 6e4b77c..0a7d00e 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -149,7 +149,7 @@
 <script>
     import QRCode from 'qrcodejs2'
 
-    import {getShortAppinfo,getdownloadurl,getplisturl} from '../restful'
+    import {getShortAppinfo,getdownloadurl} from '../restful'
 
     export default {
         name: "FirDownload",
@@ -183,12 +183,12 @@
                             if(this.currentappinfo.type === 1){
                                 if(this.currentappinfo.issupersign  && this.udid !== this.$route.query.udid){
                                     if(this.agent !== ''){
-                                        let download_url = res.data.download_url;
-                                        this.downloadurl = download_url.replace('http://localhost/download',getplisturl());
+                                        this.downloadurl=res.data.download_url;
+                                        // this.downloadurl = download_url.replace('http://localhost/download',getplisturl());
                                     }
                                 }else {
                                     let download_url = res.data.download_url;
-                                    download_url = download_url.replace('http://localhost/download',getplisturl());
+                                    // download_url = download_url.replace('http://localhost/download',getplisturl());
                                     this.downloadurl="itms-services://?action=download-manifest&url="+encodeURIComponent(download_url);
                                 }
                             }else{
diff --git a/fir_client/src/restful/index.js b/fir_client/src/restful/index.js
index dac8b91..38518fa 100644
--- a/fir_client/src/restful/index.js
+++ b/fir_client/src/restful/index.js
@@ -9,10 +9,8 @@ Axios.defaults.httpsAgent = new https.Agent({
     keepAlive: true
 });
 
-// Axios.defaults.baseURL='';
-const DOMAIN = 'https://fly.dvcloud.xin';
 
-// const DOMAIN = 'http://192.168.8.236:8000';
+const DOMAIN = 'https://fly.harmonygames.cn';
 const APIPATH='/api/v1/fir/server';
 let USERSEVER = DOMAIN+APIPATH;
 
@@ -358,9 +356,6 @@ export function getapppicurl(app_id) {
 export function getuploadurl() {
     return USERSEVER + '/upload'
 }
-export function getplisturl() {
-    return DOMAIN + '/download'
-}
 
 
 /**分析应用并获取app上传token */
diff --git a/fir_download/src/components/FirDownload.vue b/fir_download/src/components/FirDownload.vue
index c323bf8..2edd98b 100644
--- a/fir_download/src/components/FirDownload.vue
+++ b/fir_download/src/components/FirDownload.vue
@@ -29,7 +29,8 @@
                     <span id="qrcode" class="qrcode">
                                         </span>
                   </div>
-                  <p class="scan-tips wrapper icon-warp" >{{ mcurrentappinfo.release_type|getiOStype  }}</p>
+                  <p v-if="currentappinfo.issupersign" class="scan-tips wrapper icon-warp" >超级签</p>
+                  <p  v-else class="scan-tips wrapper icon-warp" >{{ mcurrentappinfo.release_type|getiOStype  }}</p>
                   <h1 class="name wrapper">
                                         <span class="icon-warp" style="margin-left:0px">
                                             <i v-if="currentappinfo.type === 0 && agent !== ''" class="iconfont icon-android2"/>
@@ -150,7 +151,7 @@
 <script>
   import QRCode from 'qrcodejs2'
 
-  import {getShortAppinfo,getdownloadurl,getplisturl} from '../restful/download'
+  import {getShortAppinfo,getdownloadurl} from '../restful/download'
 
   export default {
     name: "FirDownload",
@@ -179,17 +180,26 @@
           getdownloadurl(res => {
             if (res.code === 1000) {
 
-              if (this.currentappinfo.type === 1) {
-                let download_url = res.data.download_url;
-                download_url = download_url.replace('http://localhost/download', getplisturl());
-                this.downloadurl = "itms-services://?action=download-manifest&url=" + encodeURIComponent(download_url);
-              } else {
-                if (this.agent !== '') {
+              if(res.data.download_url === ""){
+                window.location.href=this.full_url;
+                return
+              }
+              if(this.currentappinfo.type === 1){
+                if(this.currentappinfo.issupersign  && this.udid !== this.$route.query.udid){
+                  if(this.agent !== ''){
+                    this.download_url = res.data.download_url;
+                  }
+                }else {
+                  let download_url = res.data.download_url;
+                  this.downloadurl="itms-services://?action=download-manifest&url="+encodeURIComponent(download_url);
+                }
+              }else{
+                if(this.agent !== ''){
                   this.downloadurl = res.data.download_url;
                 }
               }
 
-              window.location.href = this.downloadurl;
+              window.location.href=this.downloadurl;
             } else {
               this.isdownload = false;
               alert("密码错误，或者下载链接失效")
@@ -200,6 +210,7 @@
               'short': this.currentappinfo.short,
               'release_id': this.mcurrentappinfo.release_id,
               'password': this.password,
+              'udid':this.udid,
             },
             'app_id': this.currentappinfo.app_id
           })
@@ -213,7 +224,7 @@
         })
       },
       getDownloadTokenFun() {
-        let params={ "short": this.$route.params.short };
+        let params={ "short": this.$route.params.short,"time":new Date().getTime() };
         if(this.$route.query.release_id){
           params["release_id"]=this.$route.query.release_id
         }
diff --git a/fir_download/src/restful/download.js b/fir_download/src/restful/download.js
index cf417f6..5408426 100644
--- a/fir_download/src/restful/download.js
+++ b/fir_download/src/restful/download.js
@@ -6,10 +6,9 @@ Axios.defaults.httpsAgent = new https.Agent({
     keepAlive: true
 });
 
-// Axios.defaults.baseURL='';
-const USERSEVER = 'https://fly.dvcloud.xin/api/v1/fir/server';
-
-// const USERSEVER = 'http://192.168.1.112:8000/api/v1/fir/server';
+const DOMAIN = 'https://fly.harmonygames.cn';
+const APIPATH='/api/v1/fir/server';
+let USERSEVER = DOMAIN+APIPATH;
 
 
 function getData(url, params = {}, callBack) {
@@ -114,6 +113,3 @@ export function getdownloadurl(callBack, params) {
         },
     );
 }
-export function getplisturl() {
-    return USERSEVER + '/download'
-}
diff --git a/fir_ser/api/migrations/0004_auto_20200504_2054.py b/fir_ser/api/migrations/0004_auto_20200504_2054.py
new file mode 100644
index 0000000..3c582f4
--- /dev/null
+++ b/fir_ser/api/migrations/0004_auto_20200504_2054.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.0.3 on 2020-05-04 20:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0003_apptodeveloper'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='apptodeveloper',
+            options={'verbose_name': '应用开发者绑定', 'verbose_name_plural': '应用开发者绑定'},
+        ),
+        migrations.AlterField(
+            model_name='apptodeveloper',
+            name='binary_file',
+            field=models.CharField(blank=True, max_length=128, null=True, unique=True, verbose_name='签名包名称'),
+        ),
+    ]
diff --git a/fir_ser/api/models.py b/fir_ser/api/models.py
index d4bc8e8..24915ae 100644
--- a/fir_ser/api/models.py
+++ b/fir_ser/api/models.py
@@ -232,7 +232,7 @@ class APPSuperSignUsedInfo(models.Model):
 class APPToDeveloper(models.Model):
     app_id = models.ForeignKey(to="Apps", on_delete=models.CASCADE, verbose_name="属于哪个APP")
     developerid = models.ForeignKey(to="AppIOSDeveloperInfo",on_delete=models.CASCADE, verbose_name="所使用苹果开发者账户")
-    binary_file = models.CharField(max_length=128,blank=True,verbose_name="签名包名称",null=True)
+    binary_file = models.CharField(max_length=128,blank=True,verbose_name="签名包名称",null=True,unique=True)
     updated_time = models.DateTimeField(auto_now=True, verbose_name="更新时间")
 
     class Meta:
diff --git a/fir_ser/api/utils/app/shellcmds.py b/fir_ser/api/utils/app/shellcmds.py
index 0b40b78..e85969a 100644
--- a/fir_ser/api/utils/app/shellcmds.py
+++ b/fir_ser/api/utils/app/shellcmds.py
@@ -86,15 +86,13 @@ class SSHConnection(object):
             self._client.close()
 
 def shell_command(cmdstrs,timeout):
-    # cmdresult = re.split(r'\s+', cmdstrs)
-    # print(cmdresult)
     result = default_result()
     result['return_info'] = ''
     shell_start_time = time.time()
     child = Popen(cmdstrs, shell=True, stdout=PIPE, stderr=PIPE)
     if timeout:
         while child.poll() is None:
-            time.sleep(0.2)
+            time.sleep(1)
             now = time.time()
             if int(now - shell_start_time) > timeout:
                 os.kill(child.pid, signal.SIGKILL)
diff --git a/fir_ser/api/utils/app/supersignutils.py b/fir_ser/api/utils/app/supersignutils.py
index 23870ac..1ed422c 100644
--- a/fir_ser/api/utils/app/supersignutils.py
+++ b/fir_ser/api/utils/app/supersignutils.py
@@ -71,12 +71,13 @@ def make_udid_mobileconfig(udid_url, PayloadOrganization, PayloadUUID=uuid.uuid1
 def get_post_udid_url(request, short):
     server_domain = get_http_server_doamin(request)
 
-    PATH_INFO = request.META.get('PATH_INFO')
-    PATH_INFO_lists = PATH_INFO.strip('/').split('/')
-    PATH_INFO_lists[-1] = 'udid'
-    PATH_INFO_lists.pop(-2)
-    PATH_INFO_lists.append(short)
-    PATH_INFO_lists.insert(0, server_domain)
+    # PATH_INFO = request.META.get('PATH_INFO')
+    # PATH_INFO_lists = PATH_INFO.strip('/').split('/')
+    # PATH_INFO_lists[-1] = 'udid'
+    # PATH_INFO_lists.pop(-2)
+    # PATH_INFO_lists.append(short)
+    # PATH_INFO_lists.insert(0, server_domain)
+    PATH_INFO_lists=[server_domain,"udid",short]
     udid_url = "/".join(PATH_INFO_lists)
     return udid_url
 
@@ -278,11 +279,12 @@ class IosUtils(object):
                 app_api_obj = AppDeveloperApi(**auth)
                 app_api_obj.set_device_status("disable", udid_obj.udid)
 
-            if developer_obj.use_number > 0:
-                developer_obj.use_number = developer_obj.use_number - 1
-                developer_obj.save()
+                if developer_obj.use_number > 0:
+                    developer_obj.use_number = developer_obj.use_number - 1
+                    developer_obj.save()
 
             udid_obj.delete()
+
             SuperSignUsed_obj.delete()
 
 
@@ -301,8 +303,8 @@ class IosUtils(object):
             if developer_obj:
                 IosUtils.clean_app_by_developer_obj(app_obj,developer_obj)
                 APPToDeveloper.objects.filter(developerid=developer_obj,app_id=app_obj).delete()
-
                 IosUtils.clean_udid_by_app_obj(app_obj,developer_obj)
+
     @staticmethod
     def clean_app_by_developer_obj(app_obj,developer_obj):
         auth = {
@@ -322,28 +324,12 @@ class IosUtils(object):
         :param developer_obj:
         :return:
         '''
-        # auth = {
-        #     "username": developer_obj.email,
-        #     "password": developer_obj.password,
-        #     "certid": developer_obj.certid
-        # }
-
         for APPToDeveloper_obj in APPToDeveloper.objects.filter(developerid=developer_obj):
             app_obj=APPToDeveloper_obj.app_id
             IosUtils.clean_app_by_developer_obj(app_obj, developer_obj)
             APPToDeveloper.objects.filter(developerid=developer_obj, app_id=app_obj).delete()
             IosUtils.clean_udid_by_app_obj(app_obj, developer_obj)
 
-
-        # for SuperSignUsed_obj in APPSuperSignUsedInfo.objects.filter(developerid=developer_obj):
-        #
-        #     app_obj = SuperSignUsed_obj.app_id
-        #     app_api_obj = AppDeveloperApi(**auth)
-        #     app_api_obj.del_profile(app_obj.bundle_id, app_obj.app_id)
-        #     app_api_obj2 = AppDeveloperApi(**auth)
-        #     app_api_obj2.del_app(app_obj.bundle_id,app_obj.app_id)
-        #     APPToDeveloper.objects.filter(developerid=developer_obj, app_id=app_obj).delete()
-
     @staticmethod
     def active_developer(developer_obj,code=None):
         '''
diff --git a/fir_ser/api/utils/serializer.py b/fir_ser/api/utils/serializer.py
index 5d1772c..da9cfaf 100644
--- a/fir_ser/api/utils/serializer.py
+++ b/fir_ser/api/utils/serializer.py
@@ -169,9 +169,12 @@ class AppReleaseSerializer(serializers.ModelSerializer):
 
     def get_icon_url(self, obj):
         icon_url=""
+        key = ''
+        if self.context.get("key", None) and self.context.get("key") != "undefined":
+            key = self.context.get("key", '')
         if self.context.get("storage", None) and self.context.get("storage") != "undefined":
             storage = self.context.get("storage", None)
-            icon_url = storage.get_download_url(os.path.basename(obj.icon_url),600)
+            icon_url = storage.get_download_url(os.path.basename(obj.icon_url),600,key=key)
 
         return icon_url
 
diff --git a/fir_ser/api/utils/storage/caches.py b/fir_ser/api/utils/storage/caches.py
index f1ef73a..3a36986 100644
--- a/fir_ser/api/utils/storage/caches.py
+++ b/fir_ser/api/utils/storage/caches.py
@@ -8,7 +8,7 @@ from django.core.cache import cache
 from api.models import Apps,UserInfo,AppReleaseInfo,AppUDID,APPToDeveloper,APPSuperSignUsedInfo
 import time,os
 from django.utils import timezone
-from fir_ser.settings import CACHE_KEY_TEMPLATE
+from fir_ser.settings import CACHE_KEY_TEMPLATE,SERVER_DOMAIN
 from api.utils.storage.storage import Storage,LocalStorage
 from api.utils.crontab.sync_cache import sync_download_times_by_app_id
 from api.utils.crontab import run
@@ -16,7 +16,7 @@ from api.utils.crontab import run
 def get_download_url_by_cache(app_obj, filename, limit, isdownload=True,key='',udid=None):
     now = time.time()
     if isdownload is None:
-        local_storage = LocalStorage('localhost', False)
+        local_storage = LocalStorage(**SERVER_DOMAIN.get("IOS_PMFILE_DOWNLOAD_DOMAIN"))
         download_url_type = 'plist'
         if not udid:
             if app_obj.get('issupersign',None):
@@ -28,8 +28,7 @@ def get_download_url_by_cache(app_obj, filename, limit, isdownload=True,key='',u
                 if SuperSign_obj:
                     APPToDeveloper_obj = APPToDeveloper.objects.filter(app_id_id=app_obj.get("pk"),developerid=SuperSign_obj.developerid).first()
                     if APPToDeveloper_obj:
-                        filename=APPToDeveloper_obj.binary_file
-                        return local_storage.get_download_url(filename, limit, download_url_type)
+                        return local_storage.get_download_url(APPToDeveloper_obj.binary_file+"."+filename.split(".")[-1], limit, download_url_type)
                     else:
                         return ""
                 else:
diff --git a/fir_ser/api/views/download.py b/fir_ser/api/views/download.py
index 23ec80b..49eead0 100644
--- a/fir_ser/api/views/download.py
+++ b/fir_ser/api/views/download.py
@@ -16,7 +16,7 @@ from api.utils.storage.caches import get_app_instance_by_cache,get_download_url_
 import os
 from rest_framework_extensions.cache.decorators import cache_response
 from api.utils.serializer import AppsShortSerializer
-from api.models import Apps,AppReleaseInfo
+from api.models import Apps,AppReleaseInfo,APPToDeveloper,APPSuperSignUsedInfo
 from django.http import FileResponse
 class DownloadView(APIView):
     '''
@@ -48,7 +48,12 @@ class DownloadView(APIView):
                 return response
             else:
                 if ftype == 'plist':
-                    release_obj = AppReleaseInfo.objects.filter(release_id=filename.split('.')[0]).first()
+                    release_id = filename.split('.')[0]
+                    apptodev_obj = APPToDeveloper.objects.filter(binary_file=release_id).first()
+                    if apptodev_obj:
+                        release_obj = AppReleaseInfo.objects.filter(is_master=True,app_id=apptodev_obj.app_id).first()
+                    else:
+                        release_obj = AppReleaseInfo.objects.filter(release_id=release_id).first()
                     if release_obj:
                         storage = Storage(release_obj.app_id.user_id)
                         bundle_id = release_obj.app_id.bundle_id
@@ -59,6 +64,7 @@ class DownloadView(APIView):
                         response['Content-Type'] = "application/x-plist"
                         response['Content-Disposition'] = 'attachment; filename=' + make_random_uuid()
                         return response
+                    res.msg = "plist release_id error"
                 elif ftype == 'mobileconifg':
                     release_obj = AppReleaseInfo.objects.filter(release_id=filename.split('.')[0]).first()
                     if release_obj:
@@ -69,6 +75,7 @@ class DownloadView(APIView):
                         response['Content-Type'] = "application/x-apple-aspen-config"
                         response['Content-Disposition'] = 'attachment; filename=' + make_random_uuid() +'.mobileconfig'
                         return response
+                    res.msg = "mobileconifg release_id error"
 
         res.code=1004
         res.msg="token校验失败"
@@ -85,13 +92,12 @@ class ShortDownloadView(APIView):
         release_id = request.query_params.get("release_id", None)
         udid = request.query_params.get("udid", None)
         app_obj = Apps.objects.filter(short=short).first()
-        if udid:
-            del_cache_response_by_short(short,app_obj.app_id,udid=udid)
         if not app_obj:
             res.code=1003
             res.msg="该应用不存在"
             return Response(res.dict)
-
+        if udid:
+            del_cache_response_by_short(short,app_obj.app_id,udid=udid)
         if not app_obj.isshow:
             res.code=1004
             res.msg="您没有权限访问该应用"
diff --git a/fir_ser/fir_ser/settings.py b/fir_ser/fir_ser/settings.py
index 1491650..029313a 100644
--- a/fir_ser/fir_ser/settings.py
+++ b/fir_ser/fir_ser/settings.py
@@ -250,8 +250,12 @@ SYNC_CACHE_TO_DATABASE={
 }
 
 SERVER_DOMAIN={
-    'POST_UDID_DOMAIN':'http://192.168.8.236:8000',  #超级签名调试
-    'REDIRECT_UDID_DOMAIN': 'http://192.168.8.236:8080',  # 超级签名调试
+    'IOS_PMFILE_DOWNLOAD_DOMAIN':{
+        "domain_name":'fly.harmonygames.cn',
+        'is_https':True,
+    },  # ios 描述文件和plist文件下载域名，该域名用于后端，一般为api访问域名
+    'POST_UDID_DOMAIN':'https://fly.harmonygames.cn',  #超级签名 安装签名时 向该域名 发送udid数据，该域名用于后端，一般为 api 访问域名
+    'REDIRECT_UDID_DOMAIN': 'https://fly.harmonygames.cn',  # 超级签名 安装完成之后，跳转域名，该域名为前端web访问域名
 }
 
 SESSION_ENGINE = "django.contrib.sessions.backends.cache"