FORMAT CODE

super_sign_new
nineven 4 years ago
parent aed955c657
commit 068561ae99
  1. 2
      fir_client/public/config.js
  2. 4
      fir_client/src/components/FirAppInfosBase.vue
  3. 4
      fir_client/src/components/FirAppInfossecurity.vue
  4. 3
      fir_client/src/components/FirDownload.vue
  5. 19
      fir_client/src/components/FirHeader.vue
  6. 16
      fir_client/src/components/FirLogin.vue
  7. 8
      fir_client/src/components/FirRegist.vue
  8. 3
      fir_client/src/components/ShortDownload.vue
  9. 4
      fir_ser/api/migrations/0011_auto_20210125_1137.py
  10. 4
      fir_ser/api/migrations/0012_auto_20210127_2101.py
  11. 1
      fir_ser/api/migrations/0013_auto_20210128_1815.py
  12. 5
      fir_ser/api/views/apps.py
  13. 16
      fir_ser/fir_ser/settings.py

@ -1,5 +1,5 @@
window.g = { window.g = {
baseUrl: 'https://fly.harmonygames.cn', baseUrl: 'https://app.hehelucky.cn',
footer:{ footer:{
copyright:'Copyright © 2017-2020 第九系艾文 版权所有.', copyright:'Copyright © 2017-2020 第九系艾文 版权所有.',
ipcBeiAn:{ ipcBeiAn:{

@ -127,7 +127,7 @@
}, },
setfunactive(item, index) { setfunactive(item, index) {
for (let key in this.$refs) { for (let key in this.$refs) {
if(key === "qr") continue; if (key === "qr") continue;
if (key === item) { if (key === item) {
this.$refs[key].classList.add('active'); this.$refs[key].classList.add('active');
this.$store.dispatch('doappInfoIndex', [[index, index], [index, index]]); this.$store.dispatch('doappInfoIndex', [[index, index], [index, index]]);
@ -137,7 +137,7 @@
} }
}, },
appDownload() { 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}}) // this.$router.push({name: 'FirDownload', params: {short: this.appinfos.short}})
}, },
defaulttimeline() { defaulttimeline() {

@ -377,8 +377,8 @@
this.set_default_flag(); this.set_default_flag();
this.setbuttondefault(this.currentapp); this.setbuttondefault(this.currentapp);
this.orgcurrentapp = deepCopy(this.currentapp); this.orgcurrentapp = deepCopy(this.currentapp);
if(!this.currentapp.domain_name || this.currentapp.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){ if (this.$store.state.userinfo.domain_name && this.$store.state.userinfo.domain_name.length > 3) {
this.defualt_dtitle = this.$store.state.userinfo.domain_name; this.defualt_dtitle = this.$store.state.userinfo.domain_name;
} }
} }

@ -430,12 +430,15 @@
} }
} }
} else { } else {
if (data.msg) {
document.title = data.msg;
this.$message({ this.$message({
message: data.msg, message: data.msg,
type: 'error', type: 'error',
duration: 0 duration: 0
}); });
} }
}
}, params) }, params)
}, },
getAgent() { getAgent() {

@ -75,12 +75,12 @@
return { return {
current_user: {}, current_user: {},
appName: '', appName: '',
token:'', token: '',
dialogVisible:false dialogVisible: false
} }
}, methods: { }, methods: {
maketoken(){ maketoken() {
apitoken(data=>{ apitoken(data => {
if (data.code === 1000) { if (data.code === 1000) {
this.token = data.data.token; this.token = data.data.token;
this.$message({ this.$message({
@ -88,7 +88,7 @@
message: '重新生成成功!' message: '重新生成成功!'
}); });
} }
},{methods: 'PUT',token:this.token}); }, {methods: 'PUT', token: this.token});
}, },
handleCommand(command) { handleCommand(command) {
if (command === 'userinfo') { if (command === 'userinfo') {
@ -100,16 +100,15 @@
} else if (command === 'supersign') { } else if (command === 'supersign') {
this.$store.dispatch('doucurrentapp', {}); this.$store.dispatch('doucurrentapp', {});
this.$router.push({"name": 'FirSuperSignBase', params: {act: "iosdeveloper"}}) 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) { if (data.code === 1000) {
this.token = data.data.token; this.token = data.data.token;
} }
},{methods: 'GET',token:this.token}); }, {methods: 'GET', token: this.token});
} else if (command === 'exit') { } else if (command === 'exit') {
logout(data => { logout(data => {

@ -33,7 +33,8 @@
</el-tabs> </el-tabs>
<el-form-item v-if="is_cptch"> <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> show-password></el-input>
</el-form-item> </el-form-item>
<el-form-item v-else> <el-form-item v-else>
@ -43,7 +44,8 @@
<el-form-item style="height: 40px" v-if="cptch.cptch_image"> <el-form-item style="height: 40px" v-if="cptch.cptch_image">
<el-row style="height: 40px"> <el-row style="height: 40px">
<el-col :span="16"> <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>
<el-col :span="8"> <el-col :span="8">
<el-image <el-image
@ -95,9 +97,9 @@
} }
}, },
methods: { methods: {
is_cptch(){ is_cptch() {
let cptch_flag= this.form.authcode.length === this.cptch.length; let cptch_flag = this.form.authcode.length === this.cptch.length;
if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){ if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
cptch_flag = true cptch_flag = true
} }
return cptch_flag return cptch_flag
@ -107,8 +109,8 @@
let password = this.form.password; let password = this.form.password;
let authcode = this.form.authcode; let authcode = this.form.authcode;
let login_type = 'up'; let login_type = 'up';
let cptch_flag= this.form.authcode.length === this.cptch.length; let cptch_flag = this.form.authcode.length === this.cptch.length;
if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){ if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
cptch_flag = true cptch_flag = true
} }
if (cptch_flag) { if (cptch_flag) {

@ -159,8 +159,8 @@
act = 'email' act = 'email'
} }
let authcode = this.form.authcode; let authcode = this.form.authcode;
let cptch_flag= authcode.length === this.cptch.length; let cptch_flag = authcode.length === this.cptch.length;
if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){ if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
cptch_flag = true cptch_flag = true
} }
if (cptch_flag) { if (cptch_flag) {
@ -242,8 +242,8 @@
return return
} }
let authcode = this.form.authcode; let authcode = this.form.authcode;
let cptch_flag= authcode.length === this.cptch.length; let cptch_flag = authcode.length === this.cptch.length;
if(this.cptch.cptch_key === '' || !this.cptch.cptch_key){ if (this.cptch.cptch_key === '' || !this.cptch.cptch_key) {
cptch_flag = true cptch_flag = true
} }
if (cptch_flag) { if (cptch_flag) {

@ -427,6 +427,9 @@
} else { } else {
this.iserror = true; this.iserror = true;
if (data.msg) {
document.title = data.msg;
}
} }
}, params) }, params)
}, },

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('api', '0010_userinfo_api_token'), ('api', '0010_userinfo_api_token'),
] ]
@ -17,6 +16,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='udidsyncdeveloper', model_name='udidsyncdeveloper',
name='platform', 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所在平台'),
), ),
] ]

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('api', '0011_auto_20210125_1137'), ('api', '0011_auto_20210125_1137'),
] ]
@ -13,6 +12,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='udidsyncdeveloper', model_name='udidsyncdeveloper',
name='platform', 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所在平台'),
), ),
] ]

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('api', '0012_auto_20210127_2101'), ('api', '0012_auto_20210127_2101'),
] ]

