Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-07-02 04:52:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed - set Default Cert for Xtls

Browse source
This commit is contained in:
MHSanaei 2023-05-01 20:58:00 +03:30
parent 4ce53920fe
commit 1885a8c0bf
7 changed files with 85 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/html/xui/form/client.html
View file

@ -15,17 +15,17 @@
</span> </span>
<a-input v-model.trim="client.email" style="width: 150px;" ></a-input> <a-input v-model.trim="client.email" style="width: 150px;" ></a-input>
</a-form-item> </a-form-item>
<a-form-item label="{{ i18n "pages.inbounds.enable" }}"> <a-form-item label='{{ i18n "pages.inbounds.enable" }}'>
<a-switch v-model="client.enable"></a-switch> <a-switch v-model="client.enable"></a-switch>
</a-form-item> </a-form-item>
<a-form-item label="Password" v-if="inbound.protocol === Protocols.TROJAN"> <a-form-item label="Password" v-if="inbound.protocol === Protocols.TROJAN">
<a-input v-model.trim="client.password" style="width: 150px;" ></a-input> <a-input v-model.trim="client.password" style="width: 150px;" ></a-input>
</a-form-item> </a-form-item>
<a-form-item label="ID" v-if="inbound.protocol === Protocols.VMESS || inbound.protocol === Protocols.VLESS">
<a-input v-model.trim="client.id" style="width: 300px;"></a-input>
</a-form-item>
<a-form-item label='{{ i18n "additional" }} ID' v-if="inbound.protocol === Protocols.VMESS"> <a-form-item label='{{ i18n "additional" }} ID' v-if="inbound.protocol === Protocols.VMESS">
<a-input type="number" v-model.number="client.alterId" style="width: 70px;"></a-input> <a-input type="number" v-model.number="client.alterId" style="width: 70px;"></a-input>
</a-form-item>
<a-form-item label="ID" v-if="inbound.protocol === Protocols.VMESS || inbound.protocol === Protocols.VLESS">
<a-input v-model.trim="client.id" style="width: 300px;"></a-input>
</a-form-item> </a-form-item>
<a-form-item label="Subscription" v-if="client.email"> <a-form-item label="Subscription" v-if="client.email">
<a-input v-model.trim="client.subId"></a-input> <a-input v-model.trim="client.subId"></a-input>

2
web/html/xui/form/protocol/socks.html
View file

@ -1,6 +1,6 @@
{{define "form/socks"}} {{define "form/socks"}}
<a-form layout="inline"> <a-form layout="inline">
<!-- <a-form-item label="Password authentication">--> <!-- <a-form-item label="Password authentication">-->
<a-form-item label='{{ i18n "password" }}'> <a-form-item label='{{ i18n "password" }}'>
<a-switch :checked="inbound.settings.auth === 'password'" <a-switch :checked="inbound.settings.auth === 'password'"
@change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch> @change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch>

52
web/html/xui/form/protocol/trojan.html
View file

@ -2,20 +2,18 @@
<a-form layout="inline"> <a-form layout="inline">
<a-collapse activeKey="0" v-for="(client, index) in inbound.settings.trojans.slice(0,1)" v-if="!isEdit"> <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.trojans.slice(0,1)" v-if="!isEdit">
<a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'> <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'>
<a-form layout="inline"> <a-form-item>
<a-form-item> <span slot="label">
<span slot="label"> <span>{{ i18n "pages.inbounds.Email" }}</span>
<span>{{ i18n "pages.inbounds.Email" }}</span> <a-tooltip>
<a-tooltip> <template slot="title">
<template slot="title"> <span>{{ i18n "pages.inbounds.EmailDesc" }}</span>
<span>{{ i18n "pages.inbounds.EmailDesc" }}</span> </template>
</template> <a-icon type="sync" @click="getNewEmail(client)"></a-icon>
<a-icon @click="getNewEmail(client)" type="sync"> </a-icon> </a-tooltip>
</a-tooltip> </span>
</span> <a-input v-model.trim="client.email" style="width: 150px;"></a-input>
<a-input v-model.trim="client.email" style="width: 150px;" ></a-input> </a-form-item>
</a-form-item>
</a-form>
<a-form-item label="Password"> <a-form-item label="Password">
<a-input v-model.trim="client.password" style="width: 150px;"></a-input> <a-input v-model.trim="client.password" style="width: 150px;"></a-input>
</a-form-item> </a-form-item>
@ -25,18 +23,18 @@
<a-form-item label="Telegram Username" v-if="client.email"> <a-form-item label="Telegram Username" v-if="client.email">
<a-input v-model.trim="client.tgId"></a-input> <a-input v-model.trim="client.tgId"></a-input>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<span slot="label"> <span slot="label">
<span>{{ i18n "pages.inbounds.IPLimit" }}</span> <span>{{ i18n "pages.inbounds.IPLimit" }}</span>
<a-tooltip> <a-tooltip>
<template slot="title"> <template slot="title">
<span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span> <span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
</template> </template>
<a-icon type="question-circle" theme="filled"></a-icon> <a-icon type="question-circle" theme="filled"></a-icon>
</a-tooltip> </a-tooltip>
</span> </span>
<a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;" ></a-input> <a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;" ></a-input>
</a-form-item> </a-form-item>
<a-form-item v-if="inbound.xtls" label="Flow"> <a-form-item v-if="inbound.xtls" label="Flow">
<a-select v-model="client.flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"> <a-select v-model="client.flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
<a-select-option value="">{{ i18n "none" }}</a-select-option> <a-select-option value="">{{ i18n "none" }}</a-select-option>
@ -66,7 +64,7 @@
</a-tooltip> </a-tooltip>
</span> </span>
<a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
:dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
v-model="client._expiryTime" style="width: 170px;"></a-date-picker> v-model="client._expiryTime" style="width: 170px;"></a-date-picker>
</a-form-item> </a-form-item>
</a-collapse-panel> </a-collapse-panel>

