From b9a646f5214ad3eb8aa0eee018ac6a4e85e9bead Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Tue, 5 May 2020 10:35:23 +0800
Subject: [PATCH] fix some bugs

---
 .../src/components/FirAppInfossecurity.vue       | 11 +++++++++++
 .../src/components/FirUserProfileStorage.vue     | 13 ++++---------
 fir_client/src/utils/index.js                    |  9 +++++++++
 fir_ser/api/views/apps.py                        | 16 ++++++++++++++--
 fir_ser/api/views/supersign.py                   |  5 ++++-
 fir_ser/nginx-vhost.conf                         |  6 +++---
 6 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/fir_client/src/components/FirAppInfossecurity.vue b/fir_client/src/components/FirAppInfossecurity.vue
index f379fb3..ef8147e 100644
--- a/fir_client/src/components/FirAppInfossecurity.vue
+++ b/fir_client/src/components/FirAppInfossecurity.vue
@@ -67,12 +67,14 @@
 
 <script>
     import { updateapp, } from "../restful"
+    import {deepCopy} from "../utils";
 
     export default {
         name: "FirAppInfossecurity",
         data() {
             return {
                 currentapp: {},
+                orgcurrentapp: {},
                 downtip:{'msg':''},
                 supersign:{'msg':''},
                 passwordtip:{'msg':''},
@@ -93,6 +95,13 @@
                         this.$message.success('数据更新成功');
                     }else {
                         this.$message.error('操作失败,'+data.msg);
+
+                        this.currentapp=deepCopy(this.orgcurrentapp);
+                        this.passwordflag=false;
+                        this.showdownloadflag=false;
+                        this.showsupersignflag=false;
+                        this.setbuttondefault(this.currentapp);
+
                     }
                 }, {
                     "app_id": this.currentapp.app_id,
@@ -242,11 +251,13 @@
                 }
             },
             appinit(){
+
                 this.currentapp = this.$store.state.currentapp;
                 this.passwordflag=false;
                 this.showdownloadflag=false;
                 this.showsupersignflag=false;
                 this.setbuttondefault(this.currentapp);
+                this.orgcurrentapp=deepCopy(this.currentapp)
             }
         },
         mounted() {
diff --git a/fir_client/src/components/FirUserProfileStorage.vue b/fir_client/src/components/FirUserProfileStorage.vue
index a3baa7a..64bea42 100644
--- a/fir_client/src/components/FirUserProfileStorage.vue
+++ b/fir_client/src/components/FirUserProfileStorage.vue
@@ -197,6 +197,7 @@
 
 <script>
     import {getStorageinfo} from "../restful";
+    import {deepCopy} from "../utils";
 
     export default {
         name: "FirUserProfileStorage",
@@ -219,24 +220,18 @@
                 is_admin_storage:false,
             }
         }, methods: {
-            deepCopy(source) {
-                let result={};
-                for (let key in source) {
-                    result[key] = typeof source[key]==='object'? this.deepCopy(source[key]): source[key];
-                }
-                return result;
-            },
+
             showstorage(editstorageinfo){
                 this.title='查看存储信息';
                 this.disabled=true;
                 this.dialogstorageVisible=true;
-                this.editstorageinfo=this.deepCopy(editstorageinfo);
+                this.editstorageinfo=deepCopy(editstorageinfo);
             },
             editstorage(editstorageinfo){
                 this.title='存储编辑';
                 this.disabled=false;
                 this.dialogstorageVisible=true;
-                this.editstorageinfo=this.deepCopy(editstorageinfo);
+                this.editstorageinfo=deepCopy(editstorageinfo);
                 this.isaddflag=false;
             },add_storage_click(){
                 this.title='新增存储';
diff --git a/fir_client/src/utils/index.js b/fir_client/src/utils/index.js
index 8dd7978..1141300 100644
--- a/fir_client/src/utils/index.js
+++ b/fir_client/src/utils/index.js
@@ -196,4 +196,13 @@ export function removeAaary(_arr, _obj) {
             }
         }
     }
+}
+
+//深拷贝
+export function deepCopy(source) {
+    let result={};
+    for (let key in source) {
+        result[key] = typeof source[key]==='object'? deepCopy(source[key]): source[key];
+    }
+    return result;
 }
