From 75fecbca100303088093503a6bb24ce424d4e73f Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Fri, 25 Feb 2022 09:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E5=90=8D=E9=87=8D?=
 =?UTF-8?q?=E7=AD=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/user/FirSuperSignBase.vue  | 28 +++++++++++++------
 fir_ser/xsign/views/supersign.py              | 12 +++++---
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/fir_client/src/components/user/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue
index 4758023..8f5f393 100644
--- a/fir_client/src/components/user/FirSuperSignBase.vue
+++ b/fir_client/src/components/user/FirSuperSignBase.vue
@@ -161,16 +161,26 @@
                        @click="isocertcert">手动创建发布证书
             </el-button>
           </el-tooltip>
-          <el-tooltip content="清理发布证书，如果发布证书过期时间大于3天，将不会删除开发者发布证书，发布证书只能同时创建两个，请谨慎操作">
-            <el-button v-if="isedit &&  editdeveloperinfo.certid"
-                       size="small"
-                       type="danger"
-                       @click="isorenewcert">删除发布证书
-            </el-button>
-          </el-tooltip>
           <el-button v-if="isedit && editdeveloperinfo.status!==0" size="small" type="success"
                      @click="activedeveloperFun(editdeveloperinfo,'checkauth')">账户激活检测
           </el-button>
+          <el-divider/>
+          <el-tooltip content="清理发布证书，如果发布证书过期时间大于3天，将不会删除开发者发布证书，发布证书只能同时创建两个，请谨慎操作">
+            <div>
+              <el-button v-if="isedit &&  editdeveloperinfo.certid"
+                         size="small"
+                         type="danger"
+                         @click="isorenewcert('cleancert')">删除发布证书并清理签名数据
+              </el-button>
+              <el-button v-if="isedit &&  editdeveloperinfo.certid"
+                         size="small"
+                         type="danger"
+                         @click="isorenewcert('renewcert')">删除过期发布证书并重新签署新的证书
+              </el-button>
+            </div>
+
+          </el-tooltip>
+          <el-divider/>
           <!--          <el-button v-if="isedit && editdeveloperinfo.is_actived" size="small" @click="bindAppletoapp(editdeveloperinfo)">专属应用</el-button>-->
           <el-button @click="updateorcreate">保存</el-button>
           <el-button @click="canceledit">取消</el-button>
@@ -1709,7 +1719,7 @@ export default {
       developercert(data => {
       }, {methods: 'FILE', data: {issuer_id: this.editdeveloperinfo.issuer_id}})
     },
-    isorenewcert() {
+    isorenewcert(act) {
       this.$confirm('此操作将永久删除该发布证书, 建议先导出证书。是否继续删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1717,7 +1727,7 @@ export default {
       }).then(() => {
         this.iosdeveloperFun({
           "methods": "PUT",
-          "data": {"issuer_id": this.editdeveloperinfo.issuer_id, "act": "renewcert"}
+          "data": {"issuer_id": this.editdeveloperinfo.issuer_id, "act": act}
         });
       }).catch(() => {
         this.$message({
diff --git a/fir_ser/xsign/views/supersign.py b/fir_ser/xsign/views/supersign.py
index 358854a..9911e84 100644
--- a/fir_ser/xsign/views/supersign.py
+++ b/fir_ser/xsign/views/supersign.py
@@ -145,14 +145,18 @@ class DeveloperView(APIView):
                             res.code = 1008
                             res.msg = result.get("return_info")
                             return Response(res.dict)
-                elif act == "renewcert":
+                elif act in ["renewcert", "cleancert"]:
                     if developer_obj.certid:
                         # clean developer somethings. remove profile and  revoke cert
-                        IosUtils.clean_developer(developer_obj, request.user)
+                        if act == 'cleancert':
+                            IosUtils.clean_developer(developer_obj, request.user)
                         status, result = IosUtils.revoke_developer_cert(developer_obj, request.user)
                         if status:
-                            pass
-                            # status, result = IosUtils.create_developer_cert(developer_obj, request.user)
+                            if act == 'renewcert':
+                                AppUDID.objects.filter(udid__developerid=developer_obj).update(
+                                    sign_status=2)
+
+                                status, result = IosUtils.create_developer_cert(developer_obj, request.user)
                             # if status:
                             #     IosUtils.get_device_from_developer(developer_obj, request.user)
                             # else: