苹果应用授权码支持添加绑定设备

2 years ago · a7a1472533
parent 332d12bddf
commit a7a1472533
4 changed files with 103 additions and 15 deletions
--- a/fir_client/public/index.html
+++ b/fir_client/public/index.html
@ -2,9 +2,9 @@
 <html lang="zh">
 <head>
    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta content="width=device-width,initial-scale=1.0" name="viewport">
+    <link href="<%= BASE_URL %>favicon.ico" rel="icon">
    <script src="<%= BASE_URL %>gt.js"></script>
    <title>FLY分发平台</title>
 </head>
--- a/fir_client/public/short.html
+++ b/fir_client/public/short.html
@ -2,9 +2,9 @@
 <html lang="zh">
 <head>
    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta content="width=device-width,initial-scale=1.0" name="viewport">
+    <link href="<%= BASE_URL %>favicon.ico" rel="icon">
    <script src="<%= BASE_URL %>gt.js"></script>
    <title>应用下载</title>
 </head>
--- a/fir_client/src/components/apps/FirAppInfossecurity.vue
+++ b/fir_client/src/components/apps/FirAppInfossecurity.vue
@ -1,5 +1,6 @@
 <template>
  <div style="margin-top: 20px;width: 66%;margin-left: 8%">
+
    <el-dialog
        :close-on-click-modal="false"
        :close-on-press-escape="false"
@ -24,6 +25,25 @@
          title="下载授权码生成"
          width="500px">

+        <el-dialog
+            :visible.sync="addUdidVisible"
+            append-to-body
+            center
+            title="添加设备udid授权"
+            width="500px">
+          <el-tag style="margin: 10px 0">可以输入多个udid,以空格或者回车分割</el-tag>
+          <el-input
+              v-model="makeTokenInfo.udids"
+              :rows="17"
+              placeholder="可以输入多个udid,以空格或者回车分割"
+              type="textarea">
+          </el-input>
+          <span slot="footer">
+            <el-button @click="addUdidVisible=false,makeTokenInfo.udids=''">取消</el-button>
+            <el-button @click="addUididFunc">确定</el-button>
+        </span>
+        </el-dialog>
+
        <el-form ref="form" :model="makeTokenInfo" label-width="110px">
          <el-form-item label="指定授权码" style="width: 400px">
            <el-tag>当存在指定授权码，授权码长度和生成数量被禁用</el-tag>
@ -63,6 +83,12 @@
            </el-tooltip>
            <el-tag style="margin-left: 5px">绑定设备之后，二次自动进行设备授权下载应用</el-tag>
          </el-form-item>
+          <el-form-item v-if="currentapp.type===1 && currentapp.issupersign && makeTokenInfo.bind_status===true"
+                        label="添加授权设备">
+            <el-button size="mini" @click="addudid">
+              添加
+            </el-button>
+          </el-form-item>
        </el-form>
        <span slot="footer">
            <el-button @click="cancelDownloadToken">取消</el-button>
@ -154,7 +180,7 @@
            align="center"
            label="最大可用次数"
            prop="max_limit_count"
-            width="130">
+            width="110">
          <template slot-scope="scope">
            <span v-if="scope.row.max_limit_count === 0">不限次数</span>
            <span v-else>{{ scope.row.max_limit_count }}</span>
@ -175,16 +201,24 @@
              align="center"
              label="设备ID"
              prop="bind_udid">
+            <template slot-scope="scope">
+              <el-tooltip content="点击复制到剪贴板">
+                <el-link v-clipboard:copy="scope.row.bind_udid"
+                         v-clipboard:success="copy_success"
+                         :underline="false">{{ scope.row.bind_udid }}
+                </el-link>
+              </el-tooltip>
+            </template>
          </el-table-column>
        </div>
        <el-table-column
            align="center"
            fixed="right"
            label="操作"
-            width="120">
+            width="90">
          <template slot-scope="scope">
            <div>
-              <el-tooltip content="重置使用次数" placement="top">
+              <el-tooltip :content="get_reset_title()" placement="top">
                <el-button
                    size="mini"
                    @click="resetDownloadUsed(scope.row)">重置
