From a82f2a3ec70242a66b41eb643c16c621c1fa566f Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Fri, 14 May 2021 18:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirBase.vue         | 98 ++++++++++++++++++-
 .../components/user/FirUserProfileInfo.vue    |  2 +
 fir_client/src/main.js                        |  6 ++
 fir_client/src/store/index.js                 |  9 +-
 fir_ser/api/views/login.py                    | 11 ++-
 fir_ser/fir_ser/settings.py                   | 28 +++---
 6 files changed, 132 insertions(+), 22 deletions(-)

diff --git a/fir_client/src/components/FirBase.vue b/fir_client/src/components/FirBase.vue
index 6a9ce16..0f7acf7 100644
--- a/fir_client/src/components/FirBase.vue
+++ b/fir_client/src/components/FirBase.vue
@@ -1,7 +1,76 @@
 <template>
     <div ref="appbase">
+        <el-dialog
+                title="绑定域名"
+                :visible.sync="bind_domain_sure"
+                width="30%">
+
+            <div style="margin: 5px 20px">
+                <el-steps :active="active" finish-status="success">
+                    <el-step title="步骤 1">
+
+                    </el-step>
+                    <el-step title="步骤 2">
+                    </el-step>
+                    <el-step title="步骤 3"></el-step>
+                </el-steps>
+                <div style="margin-top: 20px">
+                    <div v-if="active===1">
+                        <h2>你的二级域名</h2>
+                        <el-input clearable autofocus v-model="domain_name"></el-input>
+                    </div>
+                    <div v-else-if="active===2">
+                        <h3>还差一步绑定成功</h3>
+                        请联系域名管理员，前往 {{ domain_name }} 域名 DNS 管理后台添加如下 CNAME 记录。
+                        <el-table
+                                :data="domain_tData"
+                                border
+                                style="width: 100%">
+                            <el-table-column
+                                    prop="type"
+                                    label="记录类型"
+                                    width="100">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="host"
+                                    label="主机记录"
+                                    width="180">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="dns"
+                                    label="记录值">
+                            </el-table-column>
+                        </el-table>
+                        <el-alert title="请在域名DNS配置成功后，点击“下一步”按钮"
+                                  style="margin-top: 30px"
+                                  type="warning"
+                                  :closable="false"
+                                  show-icon/>
+                    </div>
+                </div>
+            </div>
+
+            <span slot="footer" class="dialog-footer">
+                            <el-button style="margin-top: 12px;" @click="last">上一步</el-button>
+            <el-button style="margin-top: 12px;" @click="next">下一步</el-button>
+
+                    </span>
+        </el-dialog>
+
         <canvas ref="canvas" class="canvas" @mousemove="canvas_move" @mouseleave="canvas_leave"/>
         <el-container>
+            <div style="margin: -5px 20px" v-if="$store.state.show_domain_msg">
+                <el-alert
+                        center
+                        type="error"
+                        :closable="false"
+                        effect="dark">
+                    <div slot="title">
+                        <span :underline="false" class="domian-tip-bar">应用分发请绑定您自己的域名，平台域名可能会随时更换，将导致您的应用无法访问</span>
+                        <el-button size="medium">立即绑定</el-button>
+                    </div>
+                </el-alert>
+            </div>
             <el-header>
                 <FirHeader/>
             </el-header>
