换成单集群模式

EdgeAdmin/web/views/@default/httpdns/apps/appSettings.html

@@ -1,4 +1,4 @@
-{$layout}
+{$layout}
 {$template "menu"}
 {$template "/left_menu_with_menu"}
 
@@ -67,23 +67,13 @@
 
         <table class="ui table selectable definition" v-show="activeSection == 'basic'">
             <tr>
-                <td class="title">主集群</td>
+                <td class="title">所属集群</td>
                 <td>
-                    <select class="ui dropdown auto-width" name="primaryClusterId" v-model="settings.primaryClusterId">
-                        <option :value="0">[不设置]</option>
-                        <option v-for="cluster in clusters" :value="cluster.id">{{cluster.name}}</option>
-                    </select>
-                    <p class="comment httpdns-note">未设置时，按默认主集群处理（当前默认主集群：{{settings.defaultPrimaryClusterName || '-' }}）。</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="title">备集群</td>
-                <td>
-                    <select class="ui dropdown auto-width" name="backupClusterId" v-model="settings.backupClusterId">
-                        <option :value="0">[不设置]</option>
-                        <option v-for="cluster in clusters" :value="cluster.id">{{cluster.name}}</option>
-                    </select>
-                    <p class="comment httpdns-note">未设置时，按默认备用集群处理（当前默认备用集群：{{settings.defaultBackupClusterName || '-' }}）。</p>
+                    <combo-box name="clusterId" placeholder="选择集群" :v-items="clusters"
+                        :v-value="settings.selectedClusterId > 0 ? settings.selectedClusterId : ((settings.clusterIds != null && settings.clusterIds.length > 0) ? settings.clusterIds[0] : 0)"
+                        width="14em">
+                    </combo-box>
+                    <p class="comment httpdns-note">选择该应用绑定的集群。</p>
                 </td>
             </tr>
             <tr>
@@ -106,30 +96,29 @@
                 <td class="title">App ID</td>
                 <td>
                     <code>{{settings.appId}}</code>
-                    <a href="" class="httpdns-mini-icon" title="复制 App ID" @click.prevent="copySecret(settings.appId, 'App ID')"><i class="copy outline icon"></i></a>
+                    <a href="" class="httpdns-mini-icon" title="复制 App ID"
+                        @click.prevent="copySecret(settings.appId, 'App ID')"><i class="copy outline icon"></i></a>
                 </td>
             </tr>
             <tr>
-                <td class="title">主服务域名</td>
+                <td class="title">服务地址</td>
                 <td>
-                    <code v-if="settings.primaryServiceDomain && settings.primaryServiceDomain.length > 0">{{settings.primaryServiceDomain}}</code>
-                    <span class="grey" v-else>未配置</span>
-                    <a v-if="settings.primaryServiceDomain && settings.primaryServiceDomain.length > 0" href="" class="httpdns-mini-icon" title="复制主服务域名" @click.prevent="copySecret(settings.primaryServiceDomain, '主服务域名')"><i class="copy outline icon"></i></a>
-                </td>
-            </tr>
-            <tr>
-                <td class="title">备用服务域名</td>
-                <td>
-                    <code v-if="settings.backupServiceDomain && settings.backupServiceDomain.length > 0">{{settings.backupServiceDomain}}</code>
-                    <span class="grey" v-else>未配置</span>
-                    <a v-if="settings.backupServiceDomain && settings.backupServiceDomain.length > 0" href="" class="httpdns-mini-icon" title="复制备用服务域名" @click.prevent="copySecret(settings.backupServiceDomain, '备用服务域名')"><i class="copy outline icon"></i></a>
+                    <div v-if="settings.serviceAddresses && settings.serviceAddresses.length > 0">
+                        <div v-for="sa in settings.serviceAddresses" style="margin-bottom: 0.4em;">
+                            <code>{{sa.address}}</code>
+                        </div>
+                    </div>
+                    <span class="grey" v-else>未配置集群</span>
                 </td>
             </tr>
             <tr>
                 <td class="title">请求验签</td>
                 <td>