34
web/html/xui/form/protocol/vless.html
View file

@ -2,22 +2,20 @@
<a-form layout="inline"> <a-form layout="inline">
<a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vlesses.slice(0,1)" v-if="!isEdit"> <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vlesses.slice(0,1)" v-if="!isEdit">
<a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'> <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'>
<a-form layout="inline"> <a-form-item>
<a-form-item> <span slot="label">
<span slot="label"> <span>{{ i18n "pages.inbounds.Email" }}</span>
<span>{{ i18n "pages.inbounds.Email" }}</span> <a-tooltip>
<a-tooltip> <template slot="title">
<template slot="title"> <span>{{ i18n "pages.inbounds.EmailDesc" }}</span>
<span>{{ i18n "pages.inbounds.EmailDesc" }}</span> </template>
</template> <a-icon type="sync" @click="getNewEmail(client)"></a-icon>
<a-icon type="sync" @click="getNewEmail(client)"></a-icon> </a-tooltip>
</a-tooltip> </span>
</span> <a-input v-model.trim="client.email" style="width: 150px;"></a-input>
<a-input v-model.trim="client.email" style="width: 150px;" ></a-input> </a-form-item>
</a-form-item>
</a-form>
<a-form-item label="ID"> <a-form-item label="ID">
<a-input v-model.trim="client.id" style="width: 300px;" ></a-input> <a-input v-model.trim="client.id" style="width: 300px;"></a-input>
</a-form-item> </a-form-item>
<a-form-item label="Subscription" v-if="client.email"> <a-form-item label="Subscription" v-if="client.email">
<a-input v-model.trim="client.subId"></a-input> <a-input v-model.trim="client.subId"></a-input>
@ -25,7 +23,7 @@
<a-form-item label="Telegram Username" v-if="client.email"> <a-form-item label="Telegram Username" v-if="client.email">
<a-input v-model.trim="client.tgId"></a-input> <a-input v-model.trim="client.tgId"></a-input>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<span slot="label"> <span slot="label">
<span>{{ i18n "pages.inbounds.IPLimit" }}</span> <span>{{ i18n "pages.inbounds.IPLimit" }}</span>
<a-tooltip> <a-tooltip>
@ -36,8 +34,8 @@
</a-tooltip> </a-tooltip>
</span> </span>
<a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;" ></a-input> <a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;" ></a-input>
</a-form-item> </a-form-item>
<a-form-item v-if="inbound.xtls" label="Flow"> <a-form-item v-if="inbound.xtls" label="Flow">
<a-select v-model="inbound.settings.vlesses[index].flow" style="width: 200px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"> <a-select v-model="inbound.settings.vlesses[index].flow" style="width: 200px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
<a-select-option value="" selected>{{ i18n "none" }}</a-select-option> <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-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>

59
web/html/xui/form/protocol/vmess.html
View file

