From eeba5b409a8e5cb3af26380e365628c8380f478e Mon Sep 17 00:00:00 2001
From: MMXX <devops>
Date: Thu, 10 Mar 2022 12:03:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/user/FirSuperSignBase.vue  | 77 ++++++++++---------
 .../api/management/commands/services/hands.py |  7 ++
 .../commands/services/services/base.py        |  2 +
 .../api/management/commands/services/utils.py |  1 +
 fir_ser/api/tasks.py                          |  7 +-
 fir_ser/api/utils/ctasks.py                   |  9 ++-
 fir_ser/fir_ser/settings.py                   | 16 ++--
 fir_ser/readme.txt                            |  2 +
 fir_ser/xsign/utils/iossignapi.py             |  2 +-
 fir_ser/xsign/utils/supersignutils.py         |  4 +
 fir_ser/xsign/views/supersign.py              |  3 +-
 11 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/fir_client/src/components/user/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue
index 2a1077a..ed67650 100644
--- a/fir_client/src/components/user/FirSuperSignBase.vue
+++ b/fir_client/src/components/user/FirSuperSignBase.vue
@@ -139,7 +139,7 @@
           <el-input v-model="editdeveloperinfo.certid" :disabled='isedit'/>
         </el-form-item>
         <el-form-item label="备注" label-width="110px">
-          <el-input v-model="editdeveloperinfo.description"/>
+          <el-input v-model="editdeveloperinfo.description" :rows="3" type="textarea"/>
         </el-form-item>
         <div style="">
           <el-button v-if="isedit && editdeveloperinfo.certid" size="small"
@@ -164,7 +164,7 @@
           <el-button v-if="isedit && editdeveloperinfo.status!==0" size="small" type="success"
                      @click="activedeveloperFun(editdeveloperinfo,'checkauth')">账户激活检测
           </el-button>
-          <el-divider/>
+          <el-divider v-if="isedit && editdeveloperinfo.certid"/>
           <el-tooltip content="清理发布证书，如果发布证书过期时间大于3天，将不会删除开发者发布证书，发布证书只能同时创建两个，请谨慎操作">
             <div>
               <el-button v-if="isedit &&  editdeveloperinfo.certid"
@@ -399,9 +399,9 @@
           <el-table-column
               align="center"
               fixed
-              label="开发者ID issuer_id"
+              label="开发者 ID issuer_id"
               prop="issuer_id"
-              width="160">
+              width="180">
             <template slot-scope="scope">
               <el-popover placement="top" trigger="hover">
                 <el-tooltip content="点击复制到剪贴板">
@@ -428,21 +428,6 @@
             </template>
 
           </el-table-column>
-          <el-table-column
-              align="center"
-              label="是否激活"
-              prop="status"
-              width="105">
-            <template slot-scope="scope">
-              <el-tooltip v-if="scope.row.status!==0" content="点击禁用">
-                <el-button size="small" type="success" @click="disabledeveloperFun(scope.row,'disable')">已激活</el-button>
-              </el-tooltip>
-              <el-button v-else size="small" type="danger"
-                         @click="activedeveloperFun(scope.row,'checkauth')">点击激活
-              </el-button>
-
-            </template>
-          </el-table-column>
           <el-table-column
               align="center"
               label="账户状态"
@@ -452,20 +437,38 @@
             <template slot-scope="scope">
               <el-popover placement="top" trigger="hover">
                 <p v-if="!scope.row.certid && scope.row.status!==0">
-                  开发证书不可用，请在编辑中导入或手动创建发布证书</p>
-                <p v-if="!scope.row.certid && scope.row.status=== 0">请先激活开发者账户</p>
+                  开发证书不可用，请在
+                  <el-link :underline="false" type="primary" @click="handleEditDeveloper(scope.row)">编辑</el-link>
+                  中导入或手动创建发布证书
+                </p>
+                <p v-if="scope.row.status=== 0">请
+                  <el-link :underline="false" type="primary" @click="activedeveloperFun(scope.row,'checkauth')">点击激活
+                  </el-link>
+                  开发者账户
+                </p>
                 <p v-if="scope.row.certid && scope.row.status!==0">{{ format_status(scope.row.status) }}</p>
                 <div slot="reference" class="name-wrapper">
