diff --git a/fir_client/src/assets/github.png b/fir_client/src/assets/github.png new file mode 100644 index 0000000..113814e Binary files /dev/null and b/fir_client/src/assets/github.png differ diff --git a/fir_client/src/assets/wxchat.jpg b/fir_client/src/assets/wxchat.jpg deleted file mode 100644 index a73cd1a..0000000 Binary files a/fir_client/src/assets/wxchat.jpg and /dev/null differ diff --git a/fir_client/src/components/index/FirContact.vue b/fir_client/src/components/index/FirContact.vue index 4dcaa49..fab782b 100644 --- a/fir_client/src/components/index/FirContact.vue +++ b/fir_client/src/components/index/FirContact.vue @@ -15,9 +15,13 @@

应用举报

-

flyapps@126.com

- - +
+

FlyApps

+
+ + + @@ -44,7 +48,7 @@ export default { .content { width: 942px; - margin: 80px auto 160px; + margin: 10px auto 160px; text-align: center; } diff --git a/fir_client/src/components/index/FirIndexBody.vue b/fir_client/src/components/index/FirIndexBody.vue index 54159ec..01227db 100644 --- a/fir_client/src/components/index/FirIndexBody.vue +++ b/fir_client/src/components/index/FirIndexBody.vue @@ -114,12 +114,12 @@ export default { { logo: require("@/assets/imgs/qq.png"), title: "核心优势3", - content: "

利用QQ微信等提供在线解答

帮助用户快速准确解决问题和故障" + content: "

QQ微信等提供在线解答

帮助用户快速准确解决问题" }, { logo: require("@/assets/imgs/skill.png"), title: "核心优势4", - content: "

由技术支持工程师,负责问题解答

需求受理及故障受理" + content: "

自定义配置,容器化部署

升级维护超级便捷" } ] } diff --git a/fir_client/src/components/index/FirIndexTem.vue b/fir_client/src/components/index/FirIndexTem.vue index 5acdf94..412c2bf 100644 --- a/fir_client/src/components/index/FirIndexTem.vue +++ b/fir_client/src/components/index/FirIndexTem.vue @@ -21,10 +21,10 @@ 登录 - 注册 + 联系我们 - 联系我们 + Github @@ -65,6 +65,10 @@ export default { background: '#e7eaf1' }, } + }, methods: { + github() { + window.open('https://github.com/nineaiyu/FlyApps', '_blank', ''); + } } } diff --git a/fir_client/src/components/index/FirNews.vue b/fir_client/src/components/index/FirNews.vue index ef260db..dfb9538 100644 --- a/fir_client/src/components/index/FirNews.vue +++ b/fir_client/src/components/index/FirNews.vue @@ -6,8 +6,8 @@

Company News

  • @@ -40,6 +40,18 @@ export default { show: false, newsList: [ { + id: '008', + title: 'ios16系统', + introduce: '超级签名字支持ios16系统签名,只需要手机开启调试模式,即可安装打开', + date: '09-22', + year: '2022' + }, { + id: '007', + title: '私有下载页部署', + introduce: '支持私有下载页部署,方便快捷,稳定访问', + date: '05-18', + year: '2022' + }, { id: '001', title: '现有版本', introduce: '经过好长时间的编写,平台已经支持超级签名,权限管理,自定义域名,自定义存储', diff --git a/fir_client/src/utils/base/utils.js b/fir_client/src/utils/base/utils.js index 15e0653..0dc89ac 100644 --- a/fir_client/src/utils/base/utils.js +++ b/fir_client/src/utils/base/utils.js @@ -41,13 +41,13 @@ export function geetestbase(func, self, uid, params, callback, errback, readybac challenge: data.challenge, new_captcha: data.new_captcha, // 用于宕机时表示是新验证码的宕机 offline: !data.success, // 表示用户后台检测极验服务器是否宕机,一般不需要关注 - product: "float", // 产品形式,包括:float,popup + product: "bind", // 产品形式,包括:float,popup width: "100%" }, (captchaObj) => { self.$refs.captcha.innerHTML = ''; - captchaObj.appendTo("#captcha"); + // captchaObj.appendTo("#captcha"); captchaObj.onReady(() => { - readyback() + readyback(captchaObj) }).onSuccess(() => { params.geetest = captchaObj.getValidate(); callback(params); diff --git a/fir_client/src/utils/index.js b/fir_client/src/utils/index.js index 5a15d14..882717e 100644 --- a/fir_client/src/utils/index.js +++ b/fir_client/src/utils/index.js @@ -356,8 +356,8 @@ export function geetest(self, uid, params, callback, http_func = loginFun) { message: res.msg, type: 'error' }); - // eslint-disable-next-line no-unused-vars - }, _ => { + }, captchaObj => { + captchaObj.verify() loading.close() }) } diff --git a/fir_ser/api/views/login.py b/fir_ser/api/views/login.py index 2276bc2..87ef9f2 100644 --- a/fir_ser/api/views/login.py +++ b/fir_ser/api/views/login.py @@ -576,9 +576,7 @@ class AuthorizationView(APIView): ext = request.data.get("ext", None) register_type = get_register_type() if ext and register_type.get('code', None) and ext.get('icode', None): - if ext.get('icode') == '689888666': - pass - else: + if ext.get('icode') not in Config.INVITECODE: res.code = 1008 res.msg = "邀请码已失效" return Response(res.dict) diff --git a/fir_ser/common/core/sysconfig.py b/fir_ser/common/core/sysconfig.py index c11c971..f47b9b7 100644 --- a/fir_ser/common/core/sysconfig.py +++ b/fir_ser/common/core/sysconfig.py @@ -273,6 +273,10 @@ class AuthConfCache(ConfigCacheBase): def REPORT(self): return super().get_value('REPORT', AUTHCONF.REPORT) + @property + def INVITECODE(self): + return super().get_value('INVITECODE', AUTHCONF.INVITECODE) + class GeeTestConfCache(ConfigCacheBase): def __init__(self, *args, **kwargs): diff --git a/fir_ser/config.py b/fir_ser/config.py index e0e3ccc..7df5596 100644 --- a/fir_ser/config.py +++ b/fir_ser/config.py @@ -105,6 +105,8 @@ class THIRDLOGINCONF(object): class AUTHCONF(object): + # 邀请码 + INVITECODE = ['yugechaoshen666'] # 注册方式,如果启用sms或者email 需要配置 THIRD_PART_CONFIG_KEY_INFO.sender 信息 REGISTER = { "enable": True,