\ No newline at end of file
diff --git a/fir_ser/api/views/apps.py b/fir_ser/api/views/apps.py
index 1663918..5806d22 100644
--- a/fir_ser/api/views/apps.py
+++ b/fir_ser/api/views/apps.py
@@ -8,14 +8,14 @@ from rest_framework.views import APIView
 from api.utils.response import BaseResponse
 from api.utils.auth import ExpiringTokenAuthentication
 from rest_framework.response import Response
-from django.db.models import Sum
+from django.db.models import Sum,F
 import os
 from fir_ser import settings
 from api.utils.app.supersignutils import IosUtils
 from api.utils.app.randomstrings import make_from_user_uuid
 from api.utils.storage.storage import Storage
 from api.utils.storage.caches import del_cache_response_by_short,get_app_today_download_times
-from api.models import Apps, AppReleaseInfo,APPToDeveloper
+from api.models import Apps, AppReleaseInfo,APPToDeveloper,AppIOSDeveloperInfo
 from api.utils.serializer import AppsSerializer, AppReleaseSerializer, UserInfoSerializer
 from rest_framework.pagination import PageNumberPagination
 
@@ -181,6 +181,18 @@ class AppInfoView(APIView):
                     apps_obj.password = data.get("password", apps_obj.password)
                     apps_obj.isshow = data.get("isshow", apps_obj.isshow)
                     if apps_obj.type == 1:
+                        now_can_use_number=0
+                        developer_obj = AppIOSDeveloperInfo.objects.filter(user_id=request.user)
+                        use_number_dict = developer_obj.filter(is_actived=True).filter(use_number__lt=F("usable_number")).aggregate(
+                                usable_number=Sum('usable_number'), use_number=Sum('use_number'))
+                        if use_number_dict and use_number_dict.get("usable_number", 0) and use_number_dict.get(
+                                "use_number", 0):
+                            now_can_use_number = use_number_dict.get("usable_number", 0) - use_number_dict.get(
+                                "use_number", 0)
+                        if now_can_use_number == 0:
+                            res.code = 1008
+                            res.msg = "超级签余额不足，无法开启"
+                            return Response(res.dict)
                         apps_obj.issupersign = data.get("issupersign", apps_obj.issupersign)
                     apps_obj.save()
                 except Exception as e:
diff --git a/fir_ser/api/views/supersign.py b/fir_ser/api/views/supersign.py
index f4b94be..e120ff4 100644
--- a/fir_ser/api/views/supersign.py
+++ b/fir_ser/api/views/supersign.py
@@ -82,7 +82,10 @@ class DeveloperView(APIView):
                             if IosUtils.active_developer(developer_obj,code):
                                 developer_obj.is_actived=True
                                 developer_obj.save()
-                                IosUtils.create_developer_cert(developer_obj,request.user)
+                                if developer_obj.certid and len(developer_obj.certid) > 6:
+                                    pass
+                                else:
+                                    IosUtils.create_developer_cert(developer_obj,request.user)
                 else:
                     developer_obj.usable_number=data.get("usable_number",developer_obj.usable_number)
                     developer_obj.description = data.get("description", developer_obj.description)
diff --git a/fir_ser/nginx-vhost.conf b/fir_ser/nginx-vhost.conf
index 605e665..75c47a4 100644
--- a/fir_ser/nginx-vhost.conf
+++ b/fir_ser/nginx-vhost.conf
@@ -40,7 +40,7 @@ server
 
 
 
-    location ~ ^/(download|api|files) {
+    location ~ ^/(download|api|files|udid) {
         #proxy_pass http://synchrotron;
 
         include  uwsgi_params;
@@ -48,12 +48,12 @@ server
         uwsgi_param UWSGI_SCRIPT wsgi;
 }
 
-    location ~ ^/(index|apps|user|login) {
+    location ~ ^/(index|apps|user|login|supersign) {
         try_files $uri $uri/  /index.html;
     }
 
     location / {
-        try_files $uri $uri/  /appdownload/index.html;
+        try_files $uri $uri/  /short.html;
     }