Browse Source

max port to 65535 (#3536)

* add EXPOSE port in Dockerfile

* fix: max port 65 531 -> 65 535

* fix

---------

Co-authored-by: mhsanaei <[email protected]>
Дмитрий Олегович Саенко 5 days ago
parent
commit
02bff4db6c

+ 5 - 4
web/html/form/inbound.html

@@ -28,7 +28,7 @@
     </a-form-item>
     </a-form-item>
 
 
     <a-form-item label='{{ i18n "pages.inbounds.port" }}'>
     <a-form-item label='{{ i18n "pages.inbounds.port" }}'>
-        <a-input-number v-model.number="inbound.port" :min="1" :max="65531"></a-input-number>
+        <a-input-number v-model.number="inbound.port" :min="1" :max="65535"></a-input-number>
     </a-form-item>
     </a-form-item>
 
 
     <a-form-item>
     <a-form-item>
@@ -51,8 +51,9 @@
                     <span>{{ i18n "pages.inbounds.periodicTrafficResetDesc" }}</span>
                     <span>{{ i18n "pages.inbounds.periodicTrafficResetDesc" }}</span>
                     <br v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
                     <br v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
                     <span v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
                     <span v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
-                        <strong>{{ i18n "pages.inbounds.lastReset" }}:</strong> 
-                        <span v-if="datepicker == 'gregorian'">[[ moment(dbInbound.lastTrafficResetTime).format('YYYY-MM-DD HH:mm:ss') ]]</span>
+                        <strong>{{ i18n "pages.inbounds.lastReset" }}:</strong>
+                        <span v-if="datepicker == 'gregorian'">[[
+                            moment(dbInbound.lastTrafficResetTime).format('YYYY-MM-DD HH:mm:ss') ]]</span>
                         <span v-else>[[ DateUtil.convertToJalalian(moment(dbInbound.lastTrafficResetTime)) ]]</span>
                         <span v-else>[[ DateUtil.convertToJalalian(moment(dbInbound.lastTrafficResetTime)) ]]</span>
                     </span>
                     </span>
                 </template>
                 </template>
@@ -145,4 +146,4 @@
     </a-collapse-panel>
     </a-collapse-panel>
 </a-collapse>
 </a-collapse>
 
 
-{{end}}
+{{end}}

+ 6 - 4
web/html/form/stream/external_proxy.html

@@ -3,12 +3,14 @@
   <a-divider :style="{ margin: '5px 0 0' }"></a-divider>
   <a-divider :style="{ margin: '5px 0 0' }"></a-divider>
   <a-form-item label="External Proxy">
   <a-form-item label="External Proxy">
     <a-switch v-model="externalProxy"></a-switch>
     <a-switch v-model="externalProxy"></a-switch>
-    <a-button icon="plus" v-if="externalProxy" type="primary" :style="{ marginLeft: '10px' }" size="small" @click="inbound.stream.externalProxy.push({forceTls: 'same', dest: '', port: 443, remark: ''})"></a-button>
+    <a-button icon="plus" v-if="externalProxy" type="primary" :style="{ marginLeft: '10px' }" size="small"
+      @click="inbound.stream.externalProxy.push({forceTls: 'same', dest: '', port: 443, remark: ''})"></a-button>
   </a-form-item>
   </a-form-item>
   <a-input-group :style="{ margin: '8px 0' }" compact v-for="(row, index) in inbound.stream.externalProxy">
   <a-input-group :style="{ margin: '8px 0' }" compact v-for="(row, index) in inbound.stream.externalProxy">
     <template>
     <template>
       <a-tooltip title="Force TLS">
       <a-tooltip title="Force TLS">
-        <a-select v-model="row.forceTls" :style="{ width: '20%', margin: '0px' }" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-select v-model="row.forceTls" :style="{ width: '20%', margin: '0px' }"
+          :dropdown-class-name="themeSwitcher.currentTheme">
           <a-select-option value="same">{{ i18n "pages.inbounds.same" }}</a-select-option>
           <a-select-option value="same">{{ i18n "pages.inbounds.same" }}</a-select-option>
           <a-select-option value="none">{{ i18n "none" }}</a-select-option>
           <a-select-option value="none">{{ i18n "none" }}</a-select-option>
           <a-select-option value="tls">TLS</a-select-option>
           <a-select-option value="tls">TLS</a-select-option>
@@ -17,7 +19,7 @@
     </template>
     </template>
     <a-input :style="{ width: '30%' }" v-model.trim="row.dest" placeholder='{{ i18n "host" }}'></a-input>
     <a-input :style="{ width: '30%' }" v-model.trim="row.dest" placeholder='{{ i18n "host" }}'></a-input>
     <a-tooltip title='{{ i18n "pages.inbounds.port" }}'>
     <a-tooltip title='{{ i18n "pages.inbounds.port" }}'>
-      <a-input-number :style="{ width: '15%' }" v-model.number="row.port" min="1" max="65531"></a-input-number>
+      <a-input-number :style="{ width: '15%' }" v-model.number="row.port" min="1" max="65535"></a-input-number>
     </a-tooltip>
     </a-tooltip>
     <a-input :style="{ width: '30%', top: '0' }" v-model.trim="row.remark" placeholder='{{ i18n "remark" }}'>
     <a-input :style="{ width: '30%', top: '0' }" v-model.trim="row.remark" placeholder='{{ i18n "remark" }}'>
       <template slot="addonAfter">
       <template slot="addonAfter">
@@ -26,4 +28,4 @@
     </a-input>
     </a-input>
   </a-input-group>
   </a-input-group>
 </a-form>
 </a-form>
-{{end}}
+{{end}}

+ 5 - 4
web/html/modals/xray_dns_modal.html

@@ -7,12 +7,13 @@
       <a-input v-model.trim="dnsModal.dnsServer.address"></a-input>
       <a-input v-model.trim="dnsModal.dnsServer.address"></a-input>
     </a-form-item>
     </a-form-item>
     <a-form-item label='{{ i18n "pages.inbounds.port" }}'>
     <a-form-item label='{{ i18n "pages.inbounds.port" }}'>
-      <a-input-number v-model.number="dnsModal.dnsServer.port" :min="1" :max="65531"></a-input-number>
+      <a-input-number v-model.number="dnsModal.dnsServer.port" :min="1" :max="65535"></a-input-number>
     </a-form-item>
     </a-form-item>
     <a-form-item label='{{ i18n "pages.xray.dns.strategy" }}'>
     <a-form-item label='{{ i18n "pages.xray.dns.strategy" }}'>
       <a-select v-model="dnsModal.dnsServer.queryStrategy" :style="{ width: '100%' }"
       <a-select v-model="dnsModal.dnsServer.queryStrategy" :style="{ width: '100%' }"
         :dropdown-class-name="themeSwitcher.currentTheme">
         :dropdown-class-name="themeSwitcher.currentTheme">
-        <a-select-option :value="l" :label="l" v-for="l in ['UseSystem', 'UseIP', 'UseIPv4', 'UseIPv6']"> [[ l ]] </a-select-option>
+        <a-select-option :value="l" :label="l" v-for="l in ['UseSystem', 'UseIP', 'UseIPv4', 'UseIPv6']"> [[ l ]]
+        </a-select-option>
       </a-select>
       </a-select>
     </a-form-item>
     </a-form-item>
     <a-divider :style="{ margin: '5px 0' }"></a-divider>
     <a-divider :style="{ margin: '5px 0' }"></a-divider>
@@ -75,7 +76,7 @@
     isEdit: false,
     isEdit: false,
     confirm: null,
     confirm: null,
     dnsServer: { ...defaultDnsObject },
     dnsServer: { ...defaultDnsObject },
-    ok() {      
+    ok() {
       ObjectUtil.execute(dnsModal.confirm, { ...dnsModal.dnsServer });
       ObjectUtil.execute(dnsModal.confirm, { ...dnsModal.dnsServer });
     },
     },
     show({
     show({
@@ -106,7 +107,7 @@
         }
         }
       } else {
       } else {
         this.dnsServer = { ...defaultDnsObject };
         this.dnsServer = { ...defaultDnsObject };
-      
+
         this.dnsServer.domains = [];
         this.dnsServer.domains = [];
         this.dnsServer.expectIPs = [];
         this.dnsServer.expectIPs = [];
         this.dnsServer.unexpectedIPs = [];
         this.dnsServer.unexpectedIPs = [];

+ 3 - 2
web/html/settings/panel/general.html

@@ -39,7 +39,7 @@
             <template #title>{{ i18n "pages.settings.panelPort"}}</template>
             <template #title>{{ i18n "pages.settings.panelPort"}}</template>
             <template #description>{{ i18n "pages.settings.panelPortDesc"}}</template>
             <template #description>{{ i18n "pages.settings.panelPortDesc"}}</template>
             <template #control>
             <template #control>
-                <a-input-number :min="1" :min="65531" v-model="allSetting.webPort" :style="{ width: '100%' }"></a-input>
+                <a-input-number :min="1" :min="65535" v-model="allSetting.webPort" :style="{ width: '100%' }"></a-input>
             </template>
             </template>
         </a-setting-list-item>
         </a-setting-list-item>
         <a-setting-list-item paddings="small">
         <a-setting-list-item paddings="small">
@@ -137,7 +137,8 @@
             <template #title>{{ i18n "pages.settings.datepicker"}}</template>
             <template #title>{{ i18n "pages.settings.datepicker"}}</template>
             <template #description>{{ i18n "pages.settings.datepickerDescription"}}</template>
             <template #description>{{ i18n "pages.settings.datepickerDescription"}}</template>
             <template #control>
             <template #control>
-                <a-select :style="{ width: '100%' }" :dropdown-class-name="themeSwitcher.currentTheme" v-model="datepicker">
+                <a-select :style="{ width: '100%' }" :dropdown-class-name="themeSwitcher.currentTheme"
+                    v-model="datepicker">
                     <a-select-option v-for="item in datepickerList" :value="item.value">
                     <a-select-option v-for="item in datepickerList" :value="item.value">
                         <span v-text="item.name"></span>
                         <span v-text="item.name"></span>
                     </a-select-option>
                     </a-select-option>

+ 4 - 7
web/html/settings/panel/subscription/general.html

@@ -40,7 +40,7 @@
             <template #title>{{ i18n "pages.settings.subPort"}}</template>
             <template #title>{{ i18n "pages.settings.subPort"}}</template>
             <template #description>{{ i18n "pages.settings.subPortDesc"}}</template>
             <template #description>{{ i18n "pages.settings.subPortDesc"}}</template>
             <template #control>
             <template #control>
-                <a-input-number v-model="allSetting.subPort" :min="1" :min="65531"
+                <a-input-number v-model="allSetting.subPort" :min="1" :min="65535"
                     :style="{ width: '100%' }"></a-input-number>
                     :style="{ width: '100%' }"></a-input-number>
             </template>
             </template>
         </a-setting-list-item>
         </a-setting-list-item>
@@ -48,13 +48,10 @@
             <template #title>{{ i18n "pages.settings.subPath"}}</template>
             <template #title>{{ i18n "pages.settings.subPath"}}</template>
             <template #description>{{ i18n "pages.settings.subPathDesc"}}</template>
             <template #description>{{ i18n "pages.settings.subPathDesc"}}</template>
             <template #control>
             <template #control>
-                <a-input
-                    type="text"
-                    v-model="allSetting.subPath"
+                <a-input type="text" v-model="allSetting.subPath"
                     @input="allSetting.subPath = ((typeof $event === 'string' ? $event : ($event && $event.target ? $event.target.value : '')) || '').replace(/[:*]/g, '')"
                     @input="allSetting.subPath = ((typeof $event === 'string' ? $event : ($event && $event.target ? $event.target.value : '')) || '').replace(/[:*]/g, '')"
                     @blur="allSetting.subPath = (p => { p = p || '/'; if (!p.startsWith('/')) p='/' + p; if (!p.endsWith('/')) p += '/'; return p.replace(/\/+/g,'/'); })(allSetting.subPath)"
                     @blur="allSetting.subPath = (p => { p = p || '/'; if (!p.startsWith('/')) p='/' + p; if (!p.endsWith('/')) p += '/'; return p.replace(/\/+/g,'/'); })(allSetting.subPath)"
-                    placeholder="/sub/"
-                ></a-input>
+                    placeholder="/sub/"></a-input>
             </template>
             </template>
         </a-setting-list-item>
         </a-setting-list-item>
         <a-setting-list-item paddings="small">
         <a-setting-list-item paddings="small">
@@ -108,4 +105,4 @@
         </a-setting-list-item>
         </a-setting-list-item>
     </a-collapse-panel>
     </a-collapse-panel>
 </a-collapse>
 </a-collapse>
-{{end}}
+{{end}}