From 068561ae9905cf258258a0ba37aa7134ccf48f01 Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Fri, 29 Jan 2021 15:07:19 +0800
Subject: [PATCH] FORMAT CODE

---
 fir_client/public/config.js                   |  2 +-
 fir_client/src/components/FirAppInfosBase.vue |  4 +--
 .../src/components/FirAppInfossecurity.vue    |  4 +--
 fir_client/src/components/FirDownload.vue     | 13 ++++++----
 fir_client/src/components/FirHeader.vue       | 25 +++++++++----------
 fir_client/src/components/FirLogin.vue        | 16 ++++++------
 fir_client/src/components/FirRegist.vue       |  8 +++---
 fir_client/src/components/ShortDownload.vue   |  3 +++
 .../api/migrations/0011_auto_20210125_1137.py |  4 +--
 .../api/migrations/0012_auto_20210127_2101.py |  4 +--
 .../api/migrations/0013_auto_20210128_1815.py |  1 -
 fir_ser/api/views/apps.py                     |  7 +++---
 fir_ser/fir_ser/settings.py                   | 16 ++++++------
 13 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/fir_client/public/config.js b/fir_client/public/config.js
index 2629166..907699e 100644
--- a/fir_client/public/config.js
+++ b/fir_client/public/config.js
@@ -1,5 +1,5 @@
 window.g = {
-    baseUrl: 'https://fly.harmonygames.cn',
+    baseUrl: 'https://app.hehelucky.cn',
     footer:{
         copyright:'Copyright © 2017-2020 第九系艾文 版权所有.',
         ipcBeiAn:{
diff --git a/fir_client/src/components/FirAppInfosBase.vue b/fir_client/src/components/FirAppInfosBase.vue
index a3c1dbd..a436e2a 100644
--- a/fir_client/src/components/FirAppInfosBase.vue
+++ b/fir_client/src/components/FirAppInfosBase.vue
@@ -127,7 +127,7 @@
             },
             setfunactive(item, index) {
                 for (let key in this.$refs) {
-                    if(key === "qr") continue;
+                    if (key === "qr") continue;
                     if (key === item) {
                         this.$refs[key].classList.add('active');
                         this.$store.dispatch('doappInfoIndex', [[index, index], [index, index]]);
@@ -137,7 +137,7 @@
                 }
             },
             appDownload() {
-                window.open(location.origin + '/' + this.appinfos.short,'target','');
+                window.open(location.origin + '/' + this.appinfos.short, 'target', '');
                 // this.$router.push({name: 'FirDownload', params: {short: this.appinfos.short}})
             },
             defaulttimeline() {
diff --git a/fir_client/src/components/FirAppInfossecurity.vue b/fir_client/src/components/FirAppInfossecurity.vue
index 7e69ae4..7203622 100644
--- a/fir_client/src/components/FirAppInfossecurity.vue
+++ b/fir_client/src/components/FirAppInfossecurity.vue
@@ -377,8 +377,8 @@
                 this.set_default_flag();
                 this.setbuttondefault(this.currentapp);
                 this.orgcurrentapp = deepCopy(this.currentapp);
-                if(!this.currentapp.domain_name || this.currentapp.domain_name.length < 3){
-                    if(this.$store.state.userinfo.domain_name && this.$store.state.userinfo.domain_name.length > 3){
+                if (!this.currentapp.domain_name || this.currentapp.domain_name.length < 3) {
+                    if (this.$store.state.userinfo.domain_name && this.$store.state.userinfo.domain_name.length > 3) {
                         this.defualt_dtitle = this.$store.state.userinfo.domain_name;
                     }
                 }
diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index 9a06af3..1a9de05 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -430,11 +430,14 @@
                             }
                         }
                     } else {
-                        this.$message({
-                            message: data.msg,
-                            type: 'error',
-                            duration: 0
-                        });
+                        if (data.msg) {
+                            document.title = data.msg;
+                            this.$message({
+                                message: data.msg,
+                                type: 'error',
+                                duration: 0
+                            });
+                        }
                     }
                 }, params)
             },