-                    <span :class="settings.signEnabled ? 'httpdns-state-on' : 'httpdns-state-off'">{{settings.signEnabled ? "已开启" : "已关闭"}}</span>
-                    <a href="" class="ui mini button basic" style="margin-left: .8em;" @click.prevent="toggleSignEnabled">{{settings.signEnabled ? "关闭请求验签" : "开启请求验签"}}</a>
+                    <span
+                        :class="settings.signEnabled ? 'httpdns-state-on' : 'httpdns-state-off'">{{settings.signEnabled
+                        ? "已开启" : "已关闭"}}</span>
+                    <a href="" class="ui mini button basic" style="margin-left: .8em;"
+                        @click.prevent="toggleSignEnabled">{{settings.signEnabled ? "关闭请求验签" : "开启请求验签"}}</a>
                     <p class="comment httpdns-note">打开后，服务端会对请求进行签名校验。</p>
                 </td>
             </tr>
@@ -138,9 +127,14 @@
                 <td>
                     <div class="httpdns-secret-line">
                         <code>{{signSecretVisible ? settings.signSecretPlain : settings.signSecretMasked}}</code>
-                        <a href="" class="httpdns-mini-icon" @click.prevent="signSecretVisible = !signSecretVisible" :title="signSecretVisible ? '隐藏明文' : '查看明文'"><i class="icon" :class="signSecretVisible ? 'eye slash' : 'eye'"></i></a>
-                        <a href="" class="httpdns-mini-icon" title="复制加签 Secret" @click.prevent="copySecret(settings.signSecretPlain, '加签 Secret')"><i class="copy outline icon"></i></a>
-                        <a href="" class="httpdns-mini-icon" title="重置加签 Secret" @click.prevent="resetSignSecret"><i class="redo icon"></i></a>
+                        <a href="" class="httpdns-mini-icon" @click.prevent="signSecretVisible = !signSecretVisible"
+                            :title="signSecretVisible ? '隐藏明文' : '查看明文'"><i class="icon"
+                                :class="signSecretVisible ? 'eye slash' : 'eye'"></i></a>
+                        <a href="" class="httpdns-mini-icon" title="复制加签 Secret"
+                            @click.prevent="copySecret(settings.signSecretPlain, '加签 Secret')"><i
+                                class="copy outline icon"></i></a>
+                        <a href="" class="httpdns-mini-icon" title="重置加签 Secret" @click.prevent="resetSignSecret"><i
+                                class="redo icon"></i></a>
                     </div>
                     <p class="comment httpdns-note">最近更新：{{settings.signSecretUpdatedAt}}</p>
                     <p class="comment httpdns-note" v-if="!settings.signEnabled">请求验签已关闭，当前不使用加签 Secret。</p>
@@ -151,4 +145,4 @@
 
         <submit-btn></submit-btn>
     </form>
-</div>
+</div>

EdgeAdmin/web/views/@default/httpdns/apps/create.html

@@ -1,4 +1,4 @@
-{$layout}
+{$layout}
 {$template "menu"}
 
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
@@ -12,35 +12,20 @@
             </td>
         </tr>
         <tr>
-            <td>主集群 *</td>
+            <td>所属集群 *</td>
             <td>
-                <select class="ui dropdown" name="primaryClusterId" v-model="defaultPrimaryClusterId">
-                    <option value="">[请选择集群]</option>
-                    <option v-for="cluster in clusters" :value="cluster.id">{{cluster.name}}</option>
-                </select>
-                <p class="comment">主集群用于优先处理应用解析请求。</p>
-            </td>
-        </tr>
-        <tr>
-            <td>备集群</td>
-            <td>
-                <select class="ui dropdown" name="backupClusterId" v-model="defaultBackupClusterId">
-                    <option :value="0">[不设置]</option>
-                    <option v-for="cluster in clusters" :value="cluster.id">{{cluster.name}}</option>
-                </select>
-                <p class="comment">当主集群不可用时，可切换到备集群。</p>
+                <combo-box name="clusterId" placeholder="选择集群" :v-items="clusters" width="11em">
+                </combo-box>
+                <p class="comment">选择该应用绑定的集群。</p>
             </td>
         </tr>
         <tr>
             <td>所属用户</td>
             <td>
