From 50d877f2f3ba31901ef70306ea033a2373e22262 Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Wed, 19 May 2021 21:49:51 +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=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirBase.vue         |   7 +-
 .../components/apps/FirAppInfossecurity.vue   |   2 +-
 fir_client/src/components/base/BindDomain.vue | 244 +++++++++---------
 .../components/user/FirUserProfileInfo.vue    |   2 +-
 fir_ser/api/utils/serializer.py               |   5 +
 5 files changed, 134 insertions(+), 126 deletions(-)

diff --git a/fir_client/src/components/FirBase.vue b/fir_client/src/components/FirBase.vue
index e3930a5..359c2bd 100644
--- a/fir_client/src/components/FirBase.vue
+++ b/fir_client/src/components/FirBase.vue
@@ -6,7 +6,7 @@
                 :close-on-press-escape="false"
                 :visible.sync="bind_domain_sure"
                 width="666px">
-            <bind-domain transitionName="bind-user-domain" />
+            <bind-domain transitionName="bind-user-domain"/>
         </el-dialog>
         <canvas ref="canvas" class="canvas" @mousemove="canvas_move" @mouseleave="canvas_leave"/>
         <el-container>
@@ -17,7 +17,8 @@
                         :closable="false"
                         effect="dark">
                     <div slot="title">
-                        <span :underline="false" class="domian-tip-bar">应用分发请绑定您自己的域名，平台分发域名可能因不可违因素更换，将导致您的应用无法访问</span>
+                        <span :underline="false"
+                              class="domian-tip-bar">应用分发请绑定您自己的域名，平台分发域名可能因不可违因素更换，将导致您的应用无法访问</span>
                         <el-button size="medium" @click="bind_domain_sure=true">立即绑定</el-button>
                     </div>
                 </el-alert>
@@ -84,7 +85,7 @@
             '$store.state.domain_action': function () {
                 if (this.$store.state.domain_action) {
                     this.$store.dispatch("dodomainaction", false);
-                    this.bind_domain_sure=true;
+                    this.bind_domain_sure = true;
                 }
             },
         }
diff --git a/fir_client/src/components/apps/FirAppInfossecurity.vue b/fir_client/src/components/apps/FirAppInfossecurity.vue
index a164ee8..369da9d 100644
--- a/fir_client/src/components/apps/FirAppInfossecurity.vue
+++ b/fir_client/src/components/apps/FirAppInfossecurity.vue
@@ -49,7 +49,7 @@
             </el-form-item>
             <el-form-item label-width="200px" label="应用专属域名">
 
-                <el-input v-model="currentapp.domain_name" clearable
+                <el-input :value="currentapp.domain_name" clearable
                           style="width: 60%;margin-right: 10px" prefix-icon="el-icon-download"
                           :placeholder="defualt_dtitle"/>
                 <el-button @click="bind_domain_sure=true">保存</el-button>
diff --git a/fir_client/src/components/base/BindDomain.vue b/fir_client/src/components/base/BindDomain.vue
index 15be676..6b0b036 100644
--- a/fir_client/src/components/base/BindDomain.vue
+++ b/fir_client/src/components/base/BindDomain.vue
@@ -1,136 +1,138 @@
 <template>
     <transition :name="transitionName">
-        <div >
-                <div style="margin: 5px 20px">
-                    <el-steps :active="active" finish-status="success">
-                        <el-step title="步骤 1">
+        <div>
+            <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-steps>
-                    <div style="margin-top: 20px">
-                        <div v-if="active===1">
-                            <h2>你的二级域名</h2>
-                            <el-input clearable autofocus v-model="domain_name"/>
+                    </el-step>
+                    <el-step title="步骤 2">
+                    </el-step>
+                    <el-step title="步骤 3"/>
+                </el-steps>
+                <div style="margin-top: 20px">
+                    <div v-if="active===1">
+                        <h2>你的二级域名</h2>
+                        <el-input clearable autofocus v-model="domain_name"/>
+                    </div>
+                    <div v-else-if="active===2">
+                        <div style="text-align: center;margin: 20px 0">
+                            <h3>还差一步绑定成功</h3>
                         </div>
-                        <div v-else-if="active===2">
+                        请联系域名管理员，前往 <strong>{{ domain_name }}</strong> 域名 DNS 管理后台添加如下 CNAME 记录。
+                        <el-table
+                                :data="domain_tData"
+                                border
+                                stripe
+                                style="width: 100%;margin-top: 20px">
+                            <el-table-column
+                                    prop="type"
+                                    label="记录类型"
+                                    align="center"
+                                    width="100">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="host"
+                                    align="center"
+                                    label="主机记录"
+                            >
+                            </el-table-column>
+                            <el-table-column
+                                    prop="dns"
+                                    align="center"
+                                    label="记录值"
+                                    width="300">
+                            </el-table-column>
+                        </el-table>
+                        <el-alert title="请在域名DNS配置成功后，点击“下一步”按钮"
+                                  style="margin-top: 30px"
+                                  type="warning"
+                                  :closable="false"
+                                  show-icon/>
+                    </div>
+                    <div v-else-if="active===3">
+                        <div v-if="!bind_status">
                             <div style="text-align: center;margin: 20px 0">