diff --git a/fir_client/src/components/FirHeader.vue b/fir_client/src/components/FirHeader.vue
index 70af959..4a1c0f7 100644
--- a/fir_client/src/components/FirHeader.vue
+++ b/fir_client/src/components/FirHeader.vue
@@ -7,11 +7,11 @@
                     :visible.sync="dialogVisible"
                     width="30%"
                     center
-                    >
+            >
                 <span>可用于调用公开 API，可用于登录 fly-cli，请勿泄露您的 token</span>
-               <el-main>
+                <el-main>
                     <el-link type="primary" v-if="token" :underline="false">{{ token }}</el-link>
-               </el-main>
+                </el-main>
                 <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="maketoken">重新生成</el-button>
              </span>
@@ -75,12 +75,12 @@
             return {
                 current_user: {},
                 appName: '',
-                token:'',
-                dialogVisible:false
+                token: '',
+                dialogVisible: false
             }
         }, methods: {
-            maketoken(){
-                apitoken(data=>{
+            maketoken() {
+                apitoken(data => {
                     if (data.code === 1000) {
                         this.token = data.data.token;
                         this.$message({
@@ -88,7 +88,7 @@
                             message: '重新生成成功!'
                         });
                     }
-                },{methods: 'PUT',token:this.token});
+                }, {methods: 'PUT', token: this.token});
             },
             handleCommand(command) {
                 if (command === 'userinfo') {
@@ -100,16 +100,15 @@
                 } else if (command === 'supersign') {
                     this.$store.dispatch('doucurrentapp', {});
                     this.$router.push({"name": 'FirSuperSignBase', params: {act: "iosdeveloper"}})
-                }
-                else if (command === 'apitoken'){
+                } else if (command === 'apitoken') {
 
-                    this.dialogVisible=true;
+                    this.dialogVisible = true;
 
-                    apitoken(data=>{
+                    apitoken(data => {
                         if (data.code === 1000) {
                             this.token = data.data.token;
                         }
-                    },{methods: 'GET',token:this.token});
+                    }, {methods: 'GET', token: this.token});
 
                 } else if (command === 'exit') {
                     logout(data => {
diff --git a/fir_client/src/components/FirLogin.vue b/fir_client/src/components/FirLogin.vue
index 61a1efd..5cec09a 100644
--- a/fir_client/src/components/FirLogin.vue
+++ b/fir_client/src/components/FirLogin.vue
@@ -33,7 +33,8 @@
                 </el-tabs>
 
                 <el-form-item v-if="is_cptch">
-                    <el-input v-model="form.password" prefix-icon="el-icon-lock" placeholder="密码"  @keyup.enter.native="onSubmit"
+                    <el-input v-model="form.password" prefix-icon="el-icon-lock" placeholder="密码"
+                              @keyup.enter.native="onSubmit"
                               show-password></el-input>
                 </el-form-item>
                 <el-form-item v-else>
@@ -43,7 +44,8 @@
                 <el-form-item style="height: 40px" v-if="cptch.cptch_image">
                     <el-row style="height: 40px">
                         <el-col :span="16">
-                            <el-input placeholder="请输入验证码" v-model="form.authcode" maxlength="6" @keyup.enter.native="onSubmit"></el-input>
+                            <el-input placeholder="请输入验证码" v-model="form.authcode" maxlength="6"
+                                      @keyup.enter.native="onSubmit"></el-input>
                         </el-col>
                         <el-col :span="8">
                             <el-image
@@ -95,9 +97,9 @@
             }
         },
         methods: {
-            is_cptch(){
-                let cptch_flag= this.form.authcode.length === this.cptch.length;
-                if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){
+            is_cptch() {
+                let cptch_flag = this.form.authcode.length === this.cptch.length;
+                if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
                     cptch_flag = true
                 }
                 return cptch_flag
@@ -107,8 +109,8 @@
                 let password = this.form.password;
                 let authcode = this.form.authcode;
                 let login_type = 'up';
-                let cptch_flag= this.form.authcode.length === this.cptch.length;
-                if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){
+                let cptch_flag = this.form.authcode.length === this.cptch.length;
+                if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
                     cptch_flag = true
                 }
                 if (cptch_flag) {
diff --git a/fir_client/src/components/FirRegist.vue b/fir_client/src/components/FirRegist.vue
index 6e97055..10c383e 100644
--- a/fir_client/src/components/FirRegist.vue
+++ b/fir_client/src/components/FirRegist.vue
@@ -159,8 +159,8 @@
                     act = 'email'
                 }
                 let authcode = this.form.authcode;
-                let cptch_flag= authcode.length === this.cptch.length;
-                if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){
+                let cptch_flag = authcode.length === this.cptch.length;
+                if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
                     cptch_flag = true
                 }
                 if (cptch_flag) {
@@ -242,8 +242,8 @@
                     return
                 }
                 let authcode = this.form.authcode;
-                let cptch_flag= authcode.length === this.cptch.length;
-                if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){
+                let cptch_flag = authcode.length === this.cptch.length;
+                if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
                     cptch_flag = true
                 }
                 if (cptch_flag) {
diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue
index 5f4321d..ba5e34c 100644
--- a/fir_client/src/components/ShortDownload.vue
+++ b/fir_client/src/components/ShortDownload.vue
@@ -427,6 +427,9 @@
 
                     } else {
                         this.iserror = true;
+                        if (data.msg) {
+                            document.title = data.msg;
+                        }
                     }
                 }, params)
             },