-                <select class="ui dropdown auto-width" name="userId">
-                    <option value="0">[不设置]</option>
-                    <option v-for="user in users" :value="user.id">{{user.fullname}} ({{user.username}})</option>
-                </select>
+                <user-selector></user-selector>
                 <p class="comment">可以选择当前应用所属的平台用户。</p>
             </td>
         </tr>
     </table>
     <submit-btn></submit-btn>
-</form>
+</form>

EdgeAdmin/web/views/@default/httpdns/apps/customRecordsCreatePopup.js

@@ -18,15 +18,18 @@
         "西南": ["默认", "重庆", "四川", "贵州", "云南", "西藏"]
     };
 
-    vm.continents = ["默认", "非洲", "南极洲", "亚洲", "欧洲", "北美洲", "南美洲", "大洋洲"];
+    vm.continents = ["默认", "亚洲", "欧洲", "北美洲", "南美洲", "非洲", "大洋洲"];
     vm.continentCountries = {
         "默认": ["默认"],
-        "非洲": ["默认", "南非", "埃及", "尼日利亚", "肯尼亚", "摩洛哥"],
-        "南极洲": ["默认"],
-        "亚洲": ["默认", "中国香港", "中国澳门", "中国台湾", "日本", "韩国", "新加坡", "印度", "泰国", "越南"],
-        "欧洲": ["默认", "德国", "英国", "法国", "荷兰", "西班牙", "意大利", "俄罗斯"],
-        "北美洲": ["默认", "美国", "加拿大", "墨西哥"],
-        "南美洲": ["默认", "巴西", "阿根廷", "智利", "哥伦比亚"],
+        "亚洲": ["默认", "中国香港", "中国澳门", "中国台湾", "日本", "韩国", "新加坡", "印度", "泰国", "越南",
+            "印度尼西亚", "马来西亚", "菲律宾", "柬埔寨", "缅甸", "老挝", "斯里兰卡", "孟加拉国", "巴基斯坦", "尼泊尔",
+            "阿联酋", "沙特阿拉伯", "土耳其", "以色列", "伊朗", "伊拉克", "卡塔尔", "科威特", "蒙古"],
+        "欧洲": ["默认", "德国", "英国", "法国", "荷兰", "西班牙", "意大利", "俄罗斯",
+            "波兰", "瑞典", "瑞士", "挪威", "芬兰", "丹麦", "葡萄牙", "爱尔兰", "比利时", "奥地利",
+            "乌克兰", "捷克", "罗马尼亚", "匈牙利", "希腊"],
+        "北美洲": ["默认", "美国", "加拿大", "墨西哥", "巴拿马", "哥斯达黎加", "古巴"],
+        "南美洲": ["默认", "巴西", "阿根廷", "智利", "哥伦比亚", "秘鲁", "委内瑞拉", "厄瓜多尔"],
+        "非洲": ["默认", "南非", "埃及", "尼日利亚", "肯尼亚", "摩洛哥", "阿尔及利亚", "坦桑尼亚", "埃塞俄比亚", "加纳", "突尼斯"],
         "大洋洲": ["默认", "澳大利亚", "新西兰"]
     };
 

EdgeAdmin/web/views/@default/httpdns/apps/domains.js

