diff options
Diffstat (limited to 'web/html')
| -rw-r--r-- | web/html/xui/client_bulk_modal.html | 9 | ||||
| -rw-r--r-- | web/html/xui/form/client.html | 6 | ||||
| -rw-r--r-- | web/html/xui/form/tls_settings.html | 18 | ||||
| -rw-r--r-- | web/html/xui/form/xtls_settings.html | 58 | ||||
| -rw-r--r-- | web/html/xui/inbound_info_modal.html | 9 | ||||
| -rw-r--r-- | web/html/xui/inbound_modal.html | 9 | ||||
| -rw-r--r-- | web/html/xui/inbounds.html | 1 |
7 files changed, 1 insertions, 109 deletions
diff --git a/web/html/xui/client_bulk_modal.html b/web/html/xui/client_bulk_modal.html index c4e33bb1..671c55c3 100644 --- a/web/html/xui/client_bulk_modal.html +++ b/web/html/xui/client_bulk_modal.html @@ -39,12 +39,6 @@ <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option> </a-select> </a-form-item> - <a-form-item label='Flow' v-if="clientsBulkModal.inbound.xtls"> - <a-select v-model="clientsBulkModal.flow" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option value="" selected>{{ i18n "none" }}</a-select-option> - <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option> - </a-select> - </a-form-item> <a-form-item v-if="app.subSettings.enable"> <template slot="label"> <a-tooltip> @@ -181,9 +175,6 @@ if (clientsBulkModal.inbound.canEnableTlsFlow()) { newClient.flow = clientsBulkModal.flow; } - if (clientsBulkModal.inbound.xtls) { - newClient.flow = clientsBulkModal.flow; - } newClient.reset = clientsBulkModal.reset; clients.push(newClient); } diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index 01d96c73..c5d5bf0e 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -104,12 +104,6 @@ </a-textarea> </a-form> </a-form-item> - <a-form-item v-if="inbound.stream.isXtls" label='Flow'> - <a-select v-model="client.flow" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option value="" selected>{{ i18n "none" }}</a-select-option> - <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option> - </a-select> - </a-form-item> <a-form-item v-if="inbound.canEnableTlsFlow()" label='Flow'> <a-select v-model="client.flow" :dropdown-class-name="themeSwitcher.currentTheme"> <a-select-option value="" selected>{{ i18n "none" }}</a-select-option> diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html index af71b8c7..4eff7698 100644 --- a/web/html/xui/form/tls_settings.html +++ b/web/html/xui/form/tls_settings.html @@ -5,18 +5,7 @@ <a-form-item label='{{ i18n "security" }}'> <a-radio-group v-model="inbound.stream.security" button-style="solid"> <a-radio-button value="none">{{ i18n "none" }}</a-radio-button> - <a-tooltip> - <template slot="title"> - <span>{{ i18n "pages.inbounds.xtlsDesc" }}</span> - </template> - <a-radio-button v-if="inbound.canEnableXtls()" value="xtls">XTLS</a-radio-button> - </a-tooltip> - <a-tooltip> - <template slot="title"> - <span>{{ i18n "pages.inbounds.realityDesc" }}</span> - </template> - <a-radio-button v-if="inbound.canEnableReality()" value="reality">REALITY</a-radio-button> - </a-tooltip> + <a-radio-button v-if="inbound.canEnableReality()" value="reality">Reality</a-radio-button> <a-radio-button value="tls">TLS</a-radio-button> </a-radio-group> </a-form-item> @@ -116,11 +105,6 @@ </template> </template> - <!-- xtls settings --> - <template v-else-if="inbound.stream.isXtls"> - {{template "form/xtlsSettings"}} - </template> - <!-- reality settings --> <template v-if="inbound.stream.isReality"> {{template "form/realitySettings"}} diff --git a/web/html/xui/form/xtls_settings.html b/web/html/xui/form/xtls_settings.html deleted file mode 100644 index e6b88b4f..00000000 --- a/web/html/xui/form/xtls_settings.html +++ /dev/null @@ -1,58 +0,0 @@ -{{define "form/xtlsSettings"}} -<template> - <a-form-item label="SNI" placeholder="Server Name Indication"> - <a-input v-model.trim="inbound.stream.xtls.sni"></a-input> - </a-form-item> - <a-form-item label="ALPN"> - <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme" v-model="inbound.stream.xtls.alpn"> - <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option> - </a-select> - </a-form-item> - <a-form-item label="Allow Insecure"> - <a-switch v-model="inbound.stream.xtls.settings.allowInsecure"></a-switch> - </a-form-item> - <template v-for="cert,index in inbound.stream.xtls.certs"> - <a-form-item label='{{ i18n "certificate" }}'> - <a-radio-group v-model="cert.useFile" button-style="solid"> - <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button> - <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button> - </a-radio-group> - <a-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()" - style="margin-left: 10px"></a-button> - <a-button icon="minus" v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small" - @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px"></a-button> - </a-form-item> - <template v-if="cert.useFile"> - <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'> - <a-input v-model.trim="cert.certFile"></a-input> - </a-form-item> - <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> - <a-input v-model.trim="cert.keyFile"></a-input> - </a-form-item> - <a-form-item label=" "> - <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)"> - {{ i18n "pages.inbounds.setDefaultCert" }}</a-button> - </a-form-item> - </template> - <template v-else> - <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'> - <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input> - </a-form-item> - <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> - <a-input type="textarea" :rows="3" v-model="cert.key"></a-input> - </a-form-item> - </template> - <a-form-item label='OCSP stapling'> - <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number> - </a-form-item> - <a-form-item label="One Time Loading"> - <a-switch v-model="cert.oneTimeLoading"></a-switch> - </a-form-item> - <a-form-item label='Usage Option'> - <a-select v-model="cert.usage" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option> - </a-select> - </a-form-item> - </template> -</template> -{{end}}
\ No newline at end of file diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html index 125307f9..36f165c6 100644 --- a/web/html/xui/inbound_info_modal.html +++ b/web/html/xui/inbound_info_modal.html @@ -154,15 +154,6 @@ <a-tag color="orange">{{ i18n "none" }}</a-tag> </td> </tr> - <tr v-if="infoModal.inbound.xtls"> - <td>Flow</td> - <td v-if="infoModal.clientSettings.flow"> - <a-tag>[[ infoModal.clientSettings.flow ]]</a-tag> - </td> - <td v-else> - <a-tag color="orange">{{ i18n "none" }}</a-tag> - </td> - </tr> <tr v-if="infoModal.clientSettings.password"> <td>{{ i18n "password" }}</td> <td> diff --git a/web/html/xui/inbound_modal.html b/web/html/xui/inbound_modal.html index f605b4fd..4de3518c 100644 --- a/web/html/xui/inbound_modal.html +++ b/web/html/xui/inbound_modal.html @@ -102,11 +102,6 @@ client.flow = ""; }); } - if ((this.inModal.inbound.protocol == Protocols.VLESS || this.inModal.inbound.protocol == Protocols.TROJAN) && !inModal.inbound.xtls) { - this.inModal.inbound.settings.vlesses.forEach(client => { - client.flow = ""; - }); - } }, SSMethodChange() { if (this.inModal.inbound.isSSMultiUser) { @@ -132,10 +127,6 @@ inModal.inbound.stream.tls.certs[index].certFile = app.defaultCert; inModal.inbound.stream.tls.certs[index].keyFile = app.defaultKey; }, - setDefaultCertXtls(index) { - inModal.inbound.stream.xtls.certs[index].certFile = app.defaultCert; - inModal.inbound.stream.xtls.certs[index].keyFile = app.defaultKey; - }, async getNewX25519Cert() { inModal.loading(true); const msg = await HttpUtil.post('/server/getNewX25519Cert'); diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html index 1aad5d91..32bc431f 100644 --- a/web/html/xui/inbounds.html +++ b/web/html/xui/inbounds.html @@ -338,7 +338,6 @@ <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS"> <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag> <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="blue">TLS</a-tag> - <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isXtls" color="blue">XTLS</a-tag> <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="blue">Reality</a-tag> </template> </template> |