-                  <div v-if="scope.row.certid">
-                    <el-button v-if="scope.row.status === 1" size="small" type="success">
-                      {{ format_status(scope.row.status) }}
-                    </el-button>
-                    <el-button v-else size="small" type="warning" @click="activedeveloperFun(scope.row,'checkauth')">
-                      {{ format_status(scope.row.status) }}
+                  <div v-if="scope.row.status=== 0">
+                    <el-button size="small" type="danger"
+                               @click="activedeveloperFun(scope.row,'checkauth')">点击激活
                     </el-button>
                   </div>
-
-                  <el-button v-else size="small" type="danger">不可用</el-button>
+                  <div v-else-if="scope.row.status === 1">
+                    <el-tooltip v-if="scope.row.status!==0" content="点击禁用">
+
+                      <el-button v-if="scope.row.certid" size="small" type="success"
+                                 @click="disabledeveloperFun(scope.row,'disable')">
+                        {{ format_status(scope.row.status) }}
+                      </el-button>
+                      <el-button v-else size="small" type="warning" @click="disabledeveloperFun(scope.row,'disable')">
+                        不可用
+                      </el-button>
+
+                    </el-tooltip>
+                  </div>
+                  <el-button v-else size="small" type="warning" @click="activedeveloperFun(scope.row,'checkauth')">
+                    {{ format_status(scope.row.status) }}
+                  </el-button>
                 </div>
               </el-popover>
 
@@ -559,19 +562,21 @@
               <el-tag v-else size="medium" type="info">否</el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-              :formatter="formatter"
-              align="center"
-              label="证书到期时间"
-              prop="cert_expire_time"
-              width="160">
-          </el-table-column>
+
           <el-table-column
               align="center"
               label="备注"
+              min-width="160"
               prop="description"
           >
           </el-table-column>
+          <el-table-column
+              :formatter="formatter"
+              align="center"
+              label="证书到期时间"
+              prop="cert_expire_time"
+              width="100">
+          </el-table-column>
           <el-table-column
               align="center"
               fixed="right"
diff --git a/fir_ser/api/management/commands/services/hands.py b/fir_ser/api/management/commands/services/hands.py
index bfceb79..ad0b2b3 100644
--- a/fir_ser/api/management/commands/services/hands.py
+++ b/fir_ser/api/management/commands/services/hands.py
@@ -7,8 +7,10 @@ import time
 import psutil
 from django.conf import settings
 
+from api.tasks import start_api_sever_do_clean
 from config import BASECONF
 from config import BASE_DIR
+from xsign.utils.iproxy import clean_ip_proxy_infos
 
 try:
     __version__ = BASECONF.VERSION
@@ -69,6 +71,11 @@ def prepare():
     perform_db_migrate()
 
 
+def clean_cache():
+    start_api_sever_do_clean()
+    clean_ip_proxy_infos()
+
+
 def get_sys_thread_num():
     return psutil.cpu_count(False) if psutil.cpu_count(False) else 2
 
diff --git a/fir_ser/api/management/commands/services/services/base.py b/fir_ser/api/management/commands/services/services/base.py
index 29b1d38..269254d 100644
--- a/fir_ser/api/management/commands/services/services/base.py
+++ b/fir_ser/api/management/commands/services/services/base.py
@@ -141,6 +141,8 @@ class BaseService(object):
         uid = get_user_id(self.uid)
         gid = get_user_id(self.gid)
         u_gid = uid if uid else gid
+        if u_gid is None:
+            u_gid = os.getuid()
         if u_gid is not None:
             for (dir_path, dir_names, filenames) in os.walk(LOG_DIR):
                 for filename in filenames + dir_names:
diff --git a/fir_ser/api/management/commands/services/utils.py b/fir_ser/api/management/commands/services/utils.py
index 5d774e6..de7fee0 100644
--- a/fir_ser/api/management/commands/services/utils.py
+++ b/fir_ser/api/management/commands/services/utils.py
@@ -39,6 +39,7 @@ class ServicesUtil(object):
     def start(self):
         if 'uwsgi' in [service.name for service in self._services]:
             prepare()
+            clean_cache()
 
         for service in self._services:
             service: BaseService
diff --git a/fir_ser/api/tasks.py b/fir_ser/api/tasks.py
index 879c39a..5fe5610 100644
--- a/fir_ser/api/tasks.py
+++ b/fir_ser/api/tasks.py
@@ -8,7 +8,7 @@ import logging
 
 from captcha.models import CaptchaStore
 
-from api.utils.ctasks import sync_download_times, auto_clean_upload_tmp_file
+from api.utils.ctasks import sync_download_times, auto_clean_upload_tmp_file, auto_clean_remote_client_log
 from api.views.login import get_login_type
 from common.core.sysconfig import Config, invalid_config_cache
 from common.libs.geetest.geetest_utils import check_bypass_status
@@ -64,3 +64,8 @@ def auto_delete_tmp_file_job():
 def sync_wx_access_token_job():
     if get_login_type().get('third', '').get('wxp'):
         sync_wx_access_token()
+
+
+@app.task
+def auto_clean_remote_client_job():
+    auto_clean_remote_client_log()
diff --git a/fir_ser/api/utils/ctasks.py b/fir_ser/api/utils/ctasks.py
index d9cda65..0023567 100644
--- a/fir_ser/api/utils/ctasks.py
+++ b/fir_ser/api/utils/ctasks.py
@@ -3,13 +3,13 @@
 # project: 4月
 # author: liuyu
 # date: 2020/4/7
-
+import datetime
 import logging
 import time
 
 from django.core.cache import cache
 
-from api.models import Apps, UserInfo
+from api.models import Apps, UserInfo, RemoteClientInfo
 from common.utils.storage import Storage
 from fir_ser.settings import CACHE_KEY_TEMPLATE
 
@@ -45,3 +45,8 @@ def auto_clean_upload_tmp_file():
 
                 cache.delete(upload_tem_file_key)
                 logger.info(f"auto_clean_upload_tmp_file upload_tem_file_key :{upload_tem_file_key}")
+
+
+def auto_clean_remote_client_log(clean_day=30):
+    clean_time = datetime.datetime.now() - datetime.timedelta(days=clean_day)
+    return RemoteClientInfo.objects.filter(created_time__lt=clean_time).delete()
diff --git a/fir_ser/fir_ser/settings.py b/fir_ser/fir_ser/settings.py
index f43dec0..ba6b37d 100644
--- a/fir_ser/fir_ser/settings.py
+++ b/fir_ser/fir_ser/settings.py
@@ -459,18 +459,12 @@ CELERY_BEAT_SCHEDULE = {
         'schedule': SYNC_CACHE_TO_DATABASE.get("auto_clean_captcha_store_times"),
         'args': ()
     },