@@ -34,8 +34,8 @@
 
     this.bindDomain = function () {
         teaweb.popup("/httpdns/apps/domains/createPopup?appId=" + this.app.id, {
-            height: "24em",
-            width: "46em",
+            height: "12em",
+            width: "36em",
             title: "添加域名",
             callback: function () {
                 teaweb.success("保存成功", function () {

EdgeAdmin/web/views/@default/httpdns/apps/index.html

@@ -28,8 +28,7 @@
         <colgroup>
             <col style="width:20%;" />
             <col style="width:12%;" />
-            <col style="width:11%;" />
-            <col style="width:11%;" />
+            <col style="width:16%;" />
             <col style="width:12%;" />
             <col style="width:8%;" />
             <col style="width:6%;" />
@@ -39,8 +38,7 @@
             <tr>
                 <th>应用名称</th>
                 <th>AppID</th>
-                <th>主集群</th>
-                <th>备用集群</th>
+                <th>集群</th>
                 <th>用户</th>
                 <th class="center">绑定域名数</th>
                 <th class="center">状态</th>
@@ -61,16 +59,10 @@
                     <copy-icon :text="app.appId"></copy-icon>
                 </td>
                 <td>
-                    <span v-if="app.primaryCluster != null && app.primaryCluster.id > 0">
-                        {{app.primaryCluster.name || ('#' + app.primaryCluster.id)}}
-                        <link-icon :href="'/httpdns/clusters/cluster?clusterId=' + app.primaryCluster.id"></link-icon>
-                    </span>
-                    <span v-else class="disabled">-</span>
-                </td>
-                <td>
-                    <span v-if="app.backupCluster != null && app.backupCluster.id > 0">
-                        {{app.backupCluster.name || ('#' + app.backupCluster.id)}}
-                        <link-icon :href="'/httpdns/clusters/cluster?clusterId=' + app.backupCluster.id"></link-icon>
+                    <span v-if="app.clusters != null && app.clusters.length > 0">
+                        <span v-for="(cluster, idx) in app.clusters">
+                            <a :href="'/httpdns/clusters/cluster?clusterId=' + cluster.id">{{cluster.name || ('#' + cluster.id)}}</a><span v-if="idx < app.clusters.length - 1">、</span>
+                        </span>
                     </span>
                     <span v-else class="disabled">-</span>
                 </td>

EdgeAdmin/web/views/@default/httpdns/apps/policies.html

@@ -1,78 +0,0 @@
-{$layout}
-{$template "menu"}
-
-<div class="ui margin"></div>
-
-<h3 class="ui header">HTTPDNS 鍏ㄥ眬绛栫暐</h3>
-
-<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
-    <csrf-token></csrf-token>
-    <table class="ui table definition selectable">
-        <tr>
-            <td class="title">鍏ㄥ眬榛樿瑙ｆ瀽 TTL</td>
-            <td><input type="text" name="defaultTTL" maxlength="8" v-model="policies.defaultTTL" /> 绉?/td>
-        </tr>
-        <tr>
-            <td class="title">鍏ㄥ眬榛樿 SNI 绛夌骇</td>
-            <td>
-                <select name="defaultSniPolicy" class="ui dropdown auto-width" v-model="policies.defaultSniPolicy">
-                    <option value="level1">level1锛堝浐瀹?SNI锛?/option>
-                    <option value="level2">level2锛堥殣鍖?SNI锛?/option>
-                    <option value="level3">level3锛圗CH锛?/option>
-                </select>
-                <div class="grey small" v-if="policies.defaultSniPolicy == 'level1'" style="margin-top:.5em;">
-                    level1 浠呬娇鐢ㄥ浐瀹?SNI锛屼笉鍚敤 ECS 鍜岃瘉涔︽牎楠岀瓥鐣ャ€?                </div>
-                <div class="grey small" v-else-if="policies.defaultSniPolicy == 'level2'" style="margin-top:.5em;">
-                    level2 浠呭惎鐢ㄩ殣鍖?SNI锛屼笉瑕佹眰閰嶇疆 ECS 涓庤瘉涔︾瓥鐣ャ€?                </div>
-                <div class="grey small" v-else style="margin-top:.5em;">
-                    level3 鍚敤 ECH锛屽缓璁悓鏃堕厤缃?ECS 涓庤瘉涔︽牎楠岀瓥鐣ャ€?                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="title">鍏ㄥ眬闄嶇骇瓒呮椂</td>
-            <td><input type="text" name="defaultFallbackMs" maxlength="8" v-model="policies.defaultFallbackMs" /> 姣</td>
-        </tr>
-
-        <tr v-show="policies.defaultSniPolicy == 'level3'">
-            <td class="title">全局 ECS 掩码策略</td>
-            <td>
-                <select name="ecsMode" class="ui dropdown auto-width" v-model="policies.ecsMode">
-                    <option value="off">鍏抽棴</option>
-                    <option value="auto">鑷姩</option>
-                    <option value="custom">鑷畾涔?/option>
-                </select>
-                <span v-if="policies.ecsMode == 'custom'">
-                    <span class="grey" style="margin-left:.8em;">IPv4 /</span>
-                    <input type="text" name="ecsIPv4Prefix" maxlength="3" v-model="policies.ecsIPv4Prefix" style="width:4.5em;" />
-                    <span class="grey" style="margin-left:.8em;">IPv6 /</span>
-                    <input type="text" name="ecsIPv6Prefix" maxlength="3" v-model="policies.ecsIPv6Prefix" style="width:4.5em;" />
-                </span>
-                <span v-else class="grey" style="margin-left:.8em;">仅在“自定义”模式下配置掩码。</span>
-
-                <input type="hidden" name="ecsIPv4Prefix" v-model="policies.ecsIPv4Prefix" v-if="policies.ecsMode != 'custom'" />
-                <input type="hidden" name="ecsIPv6Prefix" v-model="policies.ecsIPv6Prefix" v-if="policies.ecsMode != 'custom'" />
-            </td>
-        </tr>
-
-        <tr v-show="policies.defaultSniPolicy == 'level3'">
-            <td class="title">鍏ㄥ眬璇佷功鏍￠獙绛栫暐</td>
-            <td>
-                <span class="grey">证书指纹校验（Pinning）</span>
-                <select name="pinningMode" class="ui dropdown auto-width" v-model="policies.pinningMode" style="margin-left:.4em;">
-                    <option value="off">鍏抽棴</option>
-                    <option value="report">瑙傚療妯″紡</option>
-                    <option value="enforce">寮哄埗鏍￠獙</option>
-                </select>
-                <span class="grey" style="margin-left:1.2em;">证书 SAN 域名校验</span>
-                <select name="sanMode" class="ui dropdown auto-width" v-model="policies.sanMode" style="margin-left:.4em;">
-                    <option value="off">鍏抽棴</option>
-                    <option value="report">瑙傚療妯″紡</option>
-                    <option value="strict">涓ユ牸鏍￠獙</option>
-                </select>
-            </td>
-        </tr>
-    </table>
-
-    <submit-btn></submit-btn>
-</form>
-

EdgeAdmin/web/views/@default/httpdns/apps/policies.js

@@ -1,40 +0,0 @@
-Tea.context(function () {
-    this.success = NotifyReloadSuccess("保存成功");
-
-    this.$delay(function () {
-        this.$watch("policies.defaultSniPolicy", function (level) {
-            if (level == "level1" || level == "level2") {
-                this.policies.ecsMode = "off";
-                this.policies.pinningMode = "off";
-                this.policies.sanMode = "off";
-                return;
-            }
-
-            if (level == "level3") {
-                if (this.policies.ecsMode == "off") {
-                    this.policies.ecsMode = "auto";
-                }
-                if (this.policies.pinningMode == "off") {
-                    this.policies.pinningMode = "report";
-                }
-                if (this.policies.sanMode == "off") {
-                    this.policies.sanMode = "strict";
-                }
-            }
-        });
-
-        this.$watch("policies.ecsMode", function (mode) {
-            if (this.policies.defaultSniPolicy != "level3") {
-                return;
-            }
-            if (mode == "custom") {
-                if (!this.policies.ecsIPv4Prefix || this.policies.ecsIPv4Prefix <= 0) {
-                    this.policies.ecsIPv4Prefix = 24;
-                }
-                if (!this.policies.ecsIPv6Prefix || this.policies.ecsIPv6Prefix <= 0) {
-                    this.policies.ecsIPv6Prefix = 56;
-                }
-            }
-        });
-    });
-});