-                                <h3>还差一步绑定成功</h3>
+                                <el-link :underline="false" type="danger"
+                                         style="font-size: x-large">绑定失败
+                                </el-link>
                             </div>
-                            请联系域名管理员，前往 <strong>{{ domain_name }}</strong> 域名 DNS 管理后台添加如下 CNAME 记录。
-                            <el-table
-                                    :data="domain_tData"
-                                    border
-                                    stripe
-                                    style="width: 100%;margin-top: 20px">
-                                <el-table-column
-                                        prop="type"
-                                        label="记录类型"
-                                        align="center"
-                                        width="100">
-                                </el-table-column>
-                                <el-table-column
-                                        prop="host"
-                                        align="center"
-                                        label="主机记录"
-                                >
-                                </el-table-column>
-                                <el-table-column
-                                        prop="dns"
-                                        align="center"
-                                        label="记录值"
-                                        width="300">
-                                </el-table-column>
-                            </el-table>
-                            <el-alert title="请在域名DNS配置成功后，点击“下一步”按钮"
-                                      style="margin-top: 30px"
-                                      type="warning"
-                                      :closable="false"
-                                      show-icon/>
+
+                            <p style="margin: 10px 0">您的账户正在绑定域名：<strong>{{ domain_name }}</strong></p>
+                            <el-row>
+                                <el-col :span="16"><p>系统未检出到您的CNAME记录，请检查您的配置。</p></el-col>
+                                <el-col :span="6">
+                                    <el-button type="danger" size="small" plain style="margin-top: 8px"
+                                               @click="remove_domain">
+                                        解除绑定
+                                    </el-button>
+                                </el-col>
+                            </el-row>
                         </div>
-                        <div v-else-if="active===3">
-                            <div v-if="!bind_status">
-                                <div style="text-align: center;margin: 20px 0">
-                                    <el-link :underline="false" type="danger"
-                                             style="font-size: x-large">绑定失败
-                                    </el-link>
-                                </div>
 
-                                <p style="margin: 10px 0">您的账户正在绑定域名：<strong>{{ domain_name }}</strong></p>
-                                <el-row>
-                                    <el-col :span="16"><p>系统未检出到您的CNAME记录，请检查您的配置。</p></el-col>
-                                    <el-col :span="6">
-                                        <el-button type="danger" size="small" plain style="margin-top: 8px"
-                                                   @click="remove_domain">
-                                            解除绑定
-                                        </el-button>
-                                    </el-col>
-                                </el-row>
+                        <div v-else>
+                            <div style="text-align: center;margin: 20px 0">
+                                <el-link :underline="false" type="success"
+                                         style="font-size: x-large">绑定成功
+                                </el-link>
                             </div>
 
-                            <div v-else>
-                                <div style="text-align: center;margin: 20px 0">
-                                    <el-link :underline="false" type="success"
-                                             style="font-size: x-large">绑定成功
-                                    </el-link>
-                                </div>
+                            <el-row>
+                                <el-col :span="16"><p>您的账户已绑定域名：<strong>{{ domain_name }}</strong></p></el-col>
+                                <el-col :span="6">
+                                    <el-button type="danger" size="small" plain style="margin-top: 8px"
+                                               @click="remove_domain">
+                                        解除绑定
+                                    </el-button>
+                                </el-col>
+                            </el-row>
 
-                                <el-row>
-                                    <el-col :span="16"><p>您的账户已绑定域名：<strong>{{ domain_name }}</strong></p></el-col>
-                                    <el-col :span="6">
-                                        <el-button type="danger" size="small" plain style="margin-top: 8px"
-                                                   @click="remove_domain">
-                                            解除绑定
-                                        </el-button>
-                                    </el-col>
-                                </el-row>
-
-                            </div>
-                            <el-table
-                                    :data="domain_tData"
-                                    border
-                                    stripe
-                                    style="width: 100%;margin-top: 20px">
-                                <el-table-column
-                                        prop="type"
-                                        label="记录类型"
-                                        align="center"
-                                        width="100">
-                                </el-table-column>
-                                <el-table-column
-                                        prop="host"
-                                        align="center"
-                                        label="主机记录"
-                                >
-                                </el-table-column>
-                                <el-table-column
-                                        prop="dns"
-                                        align="center"
-                                        label="记录值"
-                                        width="300">
-                                </el-table-column>
-                            </el-table>
-                            <div v-if="!bind_status" style="text-align: center;margin: 30px 0">
-                                <el-button @click="check_cname" type="success" plain>已经修改配置，再次检查绑定</el-button>
-                            </div>
                         </div>