@@ -32,7 +101,11 @@
         components: {FirFooter, FirHeader, BackToTop},
         data() {
             return {
-                'mousePosition': {},
+                mousePosition: {},
+                bind_domain_sure: true,
+                active: 1,
+                domain_name: '',
+                domain_tData: [{'type': 'CNAME', 'host': 'xxx', 'dns': 'sdfsaf'}],
                 myBackToTopStyle: {
                     right: '80px',
                     bottom: '100px',
@@ -47,8 +120,22 @@
         mounted() {
             let canvas = this.$refs.canvas;
             show_beautpic(this, canvas, 200);
-        }, watch: {}
+        }, watch: {
+            '$store.state.userinfo.domain_name': function () {
+                if (this.$store.state.userinfo.domain_name) {
+                    this.$store.dispatch("dodomainshow", false);
+                } else {
+                    this.$store.dispatch("dodomainshow", true);
+                }
+            },
+        }
         , methods: {
+            next() {
+                if (this.active++ > 2) this.active = 3;
+            },
+            last() {
+                if (this.active-- < 2) this.active = 1;
+            },
             canvas_move(e) {
                 this.mousePosition.x = e.pageX;
                 this.mousePosition.y = e.pageY;
@@ -68,4 +155,11 @@
         padding-top: 30px;
     }
 
+    .domian-tip-bar {
+        line-height: 43px;
+        color: #fff;
+        font-weight: 500;
+        font-size: medium;
+        margin-right: 20px;
+    }
 </style>
diff --git a/fir_client/src/components/user/FirUserProfileInfo.vue b/fir_client/src/components/user/FirUserProfileInfo.vue
index 79b3609..bddcf98 100644
--- a/fir_client/src/components/user/FirUserProfileInfo.vue
+++ b/fir_client/src/components/user/FirUserProfileInfo.vue
@@ -254,12 +254,14 @@
             saveemail() {
                 let data = this.authinfo();
                 data.email = this.userinfo.email;
+                data.act = 'email';
                 this.updateUserInfo({"methods": 'PUT', 'data': data});
                 this.changeemailValue()
             },
             savePhone() {
                 let data = this.authinfo();
                 data.mobile = this.userinfo.mobile;
+                data.act = 'sms';
                 this.updateUserInfo({"methods": 'PUT', 'data': data});
                 this.changePhoneValue()
             },
diff --git a/fir_client/src/main.js b/fir_client/src/main.js
index 7b9d7a1..5e1de52 100644
--- a/fir_client/src/main.js
+++ b/fir_client/src/main.js
@@ -11,6 +11,7 @@ import VueCookies from 'vue-cookies'
 //导入store实例
 import store from "@/store";
 import {
+    Alert,
     Aside,
     Avatar,
     Backtop,
@@ -53,6 +54,8 @@ import {
     Row,
     Select,
     Slider,
+    Step,
+    Steps,
     Switch,
     Table,
     TableColumn,
@@ -112,6 +115,9 @@ Vue.use(Slider);
 Vue.use(DropdownMenu);
 Vue.use(Dropdown);
 Vue.use(Breadcrumb);
+Vue.use(Alert);
+Vue.use(Step);
+Vue.use(Steps);
 Vue.use(Input);
 Vue.use(CheckboxGroup);
 Vue.use(DatePicker);
diff --git a/fir_client/src/store/index.js b/fir_client/src/store/index.js
index 941b903..4506db8 100644
--- a/fir_client/src/store/index.js
+++ b/fir_client/src/store/index.js
@@ -15,6 +15,7 @@ const store = new Vuex.Store({
         currentapp: {},
         appInfoIndex: [],
         userInfoIndex: 0,
+        show_domain_msg: false,
     },
     mutations: {
         setuserinfo(state, data) {
@@ -28,9 +29,15 @@ const store = new Vuex.Store({
         },
         setcurrentapp(state, val) {
             state.currentapp = val
+        },
+        setdomainshow(state, val) {
+            state.show_domain_msg = val
         }
     },
     actions: {
+        dodomainshow(context, data) {
+            context.commit('setdomainshow', data);
+        },
         doUserinfo(context, data) {
             context.commit('setuserinfo', data);
         },
@@ -47,4 +54,4 @@ const store = new Vuex.Store({
 });
 
 
-export default store;
\ No newline at end of file
+export default store;
diff --git a/fir_ser/api/views/login.py b/fir_ser/api/views/login.py
index 54b3c68..5a063c7 100644
--- a/fir_ser/api/views/login.py
+++ b/fir_ser/api/views/login.py
@@ -371,11 +371,12 @@ class UserInfoView(APIView):
         mobile = data.get("mobile", None)
         email = data.get("email", None)
         if mobile or email:
-            is_valid = valid_captcha(data.get("cptch_key", None), data.get("authcode", None), request)
-            if not is_valid:
-                res.code = 1008
-                res.msg = "图片验证码异常"
-                return Response(res.dict)
+            if CHANGER.get('captcha'):
+                is_valid = valid_captcha(data.get("cptch_key", None), data.get("authcode", None), request)
+                if not is_valid:
+                    res.code = 1008
+                    res.msg = "图片验证码异常"
+                    return Response(res.dict)
 
         if oldpassword and surepassword:
             user = auth.authenticate(username=request.user.username, password=oldpassword)
diff --git a/fir_ser/fir_ser/settings.py b/fir_ser/fir_ser/settings.py
index 2366056..62939f5 100644
--- a/fir_ser/fir_ser/settings.py
+++ b/fir_ser/fir_ser/settings.py
@@ -24,7 +24,7 @@ SECRET_KEY = 'j!g@^bc(z(a3*i&kp$_@bgb)bug&^#3=amch!3lz&1x&s6ss6t'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['127.0.0.1', 'synchrotron', '172.16.133.34']
+ALLOWED_HOSTS = ['127.0.0.1', 'synchrotron', '172.16.133.34','ali.cdn.flyapp.dvcloud.xin','api.src.flyapp.dvcloud.xin']
 
 # Application definition
 
@@ -121,13 +121,13 @@ REST_FRAMEWORK = {
         'api.utils.throttle.LoginUserThrottle',
     ],
     'DEFAULT_THROTTLE_RATES': {
-        'ShortAccessUser1': '80/m',
-        'ShortAccessUser2': '1000/h',
+        'ShortAccessUser1': '180/m',
+        'ShortAccessUser2': '2000/h',
         'LoginUser': '200/m',
-        'RegisterUser1': '30/m',
+        'RegisterUser1': '40/m',
         'RegisterUser2': '300/h',
-        'GetAuthC1': '8/m',
-        'GetAuthC2': '30/h',
+        'GetAuthC1': '60/m',
+        'GetAuthC2': '300/h',
     }
 }
 # Internationalization
@@ -194,7 +194,7 @@ REGISTER = {
     "captcha": False,  # 是否开启注册字母验证码
     "geetest": True,  # 是否开启geetest验证，如要开启请先配置geetest
     "register_type": {
-        'sms': False,  # 短信注册
+        'sms': True,  # 短信注册
         'email': True,  # 邮件注册
         'code': False,  # 邀请码注册,邀请码必填写，需要和短信，邮件一起使用
     }
@@ -205,7 +205,7 @@ CHANGER = {
     "captcha": False,  # 是否开启注册字母验证码
     "geetest": True,  # 是否开启geetest验证，如要开启请先配置geetest
     "change_type": {
-        'sms': False,  # 短信注册
+        'sms': True,  # 短信注册
         'email': True,  # 邮件注册
         'code': False,  # 邀请码注册,邀请码必填写，需要和短信，邮件一起使用
     }
@@ -214,7 +214,7 @@ LOGIN = {
     "captcha": False,  # 是否开启登录字母验证码
     "geetest": True,  # 是否开启geetest验证
     "login_type": {
-        'sms': False,  # 短信登录
+        'sms': True,  # 短信登录
         'email': True,  # 邮件登录
         'up': True,  # 密码登录
     }
@@ -279,9 +279,9 @@ THIRD_PART_CONFIG = {
                 'form': 'FlyApp Validation <flyapps@126.com>',
                 'subject': '%(code)s验证',
                 'template_code': {
-                    'login': '验证码%(code)s，您正在登录，若非本人操作，请勿泄露。',
-                    'change': '验证码%(code)s，您正在尝试变更重要信息，请妥善保管账户信息。',
-                    'register': '验证码%(code)s，您正在注册成为新用户，感谢您的支持！',
+                    'login': '欢迎使用FLY 应用分发平台。 您的验证码%(code)s，您正在登录，若非本人操作，请勿泄露。',
+                    'change': '欢迎使用FLY 应用分发平台。 您的验证码%(code)s，您正在尝试变更重要信息，请妥善保管账户信息。',
+                    'register': '欢迎使用FLY 应用分发平台。 您的验证码%(code)s，您正在注册成为新用户，感谢您的支持！',
                 }
             },
             'active': True
@@ -290,8 +290,8 @@ THIRD_PART_CONFIG = {
             'name': 'aliyun',
             'type': 1,
             'auth': {
-                'access_key': 'LTAI4FmYZgtCRZcs4j32GUAR',
-                'secret_key': '7i7J34blLcxTYbwjR9ToK7lEglvJw0',
+                'access_key': 'LTAI5tJH2EnjVzJGMmNCYo9U',
+                'secret_key': 'd0LETks5oxkdfbkLGtFihklWGbokab',
                 'region_id': 'cn-hangzhou',
                 'sing_name': '合合相亲',
                 'template_code': {