-    'auto_check_ios_developer_active_job': {
-        'task': 'xsign.tasks.auto_check_ios_developer_active_job',
+    'auto_clean_remote_client_job': {
+        'task': 'api.tasks.auto_clean_remote_client_job',
         # 'schedule': SYNC_CACHE_TO_DATABASE.get("auto_check_ios_developer_active_times"),
         'schedule': crontab(hour=1, minute=1),
         'args': ()
     },
-    # 'start_api_sever_do_clean': {
-    #     'task': 'api.tasks.start_api_sever_do_clean',
-    #     'schedule': 6,
-    #     'args': (),
-    #     'one_off': True
-    # },
     'sync_wx_access_token_job': {
         'task': 'api.tasks.sync_wx_access_token_job',
         'schedule': SYNC_CACHE_TO_DATABASE.get("wx_get_access_token_times"),
@@ -481,6 +475,12 @@ CELERY_BEAT_SCHEDULE = {
         'schedule': SYNC_CACHE_TO_DATABASE.get("best_proxy_ips_times"),
         'args': (),
     },
+    'auto_check_ios_developer_active_job': {
+        'task': 'xsign.tasks.auto_check_ios_developer_active_job',
+        # 'schedule': SYNC_CACHE_TO_DATABASE.get("auto_check_ios_developer_active_times"),
+        'schedule': crontab(hour=1, minute=1),
+        'args': ()
+    },
 }
 
 # listen port
diff --git a/fir_ser/readme.txt b/fir_ser/readme.txt
index f5026d1..444d903 100644
--- a/fir_ser/readme.txt
+++ b/fir_ser/readme.txt
@@ -12,6 +12,8 @@ celery multi start 4 -A fir_ser -l INFO -c4  --pidfile=/var/run/celery/%n.pid --
 启动beat
 nohup celery -A fir_ser beat --uid=1000 --pidfile=logs/beat.pid --scheduler django -l INFO --logfile=logs/beat.log &
 
+# 启动uwsgi 建议修改  /proc/sys/net/core/somaxconn 为512
+# 或者在 /etc/sysctl.conf  底部加入 net.core.somaxconn = 512  ,然后 sysctl -p
 
 #开发测试
 celery -A fir_ser worker --uid=1000 --beat --scheduler django --loglevel=debug
diff --git a/fir_ser/xsign/utils/iossignapi.py b/fir_ser/xsign/utils/iossignapi.py
index 39cc0a2..6310897 100644
--- a/fir_ser/xsign/utils/iossignapi.py
+++ b/fir_ser/xsign/utils/iossignapi.py
@@ -254,7 +254,7 @@ class AppDeveloperApiV2(object):
         attr = object.__getattribute__(self, name)
         if hasattr(attr, '__call__'):
             def func(*args, **kwargs):
-                if attr.__name__ in ['active', 'get_device']:
+                if attr.__name__ in ['active', 'get_device', '__result_format']:
                     return attr(*args, **kwargs)
                 else:
                     if AppIOSDeveloperInfo.objects.filter(pk=self.developer_pk,
diff --git a/fir_ser/xsign/utils/supersignutils.py b/fir_ser/xsign/utils/supersignutils.py
index 9f3ef50..b7cfcfb 100644
--- a/fir_ser/xsign/utils/supersignutils.py
+++ b/fir_ser/xsign/utils/supersignutils.py
@@ -1071,6 +1071,10 @@ class IosUtils(object):
     def get_device_from_developer(developer_obj):
         app_api_obj = get_api_obj(developer_obj)
         status, result = app_api_obj.get_device()
+        # 获取设备列表的时候，有时候会发生灵异事件，尝试多次获取 【也可能是未知bug导致】
+        if status and isinstance(result, list) and len(result) == 0:
+            time.sleep(2)
+            status, result = app_api_obj.get_device()
         if status and developer_obj.issuer_id:
 
             udid_developer_obj_list = UDIDsyncDeveloper.objects.filter(developerid=developer_obj).values_list('udid')
diff --git a/fir_ser/xsign/views/supersign.py b/fir_ser/xsign/views/supersign.py
index 9de75ed..aa7869e 100644
--- a/fir_ser/xsign/views/supersign.py
+++ b/fir_ser/xsign/views/supersign.py
@@ -129,8 +129,7 @@ class DeveloperView(APIView):
                 if act == "checkauth":
                     status, result = IosUtils.active_developer(developer_obj)
                     if status:
-                        if not developer_obj.certid:
-                            IosUtils.get_device_from_developer(developer_obj)
+                        IosUtils.get_device_from_developer(developer_obj)
                         return Response(res.dict)
                     else:
                         res.code = 1008