Merge pull request #6 from HEX9CF/dev

dev

Author: HEX9CF

README.md

@@ -55,6 +55,8 @@ STU_PASSWORD=password
 AUTO_LOGIN=TRUE
 # 认证成功后自动退出程序
 AUTO_EXIT=FALSE
+# 启动程序后自动隐藏窗口
+AUTO_HIDE=FALSE
 
 # 自动监控网络流量
 MONITOR_FLUX=TRUE
@@ -68,7 +70,9 @@ MONITOR_LOGOUT_THRESHOLD=10
 
 ## 开机自启
 
-用户可以将程序添加到开机启动项，实现开机自动登录校园网。步骤如下：
+用户可以将程序添加到开机启动项，实现开机自动登录校园网。
+
+这里以 Windows 系统为例，具体步骤如下：
 
 1. 将可执行文件移动到一个固定的目录，如 `C:\Program Files\Cupid Connector`。
 2. 右键点击可执行文件 `cupid-connector.exe`，选择“创建快捷方式”。

app.go

@@ -4,14 +4,10 @@ import (
 	"context"
 	"cupid-connector/internal/conf"
 	"cupid-connector/internal/data"
-	"cupid-connector/internal/service/login"
 	"cupid-connector/internal/ticker"
-	"log"
-	"os"
-	"time"
-
 	"github.com/go-toast/toast"
 	"github.com/wailsapp/wails/v2/pkg/runtime"
+	"log"
 )
 
 const AppID = "Cupid Connector"
@@ -35,54 +31,39 @@ func (a *App) startup(ctx context.Context) {
 		log.Println(err)
 		return
 	}
+
 	// 刷新信息
 	a.RefreshInfo()
-	if data.Config.Basic.AutoLogin == "TRUE" {
-		err = login.Login()
-		if err != nil {
-			log.Println(err)
-			n := toast.Notification{
-				AppID:   AppID,
-				Title:   "校园网登录失败",
-				Message: "错误信息：" + err.Error(),
-			}
-			err := n.Push()
-			if err != nil {
-				log.Fatalln(err)
-			}
-		} else {
-			msg := "登录成功，用户：" + data.Config.Basic.Username + "，您已通过上网认证！"
-			if data.Config.Basic.AutoExit == "TRUE" {
-				msg += "程序将在3秒后自动退出"
-			}
-			n := toast.Notification{
-				AppID:   AppID,
-				Title:   "校园网登录成功",
-				Message: msg,
-			}
-			err = n.Push()
-			if err != nil {
-				log.Fatalln(err)
-			}
-			// 刷新信息
-			a.RefreshInfo()
-		}
-		if err == nil && data.Config.Basic.AutoExit == "TRUE" {
-			time.Sleep(3 * time.Second)
-			os.Exit(0)
-		}
-	}
+
+	// 自动登录
+	a.autoLogin()
 
 	// 初始化定时器
 	err = ticker.Set()
 	if err != nil {
+		log.Println(err)
 		return
 	}
 
 	// 启动监控
 	go a.startMonitor()
 
+	// 自动隐藏窗口
 	if data.Config.Basic.AutoHide == "TRUE" {
+		log.Println("自动隐藏窗口")
+		n := toast.Notification{
+			AppID:   AppID,
+			Title:   "Cupid Connector",
+			Message: "窗口已最小化到托盘",
+		}
+		err = n.Push()
+		if err != nil {
+			log.Println(err)
+			return
+		}
 		runtime.WindowHide(ctx)
 	}
 }
+
+func (a *App) shutdown(ctx context.Context) {
+}

frontend/src/components/Info.vue

@@ -46,8 +46,8 @@
     <div class="flux-chart">
       <div class="statistics-area-chart" ref="chartDom"></div>
     </div>
-    <div class="surplus" v-if="info">
-      剩余流量:{{ parseFloat((info.overall - info?.used).toFixed(3)) }}MB
+    <div class="flux" v-if="info">
+      已用流量: {{ info?.used }} MB / 流量总额: {{ info?.overall }} MB
     </div>
   </div>
 </template>