@ -2,44 +2,42 @@
<a-form layout="inline"> <a-form layout="inline">
<a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vmesses.slice(0,1)" v-if="!isEdit"> <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vmesses.slice(0,1)" v-if="!isEdit">
<a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'> <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'>
<a-form layout="inline"> <a-form-item>
<a-form-item> <span slot="label">
<span slot="label"> <span>{{ i18n "pages.inbounds.Email" }}</span>
<span>{{ i18n "pages.inbounds.Email" }}</span> <a-tooltip>
<a-tooltip> <template slot="title">
<template slot="title"> <span>{{ i18n "pages.inbounds.EmailDesc" }}</span>
<span>{{ i18n "pages.inbounds.EmailDesc" }}</span> </template>
</template> <a-icon type="sync" @click="getNewEmail(client)"></a-icon>
<a-icon type="sync" @click="getNewEmail(client)"></a-icon> </a-tooltip>
</a-tooltip> </span>
</span> <a-input v-model.trim="client.email" style="width: 150px;"></a-input>
<a-input v-model.trim="client.email" style="width: 150px;"></a-input>
</a-form-item>
</a-form>
<a-form-item label="ID">
<a-input v-model.trim="client.id" style="width: 300px;"></a-input>
</a-form-item> </a-form-item>
<a-form-item label='{{ i18n "additional" }} ID'> <a-form-item label='{{ i18n "additional" }} ID'>
<a-input type="number" v-model.number="client.alterId" style="width: 70px;"></a-input> <a-input type="number" v-model.number="client.alterId" style="width: 70px;"></a-input>
</a-form-item> </a-form-item>
<a-form-item label="ID">
<a-input v-model.trim="client.id" style="width: 300px;"></a-input>
</a-form-item>
<a-form-item label="Subscription" v-if="client.email"> <a-form-item label="Subscription" v-if="client.email">
<a-input v-model.trim="client.subId"></a-input> <a-input v-model.trim="client.subId"></a-input>
</a-form-item> </a-form-item>
<a-form-item label="Telegram Username" v-if="client.email"> <a-form-item label="Telegram Username" v-if="client.email">
<a-input v-model.trim="client.tgId"></a-input> <a-input v-model.trim="client.tgId"></a-input>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<span slot="label"> <span slot="label">
<span>{{ i18n "pages.inbounds.IPLimit" }}</span> <span>{{ i18n "pages.inbounds.IPLimit" }}</span>
<a-tooltip> <a-tooltip>
<template slot="title"> <template slot="title">
<span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span> <span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
</template> </template>
<a-icon type="question-circle" theme="filled"></a-icon> <a-icon type="question-circle" theme="filled"></a-icon>
</a-tooltip> </a-tooltip>
</span> </span>
<a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;"></a-input> <a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;"></a-input>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<span slot="label"> <span slot="label">
<span >{{ i18n "pages.inbounds.totalFlow" }}</span>(GB) <span >{{ i18n "pages.inbounds.totalFlow" }}</span>(GB)
@ -63,8 +61,8 @@
</a-tooltip> </a-tooltip>
</span> </span>
<a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
:dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
v-model="client._expiryTime" style="width: 170px;"></a-date-picker> v-model="client._expiryTime" style="width: 170px;"></a-date-picker>
</a-form-item> </a-form-item>
</a-collapse-panel> </a-collapse-panel>
</a-collapse> </a-collapse>
@ -85,5 +83,4 @@
<a-switch v-model.number="inbound.settings.disableInsecure"></a-switch> <a-switch v-model.number="inbound.settings.disableInsecure"></a-switch>
</a-form-item> </a-form-item>
</a-form> </a-form>
{{end}} {{end}}

2
web/html/xui/form/tls_settings.html
View file

@ -121,7 +121,7 @@
<a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'> <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'>
<a-input v-model.trim="inbound.stream.xtls.certs[0].keyFile" style="width:300px;"></a-input> <a-input v-model.trim="inbound.stream.xtls.certs[0].keyFile" style="width:300px;"></a-input>
</a-form-item> </a-form-item>
<a-button type="primary" icon="import" @click="setDefaultCertData">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button> <a-button type="primary" icon="import" @click="setDefaultCertXtls">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
</template> </template>
<template v-else> <template v-else>
<a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'> <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'>

4
web/html/xui/inbound_modal.html
View file

@ -103,6 +103,10 @@
inModal.inbound.stream.tls.certs[0].certFile = app.defaultCert; inModal.inbound.stream.tls.certs[0].certFile = app.defaultCert;
inModal.inbound.stream.tls.certs[0].keyFile = app.defaultKey; inModal.inbound.stream.tls.certs[0].keyFile = app.defaultKey;
}, },
setDefaultCertXtls(){
inModal.inbound.stream.xtls.certs[0].certFile = app.defaultCert;
inModal.inbound.stream.xtls.certs[0].keyFile = app.defaultKey;
},
async getNewX25519Cert(){ async getNewX25519Cert(){
inModal.loading(true); inModal.loading(true);
const msg = await HttpUtil.post('/server/getNewX25519Cert'); const msg = await HttpUtil.post('/server/getNewX25519Cert');