增加日志的配置、优化日志页面

This commit is contained in:
刘嘉伟 2023-11-28 17:49:08 +08:00
parent 15332d8a0e
commit c749a2d84a
4 changed files with 270 additions and 226 deletions

View File

@ -48,4 +48,4 @@
[issues-shield]: https://img.shields.io/github/issues/luckjiawei/frpc-desktop.svg?style=for-the-badge [issues-shield]: https://img.shields.io/github/issues/luckjiawei/frpc-desktop.svg?style=for-the-badge
[issues-url]: https://github.com/luckjiawei/frpc-desktop/issues [issues-url]: https://github.com/luckjiawei/frpc-desktop/issues
[license-shield]: https://img.shields.io/github/license/luckjiawei/frpc-desktop.svg?style=for-the-badge [license-shield]: https://img.shields.io/github/license/luckjiawei/frpc-desktop.svg?style=for-the-badge
[license-url]: https://github.com/luckjiawei/frpc-desktop/blob/master/LICENSE.txt [license-url]: https://github.com/luckjiawei/frpc-desktop/blob/master/LICENSE

View File

@ -74,8 +74,8 @@ serverPort = ${config.serverPort}
auth.method = "${config.authMethod}" auth.method = "${config.authMethod}"
auth.token = "${config.authToken}" auth.token = "${config.authToken}"
log.to = "frpc.log" log.to = "frpc.log"
log.level = "debug" log.level = "${config.logLevel}"
log.maxDays = 3 log.maxDays = ${config.logMaxDays}
webServer.addr = "127.0.0.1" webServer.addr = "127.0.0.1"
webServer.port = 57400 webServer.port = 57400

View File

@ -13,6 +13,8 @@ export type Config = {
serverPort: number; serverPort: number;
authMethod: string; authMethod: string;
authToken: string; authToken: string;
logLevel: string;
logMaxDays: number;
}; };
/** /**

View File

@ -1,5 +1,5 @@
<script lang="ts" setup> <script lang="ts" setup>
import { defineComponent, onMounted, onUnmounted, ref, reactive } from "vue"; import {defineComponent, onMounted, onUnmounted, reactive, ref} from "vue";
import {ipcRenderer} from "electron"; import {ipcRenderer} from "electron";
import {ElMessage, FormInstance, FormRules} from "element-plus"; import {ElMessage, FormInstance, FormRules} from "element-plus";
import Breadcrumb from "@/layout/compoenets/Breadcrumb.vue"; import Breadcrumb from "@/layout/compoenets/Breadcrumb.vue";
@ -17,6 +17,8 @@ type Config = {
serverPort: number; serverPort: number;
authMethod: string; authMethod: string;
authToken: string; authToken: string;
logLevel: string;
logMaxDays: number;
}; };
type Version = { type Version = {
@ -29,7 +31,9 @@ const formData = ref<Config>({
serverAddr: "", serverAddr: "",
serverPort: 7000, serverPort: 7000,
authMethod: "", authMethod: "",
authToken: "" authToken: "",
logLevel: "info",
logMaxDays: 3
}); });
const loading = ref(1); const loading = ref(1);
@ -48,7 +52,9 @@ const rules = reactive<FormRules>({
{required: true, message: "请输入服务器端口", trigger: "blur"} {required: true, message: "请输入服务器端口", trigger: "blur"}
], ],
// authMethod: [{ required: true, message: "", trigger: "blur" }], // authMethod: [{ required: true, message: "", trigger: "blur" }],
authToken: [{ required: true, message: "请输入token值 ", trigger: "blur" }] authToken: [{required: true, message: "请输入token值 ", trigger: "blur"}],
logLevel: [{required: true, message: "请选择日志级别 ", trigger: "blur"}],
logMaxDays: [{required: true, message: "请输入日志保留天数 ", trigger: "blur"}]
}); });
const versions = ref<Array<Version>>([]); const versions = ref<Array<Version>>([]);
@ -104,11 +110,11 @@ onUnmounted(() => {
}); });
</script> </script>
<template> <template>
<div> <div class="main">
<breadcrumb/> <breadcrumb/>
<div class="app-container-breadcrumb pr-2" v-loading="loading > 0">
<div <div
class="w-full bg-white p-4 rounded drop-shadow-lg" class="w-full bg-white p-4 rounded drop-shadow-lg"
v-loading="loading > 0"
> >
<el-form <el-form
:model="formData" :model="formData"
@ -148,25 +154,29 @@ onUnmounted(() => {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="服务端地址:" prop="serverAddr"> <div class="h2">服务器配置</div>
</el-col>
<el-col :span="24">
<el-form-item label="服务器地址:" prop="serverAddr">
<el-input <el-input
v-model="formData.serverAddr" v-model="formData.serverAddr"
placeholder="127.0.0.1" placeholder="127.0.0.1"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="服务端口:" prop="serverPort"> <el-form-item label="服务端口:" prop="serverPort">
<el-input-number <el-input-number
placeholder="7000" placeholder="7000"
v-model="formData.serverPort" v-model="formData.serverPort"
:min="0" :min="0"
:max="65535" :max="65535"
controls-position="right" controls-position="right"
class="!w-full"
></el-input-number> ></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="验证方式:" prop="authMethod"> <el-form-item label="验证方式:" prop="authMethod">
<el-select <el-select
v-model="formData.authMethod" v-model="formData.authMethod"
@ -186,6 +196,24 @@ onUnmounted(() => {
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div class="h2">日志配置</div>
</el-col>
<el-col :span="12">
<el-form-item class="!w-full" label="日志级别:" prop="logLevel">
<el-select v-model="formData.logLevel">
<el-option label="info" value="info"/>
<el-option label="debug" value="debug"/>
<el-option label="waring" value="waring"/>
<el-option label="error" value="error"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="日志保留天数:" prop="logMaxDays">
<el-input-number class="!w-full" controls-position="right" v-model="formData.logMaxDays"/>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item> <el-form-item>
<el-button plain type="primary" @click="handleSubmit"> <el-button plain type="primary" @click="handleSubmit">
@ -198,6 +226,20 @@ onUnmounted(() => {
</el-form> </el-form>
</div> </div>
</div> </div>
</div>
</template> </template>
<style lang="scss" scoped></style> <style lang="scss" scoped>
.h2 {
color: #5A3DAA;
font-size: 16px;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
font-weight: 700;
padding: 6px 10px 6px 15px;
border-left: 5px solid #5A3DAA;
border-radius: 4px;
background-color: #EEEBF6;
margin-bottom: 18px;
}
</style>