diff --git a/fir_ser/api/migrations/0011_auto_20210125_1137.py b/fir_ser/api/migrations/0011_auto_20210125_1137.py
index e5d967d..28a94ea 100644
--- a/fir_ser/api/migrations/0011_auto_20210125_1137.py
+++ b/fir_ser/api/migrations/0011_auto_20210125_1137.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0010_userinfo_api_token'),
     ]
@@ -17,6 +16,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='udidsyncdeveloper',
             name='platform',
-            field=models.SmallIntegerField(choices=[(0, 'app developer'), (1, 'fly分发')], default=0, verbose_name='udid所在平台'),
+            field=models.SmallIntegerField(choices=[(0, 'app developer'), (1, 'fly分发')], default=0,
+                                           verbose_name='udid所在平台'),
         ),
     ]
diff --git a/fir_ser/api/migrations/0012_auto_20210127_2101.py b/fir_ser/api/migrations/0012_auto_20210127_2101.py
index 4caa2ff..558f1b7 100644
--- a/fir_ser/api/migrations/0012_auto_20210127_2101.py
+++ b/fir_ser/api/migrations/0012_auto_20210127_2101.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0011_auto_20210125_1137'),
     ]
@@ -13,6 +12,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='udidsyncdeveloper',
             name='platform',
-            field=models.SmallIntegerField(choices=[(0, 'fly分发'), (1, 'app developer')], default=0, verbose_name='udid所在平台'),
+            field=models.SmallIntegerField(choices=[(0, 'fly分发'), (1, 'app developer')], default=0,
+                                           verbose_name='udid所在平台'),
         ),
     ]
diff --git a/fir_ser/api/migrations/0013_auto_20210128_1815.py b/fir_ser/api/migrations/0013_auto_20210128_1815.py
index 1cec7dd..865bbe8 100644
--- a/fir_ser/api/migrations/0013_auto_20210128_1815.py
+++ b/fir_ser/api/migrations/0013_auto_20210128_1815.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('api', '0012_auto_20210127_2101'),
     ]
diff --git a/fir_ser/api/views/apps.py b/fir_ser/api/views/apps.py
index a99b04a..8dc9ffd 100644
--- a/fir_ser/api/views/apps.py
+++ b/fir_ser/api/views/apps.py
@@ -8,7 +8,7 @@ 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, F
+from django.db.models import Sum
 from api.utils.app.supersignutils import IosUtils
 from api.utils.storage.storage import Storage
 from api.utils.storage.caches import del_cache_response_by_short, get_app_today_download_times