-
+                        <el-table
+                                :data="domain_tData"
+                                border
+                                stripe
+                                style="width: 100%;margin-top: 20px">
+                            <el-table-column
+                                    prop="type"
+                                    label="记录类型"
+                                    align="center"
+                                    width="100">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="host"
+                                    align="center"
+                                    label="主机记录"
+                            >
+                            </el-table-column>
+                            <el-table-column
+                                    prop="dns"
+                                    align="center"
+                                    label="记录值"
+                                    width="300">
+                            </el-table-column>
+                        </el-table>
+                        <div v-if="!bind_status" style="text-align: center;margin: 30px 0">
+                            <el-button @click="check_cname" type="success" plain>已经修改配置，再次检查绑定</el-button>
+                        </div>
                     </div>
-                </div>
-                <div v-if="active!==3" style="margin:40px 20px 0;text-align: right">
-                            <el-button  @click="last"
-                                       :disabled="bind_status|| active===1 ">上一步</el-button>
-                    <el-button  @click="next">下一步</el-button>
-                </div>
 
+                </div>
             </div>
+            <div v-if="active!==3" style="margin:40px 20px 0;text-align: right">
+                <el-button @click="last"
+                           :disabled="bind_status|| active===1 ">上一步
+                </el-button>
+                <el-button @click="next">下一步</el-button>
+            </div>
+
+        </div>
     </transition>
 </template>
 
 <script>
     import {domainFun} from "@/restful";
+
     export default {
         name: 'BindDomain',
         props: {
@@ -147,8 +149,8 @@
             return {
                 active: 1,
                 bind_status: false,
-                bind_domain_sure:true,
-                domain_name:'',
+                bind_domain_sure: true,
+                domain_name: '',
                 domain_tData: [{'type': 'CNAME', 'host': 'xxx', 'dns': 'demo.xxx.cn'}],
             }
         },
@@ -156,7 +158,7 @@
             this.bind_click()
         },
         beforeDestroy() {
-            this.bind_domain_sure=false;
+            this.bind_domain_sure = false;
         },
         methods: {
             check_cname() {
@@ -175,7 +177,7 @@
                         this.bind_status = false;
                         this.$message.error("绑定失败 " + data.msg)
                     }
-                }, {methods: 'PUT', data: {app_id:this.app_id}})
+                }, {methods: 'PUT', data: {app_id: this.app_id}})
             },
             remove_domain() {
                 domainFun(data => {
@@ -187,7 +189,7 @@
                     } else {
                         this.$message.error("解除绑定失败 " + data.msg)
                     }
-                }, {methods: 'DELETE', data: {app_id:this.app_id}});
+                }, {methods: 'DELETE', data: {app_id: this.app_id}});
             },
             bind_click() {
                 domainFun(data => {
@@ -209,7 +211,7 @@
                     } else {
                         this.$message.error("绑定失败 " + data.msg)
                     }
-                }, {methods: 'GET', data: {app_id:this.app_id}});
+                }, {methods: 'GET', data: {app_id: this.app_id}});
             },
             format_domain_tData(cname_domain) {
                 let domain_name_list = this.domain_name.split('.');
@@ -233,7 +235,7 @@
                         } else {
                             this.$message.error("绑定失败 " + data.msg)
                         }
-                    }, {methods: 'POST', data: {domain_name: this.domain_name,app_id:this.app_id}})
+                    }, {methods: 'POST', data: {domain_name: this.domain_name, app_id: this.app_id}})
                 } else if (this.active === 2) {
                     this.check_cname()
                 }
@@ -246,7 +248,7 @@
 </script>
 
 <style scoped>
-    .dialog-footer{
+    .dialog-footer {
 
     }
 </style>
diff --git a/fir_client/src/components/user/FirUserProfileInfo.vue b/fir_client/src/components/user/FirUserProfileInfo.vue
index 271573f..0703c1c 100644
--- a/fir_client/src/components/user/FirUserProfileInfo.vue
+++ b/fir_client/src/components/user/FirUserProfileInfo.vue
@@ -160,7 +160,7 @@
             <el-form-item label="下载域名">
                 <el-row :gutter="36">
                     <el-col :span="16">
-                        <el-input v-model="userinfo.domain_name" :readonly="true" ref="domain_name"
+                        <el-input :value="userinfo.domain_name" :readonly="true" ref="domain_name"
                                   prefix-icon="el-icon-download"
                                   placeholder="下载页域名" clearable/>
                     </el-col>
diff --git a/fir_ser/api/utils/serializer.py b/fir_ser/api/utils/serializer.py
index c5113d1..d25ef21 100644
--- a/fir_ser/api/utils/serializer.py
+++ b/fir_ser/api/utils/serializer.py
@@ -137,6 +137,11 @@ class AppsSerializer(serializers.ModelSerializer):
     def get_preview_url(self, obj):
         return get_redirect_server_domain(None, obj.user_id, get_app_domain_name(obj))
 
+    domain_name = serializers.SerializerMethodField()
+
+    def get_domain_name(self, obj):
+        return get_app_domain_name(obj)
+
     sign_type_choice = serializers.SerializerMethodField()
 
     def get_sign_type_choice(self, obj):