Skip to content

Commit f029b91

Browse files
committed
release: 3.0.4
1.新增一键添加服务端配置 2.修复错误的配置项
1 parent 4b56494 commit f029b91

File tree

9 files changed

+62
-19
lines changed

9 files changed

+62
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "easytier-manager-pro",
3-
"version": "3.0.3",
3+
"version": "3.0.4",
44
"description": "EasyTier 管理器 Pro",
55
"displayName": "EasyTier 管理器 Pro",
66
"author": {

src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = ""
66
name = "easytier-manager-pro"
77
repository = ""
88
rust-version = "1.83.0"
9-
version = "3.0.3"
9+
version = "3.0.4"
1010

1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
33
"productName": "easytier-manager-pro",
4-
"version": "3.0.3",
4+
"version": "3.0.4",
55
"identifier": "easytier-manager-pro",
66
"build": {
77
"frontendDist": "../dist",

src/locales/en.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ export default {
621621
disable_udp_hole_punching: 'disable udp hole punching',
622622
enable_encryption: 'enable encryption',
623623
disable_encryption: 'disable encryption',
624+
enable_ipv6: 'enable IPv6',
624625
disable_ipv6: 'disable IPv6',
625626
latency_first: 'latency first',
626627
enable_exit_node: 'enable exit node',
@@ -686,6 +687,8 @@ export default {
686687
restoreWinState: 'Restore window state',
687688
otherSetting: 'Other setting',
688689
clearCache: 'Clear cache',
689-
feedback: 'Feedback'
690+
feedback: 'Feedback',
691+
quickAction: 'Quick action',
692+
createServerConfig: 'Create server config'
690693
}
691694
}

src/locales/zh-CN.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,9 @@ export default {
608608
multi_thread: '使用多线程',
609609
disable_p2p: '禁用P2P通信',
610610
disable_udp_hole_punching: '禁用UDP打洞',
611-
enable_encryption: '是否启用加密',
611+
enable_encryption: '启用加密',
612612
disable_encryption: '禁用加密',
613+
enable_ipv6: '启用 IPv6',
613614
disable_ipv6: '禁用 IPv6',
614615
latency_first: '延迟优先模式',
615616
enable_exit_node: '启用退出节点',
@@ -684,6 +685,8 @@ export default {
684685
clearCache: '清除缓存',
685686
feedback: '问题及意见反馈',
686687
vpn_wireguard_listen: 'WireGuard监听地址',
687-
vpn_client_cidr: 'WireGuard客户端CIDR'
688+
vpn_client_cidr: 'WireGuard客户端CIDR',
689+
quickAction: '快捷操作',
690+
createServerConfig: '创建服务器配置'
688691
}
689692
}

src/views/config/components/Form.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,13 @@
280280
</el-row>
281281
<el-row>
282282
<el-col :span="12">
283-
<el-form-item :label="t('easytier.disable_encryption')" prop="flags.disable_encryption">
284-
<el-switch v-model="formData.flags.disable_encryption" />
283+
<el-form-item :label="t('easytier.enable_encryption')" prop="flags.enable_encryption">
284+
<el-switch v-model="formData.flags.enable_encryption" />
285285
</el-form-item>
286286
</el-col>
287287
<el-col :span="12">
288-
<el-form-item :label="t('easytier.disable_ipv6')" prop="flags.disable_ipv6">
289-
<el-switch v-model="formData.flags.disable_ipv6" />
288+
<el-form-item :label="t('easytier.enable_ipv6')" prop="flags.enable_ipv6">
289+
<el-switch v-model="formData.flags.enable_ipv6" />
290290
</el-form-item>
291291
</el-col>
292292
</el-row>
@@ -297,8 +297,8 @@
297297
</el-form-item>
298298
</el-col>
299299
<el-col :span="12">
300-
<el-form-item :label="t('easytier.enable_exit_node')" prop="flags.enable_exit_node">
301-
<el-switch v-model="formData.flags.enable_exit_node" />
300+
<el-form-item :label="t('easytier.multi_thread')" prop="flags.multi_thread">
301+
<el-switch v-model="formData.flags.multi_thread" />
302302
</el-form-item>
303303
</el-col>
304304
</el-row>
@@ -342,8 +342,8 @@
342342
</el-row>
343343
<el-row>
344344
<el-col :span="12">
345-
<el-form-item :label="t('easytier.multi_thread')" prop="flags.multi_thread">
346-
<el-switch v-model="formData.flags.multi_thread" />
345+
<el-form-item :label="t('easytier.enable_exit_node')" prop="flags.enable_exit_node">
346+
<el-switch v-model="formData.flags.enable_exit_node" />
347347
</el-form-item>
348348
</el-col>
349349
<el-col :span="12">

src/views/config/components/defaultData.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ const defaultFormData: FormData | any = {
2525
flags: {
2626
default_protocol: 'tcp',
2727
dev_name: '',
28-
disable_encryption: false,
29-
disable_ipv6: false,
28+
enable_encryption: true,
29+
enable_ipv6: true,
3030
latency_first: true,
3131
enable_exit_node: false,
3232
no_tun: false,

src/views/config/components/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ interface Flags {
2525
default_protocol: string
2626
dev_name: string
2727
data_compress_algo: string
28-
disable_encryption: boolean
29-
disable_ipv6: boolean
28+
enable_encryption: boolean
29+
enable_ipv6: boolean
3030
latency_first: boolean
3131
enable_exit_node: boolean
3232
no_tun: boolean

src/views/config/index.vue

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const pageSize = ref(10)
3939
const total = ref(0)
4040
const dataConfig = ref('')
4141
const dialogVisible = ref(false)
42+
// const quickDialogVisible = ref(false)
4243
const dialogTitle = ref('')
4344
const actionType = ref('')
4445
const editType = ref('')
@@ -130,6 +131,10 @@ const AddFormAction = async () => {
130131
const refreshAction = async () => {
131132
await getConfigList()
132133
}
134+
/* const quickAction = async () => {
135+
dialogTitle.value = t('easytier.quickAction')
136+
quickDialogVisible.value = true
137+
} */
133138
const checkConfigFileName = async () => {
134139
const findItem = easyTierStore.configList.find(
135140
(item) => item.configFileName === configFileName.value
@@ -155,7 +160,7 @@ const addConfigAction = async () => {
155160
}
156161
if (editType.value === 'form') {
157162
// 验证必填 formRef
158-
if (!(await formRef.value.validateForm())) {
163+
if (formRef.value && !(await formRef.value.validateForm())) {
159164
return
160165
}
161166
saveLoading.value = true
@@ -503,6 +508,27 @@ const stopServiceHandle = async (row: any) => {
503508
})
504509
.finally(async () => await getConfigList())
505510
}
511+
const createServerConfig = async () => {
512+
formData.value = cloneDeep(DefaultData.defaultFormData)
513+
const hostname = await getHostname()
514+
configFileName.value = hostname + '_server'
515+
if (await checkConfigFileName()) {
516+
configFileName.value = hostname + '_server' + Math.floor(Math.random() * 100)
517+
}
518+
editType.value = 'form'
519+
formData.value.network_identity.network_name = 'default'
520+
formData.value.hostname = hostname + '_server'
521+
formData.value.instance_name = hostname + '_server'
522+
formData.value.listeners = [
523+
'tcp://0.0.0.0:11010',
524+
'udp://0.0.0.0:11010',
525+
'wg://0.0.0.0:11011',
526+
'ws://0.0.0.0:11011/',
527+
'wss://0.0.0.0:11012/'
528+
]
529+
await addConfigAction()
530+
// quickDialogVisible.value = false
531+
}
506532
watch(configFileName, (value) => {
507533
formData.value.file_logger.file = value
508534
})
@@ -524,6 +550,10 @@ onMounted(async () => {
524550
<BaseButton type="primary" @click="AddFormAction"
525551
>{{ t('easytier.addNetConfigForm') }}
526552
</BaseButton>
553+
<el-button type="info" @click="createServerConfig" style="margin-left: 10px">
554+
{{ t('easytier.createServerConfig') }}
555+
</el-button>
556+
<!-- <BaseButton type="info" @click="quickAction">{{ t('easytier.quickAction') }}</BaseButton> -->
527557
<BaseButton type="success" @click="refreshAction">{{ t('common.refresh') }}</BaseButton>
528558
</div>
529559
<el-text v-if="noWMIC" type="warning" effect="dark"
@@ -682,6 +712,13 @@ onMounted(async () => {
682712
<BaseButton @click="dialogVisible = false">{{ t('dialogDemo.close') }}</BaseButton>
683713
</template>
684714
</Dialog>
715+
<!-- <Dialog v-model="quickDialogVisible" :title="dialogTitle">
716+
<div class="flex justify-center items-center">
717+
<el-button type="primary" size="large" @click="createServerConfig">{{
718+
t('easytier.createServerConfig')
719+
}}</el-button>
720+
</div>
721+
</Dialog> -->
685722
</div>
686723
</template>
687724
<style lang="less">

0 commit comments

Comments
 (0)