@ -327,16 +361,42 @@ export default {
      app_download_token_list: [],
      loading: false,
      makeTokenVisible: false,
+      addUdidVisible: false,
      tokendisable: false,
      pagination: {"currentPage": 1, "total": 0, "pagesize": 10},
      dpwdsearch: '',
      dpwdtitle: '输入下载授权码',
-      makeTokenInfo: {token: '', token_length: 6, token_number: 20, token_max_used_number: 0, bind_status: false},
-      multipleSelection: []
-
+      makeTokenInfo: {
+        token: '',
+        token_length: 6,
+        token_number: 20,
+        token_max_used_number: 0,
+        bind_status: false,
+        udids: ''
+      },
+      multipleSelection: [],
    }
  },
  methods: {
+    addUididFunc() {
+      let udids = this.makeTokenInfo.udids
+      if (udids && udids.length > 10) {
+        this.makeDownloadToken()
+      } else {
+        this.$message.error('设备udid不存在，请检查')
+      }
+    },
+    get_reset_title() {
+      let title = '重置使用次数'
+      if (this.currentapp.type === 1 && this.currentapp.issupersign) {
+        title = '重置使用次数和授权设备ID'
+      }
+      return title
+    },
+    addudid() {
+      this.makeTokenInfo.udids = ''
+      this.addUdidVisible = true
+    },
    format_copy_text(token) {
      return this.currentapp.preview_url + "?password=" + token
    },
@ -369,8 +429,16 @@ export default {
      this.multipleSelection = val;
    },
    cancelDownloadToken() {
-      this.makeTokenInfo = {token: '', token_length: 6, token_number: 20, token_max_used_number: 0, bind_status: false}
+      this.makeTokenInfo = {
+        token: '',
+        token_length: 6,
+        token_number: 20,
+        token_max_used_number: 0,
+        bind_status: false,
+        udids: ''
+      }
      this.makeTokenVisible = false
+      this.addUdidVisible = false
    },
    resetDownloadUsed(info) {
      appDownloadToken(data => {
--- a/fir_ser/api/views/apps.py
+++ b/fir_ser/api/views/apps.py
@ -387,11 +387,18 @@ class AppDownloadTokenView(APIView):
        token_number = data.get('token_number')
        bind_status = data.get('bind_status')
        token_max_used_number = data.get('token_max_used_number')
+        udid_list_str = data.get('udids')
+        udid_list = []

        if not isinstance(bind_status, bool):
            bind_status = False
        if bind_status:
            token_max_used_number = 1
+            if udid_list_str and len(udid_list_str) > 10:
+                udid_list = udid_list_str.replace('  ', ' ').replace('\n', ' ').replace(',', ' ').replace('\r\n',
+                                                                                                          ' ').split()
+                udid_list = list(filter(lambda x: len(x) > 10, udid_list))
+                token = ''

        app_obj = Apps.objects.filter(user_id=request.user, app_id=app_id).first()
        if token and isinstance(token, str) and len(token) >= 4:
@ -408,6 +415,9 @@ class AppDownloadTokenView(APIView):
            else:
                token_number = 20

+            if udid_list:
+                token_number = len(udid_list)
+
            download_token_queryset = AppDownloadToken.objects.filter(app_id=app_obj).annotate(
                token_len=Length('token')).filter(token_len=token_length).values('token').all()
            exist_token = [d_token['token'] for d_token in download_token_queryset]
@ -415,9 +425,19 @@ class AppDownloadTokenView(APIView):
                                                        token_number=token_number + download_token_queryset.count(),
                                                        exist_token=copy.deepcopy(exist_token))
            bulk_list = []
+            d_index = 0
            for d_token in list(set(make_token_list) - set(exist_token))[:token_number]:
-                bulk_list.append(AppDownloadToken(token=d_token, max_limit_count=token_max_used_number, app_id=app_obj,
-                                                  bind_status=bind_status))
+                n_data = {
+                    'token': d_token,
+                    'max_limit_count': token_max_used_number,
+                    'app_id': app_obj,
+                    'bind_status': bind_status,
+                }
+                if udid_list:
+                    n_data['bind_udid'] = udid_list[d_index]
+                    n_data['used_count'] = 1
+                    d_index += 1
+                bulk_list.append(AppDownloadToken(**n_data))
            AppDownloadToken.objects.bulk_create(bulk_list)

        return Response(res.dict)