@@ -72,6 +72,7 @@ const isNoData = ref<boolean>(true)
 const getInfo = async () => {
   isLoading.value = true
   await GetInfo().then((res) => {
+    console.log(res)
     if (res.code === 1) {
       info.value = res.data
       isNoData.value = false;
@@ -113,24 +114,24 @@ const updateOption = async () => {
           splitNumber: 8,
           type: 'gauge',
           itemStyle: {
-            color: '#58D9F9',
+            color: '#aaa',
             shadowColor: 'rgba(0,138,255,0.45)',
             shadowBlur: 10,
             shadowOffsetX: 2,
             shadowOffsetY: 2,
           },
           progress: {
-            show: true,
-            width: 18
+            show: false,
+            width: 18,
           },
           axisLine: {
             lineStyle: {
               width: 18,
               color: [
-                [0.25, '#7CFFB2'],
-                [0.5, '#58D9F9'],
-                [0.75, '#FDDD60'],
-                [1, '#FF6E76']
+                [0.25, '#FF6E76'],
+                [0.5, '#FDDD60'],
+                [0.75, '#58D9F9'],
+                [1, '#7CFFB2']
               ]
             }
           },
@@ -164,13 +165,13 @@ const updateOption = async () => {
             valueAnimation: true,
             fontSize: 20,
             offsetCenter: [0, '85%'],
-            formatter: '{value}' + 'MB',
+            formatter: '{value}' + ' MB',
             color: '#fff'
           },
           data: [
             {
-              value: info.value?.used,
-              name: '已使用',
+              value: parseFloat(((info.value?.overall ?? 0) - (info.value?.used ?? 0)).toFixed(2) ?? 0),
+              name: '剩余流量',
             }
           ]
         }
@@ -194,20 +195,25 @@ const updateInfo = async () => {
     myChart.value = echarts.init(chartDom.value);
     await updateOption();
   }
+  isLoading.value = false
 }
 
 onMounted(async () => {
   EventsOn("updateInfo", async () => {
     isLoading.value = true
     await updateInfo();
+    isLoading.value = false
   })
+  setTimeout(async () => {
+    await updateInfo()
+  }, 3000)
 })
 </script>
 
 <style scoped>
 .statistics-area-chart {
-  width: 240px;
-  height: 240px;
+  width: 220px;
+  height: 210px;
   text-align: center;
 }
 
@@ -216,4 +222,9 @@ onMounted(async () => {
   justify-content: center;
   text-align: center;
 }
+
+.flux {
+  font-size: 12px;
+  color: #aaa;
+}
 </style>

frontend/src/components/Menu.vue

@@ -3,19 +3,21 @@ import { SwitchButton, Minus } from "@element-plus/icons-vue";
 import { Exit } from "../../wailsjs/go/main/App";
 import { WindowHide } from "../../wailsjs/runtime/runtime";
 
-const handleClick = () => {
+const handleExit = () => {
   Exit();
 }
 </script>
 
 <template>
   <el-menu class="el-menu-demo" mode="horizontal" :ellipsis="false" text-color="#fff" active-text-color="#fff">
-    <el-menu-item>
-      <h1>Cupid Connector</h1>
-    </el-menu-item>
+    <div class="logo">
+      <h3>
+        Cupid Connector
+      </h3>
+    </div>
     <div class="button-container">
       <el-button class="minus-button" text :icon="Minus" @click="WindowHide"></el-button>
-      <el-button class="exit-button" text :icon="SwitchButton" @click="handleClick"></el-button>
+      <el-button class="exit-button" text :icon="SwitchButton" @click="handleExit"></el-button>
     </div>
   </el-menu>
 </template>
@@ -28,6 +30,11 @@ const handleClick = () => {
   margin-right: auto;
 }
 
+.logo {
+  margin-right: auto;
+  color: #99ccff;
+}
+
 .button-container {
   display: flex;
   align-items: center;

frontend/src/components/Setting.vue

@@ -1,6 +1,6 @@
 <template>
   <el-button type="primary" @click="handleClick" :icon="Setting" size="small">设置</el-button>
-  <el-dialog v-model="dialogFormVisible" title="设置" width="400">
+  <el-dialog v-model="dialogFormVisible" width="400">
     <el-form :model="conf">
       <el-form-item label="URL" required>
         <el-input v-model="conf.base_url" placeholder="https://a.stu.edu.cn"></el-input>
@@ -11,13 +11,13 @@
       <el-form-item label="密码" required>
         <el-input v-model="conf.password" placeholder="password" type="password"></el-input>
       </el-form-item>
-      <el-form-item label="启动程序自动登录">
+      <el-form-item label="启动程序自动登录" class="form-btn">
         <el-switch v-model="auto_login"></el-switch>
       </el-form-item>
-      <el-form-item label="认证成功自动退出">
+      <el-form-item label="认证成功自动退出" class="form-btn">
         <el-switch v-model="auto_exit"></el-switch>
       </el-form-item>
-      <el-form-item label="自动隐藏窗口">
+      <el-form-item label="自动隐藏程序窗口" class="form-btn">
         <el-switch v-model="auto_hide"></el-switch>
       </el-form-item>
     </el-form>
@@ -72,4 +72,8 @@ const handleConfirm = async () => {
   });
   dialogFormVisible.value = false;
 };
-</script>
+</script>
+
+<style>
+
+</style>

internal/conf/create.go

@@ -1,11 +1,5 @@
 package conf
 
-import (
-	"cupid-connector/internal/utils"
-	"log"
-	"os"
-)
-
 func CreateEnv() error {
 	setDefault()
 
@@ -16,36 +10,3 @@ func CreateEnv() error {
 
 	return nil
 }
-
-func saveEnv() error {
-	log.Println("正在创建配置文件...")
-	v, err := utils.IsFileExists(envPath)
-	if err != nil {
-		log.Println("创建配置文件失败！")
-		return err
-	}
-	if v {
-		err := os.Remove(envPath)
-		if err != nil {
-			log.Println("删除旧配置文件失败！")
-			return err
-		}
-	}
-	file, err := os.Create(envPath)
-	if err != nil {
-		log.Println("创建配置文件失败！")
-		return err
-	}
-	defer file.Close()
-
-	content := getEnvContent()
-
-	_, err = file.WriteString(content)
-	if err != nil {
-		log.Println("写入配置文件失败！")
-		return err
-	}
-
-	log.Println("创建配置文件成功！")
-	return nil
-}

internal/conf/default.go

@@ -3,16 +3,18 @@ package conf
 import "cupid-connector/internal/data"
 
 const (
-	DefaultBaseUrl         = "https://a.stu.edu.cn"
-	DefaultUsername        = ""
-	DefaultPassword        = ""
-	DefaultAutoLogin       = "TRUE"
-	DefaultAutoExit        = "FALSE"
+	DefaultBaseUrl  = "https://a.stu.edu.cn"
+	DefaultUsername = ""
+	DefaultPassword = ""
+
+	DefaultAutoLogin = "FALSE"
+	DefaultAutoExit  = "FALSE"
+	DefaultAutoHide  = "FALSE"
+
 	DefaultMonitorFlux     = "FALSE"
 	DefaultMonitorInterval = "5"
 	DefaultAlertThreshold  = "30"
 	DefaultLogoutThreshold = "10"
-	DefaultAutoHide        = "FALSE"
 )
 
 func setDefault() {
@@ -22,6 +24,7 @@ func setDefault() {
 	data.Config.Basic.AutoLogin = DefaultAutoLogin
 	data.Config.Basic.AutoExit = DefaultAutoExit
 	data.Config.Basic.AutoHide = DefaultAutoHide
+
 	data.Config.Monitor.Enable = DefaultMonitorFlux
 	data.Config.Monitor.Interval = DefaultMonitorInterval
 	data.Config.Monitor.AlertThreshold = DefaultAlertThreshold