@ -8,7 +8,7 @@ from rest_framework.views import APIView
from api.utils.response import BaseResponse from api.utils.response import BaseResponse
from api.utils.auth import ExpiringTokenAuthentication from api.utils.auth import ExpiringTokenAuthentication
from rest_framework.response import Response 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.app.supersignutils import IosUtils
from api.utils.storage.storage import Storage 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.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 api.utils.serializer import AppsSerializer, AppReleaseSerializer, UserInfoSerializer
from rest_framework.pagination import PageNumberPagination from rest_framework.pagination import PageNumberPagination
import logging 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.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__) logger = logging.getLogger(__name__)

@ -181,7 +181,7 @@ REGISTER = {
# 信息修改也会使用该配置 # 信息修改也会使用该配置
LOGIN = { LOGIN = {
"captcha": True, # 是否开启登录字母验证码 "captcha": False, # 是否开启登录字母验证码
"login_type": { "login_type": {
'sms': True, # 短信登录 'sms': True, # 短信登录
'email': True, # 邮件登录 'email': True, # 邮件登录
@ -196,7 +196,7 @@ THIRD_PART_CONFIG = {
'name': 'local', 'name': 'local',
'type': 0, 'type': 0,
'auth': { 'auth': {
'domain_name': 'fly.harmonygames.cn', # 正式环境需要填写正式的访问域名 'domain_name': 'app.hehelucky.cn', # 正式环境需要填写正式的访问域名
'is_https': True, 'is_https': True,
}, },
'active': True 'active': True
@ -311,19 +311,19 @@ SYNC_CACHE_TO_DATABASE = {
SERVER_DOMAIN = { SERVER_DOMAIN = {
'IOS_PMFILE_DOWNLOAD_DOMAIN': { 'IOS_PMFILE_DOWNLOAD_DOMAIN': {
"domain_name": 'fly.harmonygames.cn', "domain_name": 'app.hehelucky.cn',
'is_https': True, 'is_https': True,
}, # ios 描述文件和plist文件下载域名,该域名用于后端,一般为api访问域名 }, # ios 描述文件和plist文件下载域名,该域名用于后端,一般为api访问域名
'POST_UDID_DOMAIN': 'https://fly.harmonygames.cn', # 超级签名 安装签名时 向该域名 发送udid数据,该域名用于后端,一般为 api 访问域名 'POST_UDID_DOMAIN': 'https://app.hehelucky.cn', # 超级签名 安装签名时 向该域名 发送udid数据,该域名用于后端,一般为 api 访问域名
'REDIRECT_UDID_DOMAIN': 'https://fly.harmonygames.cn', # 超级签名 安装完成之后,跳转域名,该域名为前端web访问域名,如果用户定义了自己的域名,则跳转用户域名 'REDIRECT_UDID_DOMAIN': 'https://app.hehelucky.cn', # 超级签名 安装完成之后,跳转域名,该域名为前端web访问域名,如果用户定义了自己的域名,则跳转用户域名
'FILE_UPLOAD_DOMAIN': 'https://fly.harmonygames.cn', # 本地文件上传域名,使用本地存储必须配置 'FILE_UPLOAD_DOMAIN': 'https://app.hehelucky.cn', # 本地文件上传域名,使用本地存储必须配置
} }
MOBILECONFIG_SIGN_SSL = { MOBILECONFIG_SIGN_SSL = {
# 描述文件是否签名,默认是关闭状态;如果开启,并且ssl_key_path 和 ssl_pem_path 正常,则使用填写的ssl进行签名,否则默认不签名 # 描述文件是否签名,默认是关闭状态;如果开启,并且ssl_key_path 和 ssl_pem_path 正常,则使用填写的ssl进行签名,否则默认不签名
'open': False, 'open': False,
'ssl_key_path': '/data/cert/fly.harmonygames.cn.key', 'ssl_key_path': '/data/cert/app.hehelucky.cn.key',
'ssl_pem_path': '/data/cert/fly.harmonygames.cn.pem' 'ssl_pem_path': '/data/cert/app.hehelucky.cn.pem'
} }
DEFAULT_MOBILEPROVISION = { DEFAULT_MOBILEPROVISION = {

Loading…
Cancel
Save