@@ -16,9 +16,10 @@ from api.models import Apps, AppReleaseInfo, APPToDeveloper, AppIOSDeveloperInfo
 from api.utils.serializer import AppsSerializer, AppReleaseSerializer, UserInfoSerializer
 from rest_framework.pagination import PageNumberPagination
 import logging
-from fir_ser.settings import CACHE_KEY_TEMPLATE, SERVER_DOMAIN, REGISTER, LOGIN
+from fir_ser.settings import SERVER_DOMAIN
 from api.utils.storage.caches import set_default_app_wx_easy
-from api.utils.utils import  is_valid_domain
+from api.utils.utils import is_valid_domain
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/fir_ser/fir_ser/settings.py b/fir_ser/fir_ser/settings.py
index 36ed18f..590748a 100644
--- a/fir_ser/fir_ser/settings.py
+++ b/fir_ser/fir_ser/settings.py
@@ -181,7 +181,7 @@ REGISTER = {
 
 # 信息修改也会使用该配置
 LOGIN = {
-    "captcha": True,  # 是否开启登录字母验证码
+    "captcha": False,  # 是否开启登录字母验证码
     "login_type": {
         'sms': True,  # 短信登录
         'email': True,  # 邮件登录
@@ -196,7 +196,7 @@ THIRD_PART_CONFIG = {
             'name': 'local',
             'type': 0,
             'auth': {
-                'domain_name': 'fly.harmonygames.cn',  # 正式环境需要填写正式的访问域名
+                'domain_name': 'app.hehelucky.cn',  # 正式环境需要填写正式的访问域名
                 'is_https': True,
             },
             'active': True
@@ -311,19 +311,19 @@ SYNC_CACHE_TO_DATABASE = {
 
 SERVER_DOMAIN = {
     'IOS_PMFILE_DOWNLOAD_DOMAIN': {
-        "domain_name": 'fly.harmonygames.cn',
+        "domain_name": 'app.hehelucky.cn',
         'is_https': True,
     },  # ios 描述文件和plist文件下载域名，该域名用于后端，一般为api访问域名
-    'POST_UDID_DOMAIN': 'https://fly.harmonygames.cn',  # 超级签名 安装签名时 向该域名 发送udid数据，该域名用于后端，一般为 api 访问域名
-    'REDIRECT_UDID_DOMAIN': 'https://fly.harmonygames.cn',  # 超级签名 安装完成之后，跳转域名，该域名为前端web访问域名，如果用户定义了自己的域名，则跳转用户域名
-    'FILE_UPLOAD_DOMAIN': 'https://fly.harmonygames.cn',  # 本地文件上传域名，使用本地存储必须配置
+    'POST_UDID_DOMAIN': 'https://app.hehelucky.cn',  # 超级签名 安装签名时 向该域名 发送udid数据，该域名用于后端，一般为 api 访问域名
+    'REDIRECT_UDID_DOMAIN': 'https://app.hehelucky.cn',  # 超级签名 安装完成之后，跳转域名，该域名为前端web访问域名，如果用户定义了自己的域名，则跳转用户域名
+    'FILE_UPLOAD_DOMAIN': 'https://app.hehelucky.cn',  # 本地文件上传域名，使用本地存储必须配置
 }
 
 MOBILECONFIG_SIGN_SSL = {
     # 描述文件是否签名，默认是关闭状态；如果开启，并且ssl_key_path 和 ssl_pem_path 正常，则使用填写的ssl进行签名,否则默认不签名
     'open': False,
-    'ssl_key_path': '/data/cert/fly.harmonygames.cn.key',
-    'ssl_pem_path': '/data/cert/fly.harmonygames.cn.pem'
+    'ssl_key_path': '/data/cert/app.hehelucky.cn.key',
+    'ssl_pem_path': '/data/cert/app.hehelucky.cn.pem'
 }
 
 DEFAULT_MOBILEPROVISION = {