⚡调整了客户端列表页面的卡片布局

README.md

@@ -34,14 +34,6 @@ file:
   accessSecret:                  # oss必填
   bucketName:                    # oss必填
 
-# 邮件设置
-mail:
-  host: 
-  port: 
-  user: 
-  password: 
-  skipTls: 
-
 # 一些系统配置
 wireguard:
   restartMode: DELAY
@@ -78,14 +70,25 @@ services:
 账户: admin
 密码: admin123
 ```
+## 配置示例
+```text
+  1. 邮箱配置如下：
+     code: EMAIL_SMTP
+     配置项：
+        1. host: "xxxx.xxx"
+        2. port: "123"
+        3. user: "haha"
+        4. password: "haha123"
+        5. skipTls: "false"
+```
 
-## 示例
-![img.png](img.png)
-![img_1.png](img_1.png)
-![img_7.png](img_7.png)
-![img_8.png](img_8.png)
-![img_2.png](img_2.png)
-![img_3.png](img_3.png)
-![img_4.png](img_4.png)
-![img_5.png](img_5.png)
-![img_6.png](img_6.png)
+## 页面展示
+![img.png](document/img.png)
+![img_1.png](document/img_1.png)
+![img_7.png](document/img_7.png)
+![img_8.png](document/img_8.png)
+![img_2.png](document/img_2.png)
+![img_3.png](document/img_3.png)
+![img_4.png](document/img_4.png)
+![img_5.png](document/img_5.png)
+![img_6.png](document/img_6.png)

config/config.go

@@ -7,6 +7,5 @@ type config struct {
 	Database  *database  `yaml:"database"`
 	Cache     *cache     `yaml:"redis"`
 	File      *file      `yaml:"file"`
-	Mail      *mail      `yaml:"email"`
 	Wireguard *wireguard `yaml:"wireguard"`
 }

config/mail.go

@@ -1,9 +0,0 @@
-package config
-
-type mail struct {
-	Host     string `json:"host" yaml:"host"`
-	Port     int    `json:"port" yaml:"port"`
-	User     string `json:"user" yaml:"user"`
-	Password string `json:"password" yaml:"password"`
-	SkipTls  bool   `json:"skipTls" yaml:"skipTls"`
-}

http/api/client.go

@@ -243,7 +243,14 @@ func (ClientApi) Download(c *gin.Context) {
 			return
 		}
 
-		err = utils.Mail().SendMail(data.Email, fmt.Sprintf("客户端: %s", data.Name), "请查收附件", outPath)
+		// 获取邮箱配置
+		emailConf, err := service.Setting().GetByCode("EMAIL_SMTP")
+		if err != nil {
+			response.R(c).FailedWithError("获取邮箱配置失败，请先到设置页面的【其他】里面添加code为【EMAIL_SMTP】的具体配置")
+			return
+		}
+
+		err = utils.Mail(emailConf).SendMail(data.Email, fmt.Sprintf("客户端: %s", data.Name), "请查收附件", outPath)
 		if err != nil {
 			response.R(c).FailedWithError("发送邮件失败")
 			return

http/vo/setting.go

@@ -14,8 +14,11 @@ type Export struct {
 	Global  *Global  `json:"global" label:"全局配置" binding:"required"`
 	Server  *Server  `json:"server" label:"服务端配置" binding:"required"`
 	Clients []Client `json:"clients" label:"客户端" binding:"omitempty"`
+	Other   []Other  `json:"other" label:"其他" binding:"omitempty"`
 }
 
+// Global
+// @description: 全局配置
 type Global struct {
 	MTU                 int      `json:"MTU" label:"MTU" binding:"required"`
 	ConfigFilePath      string   `json:"configFilePath" label:"配置文件路径" binding:"required"`
@@ -26,6 +29,8 @@ type Global struct {
 	Table               string   `json:"table" label:"table" binding:"omitempty"`
 }
 
+// Server
+// @description: 服务端信息
 type Server struct {
 	IpScope        []string `json:"ipScope" label:"ipScope" binding:"min=1,dive,required"`
 	ListenPort     int      `json:"listenPort" label:"listenPort" binding:"required"`
@@ -35,6 +40,8 @@ type Server struct {
 	PostDownScript string   `json:"postDownScript" label:"postDownScript" binding:"omitempty"`
 }
 
+// Client
+// @description: 客户端信息
 type Client struct {
 	Name            string           `json:"name" label:"name" binding:"required"`
 	Email           string           `json:"email" label:"email" binding:"omitempty"`
@@ -52,3 +59,11 @@ type Client struct {
 	Enabled           *constant.Status `json:"enabled" label:"enabled" binding:"required"`
 	OfflineMonitoring *constant.Status `json:"offlineMonitoring" label:"offlineMonitoring" binding:"required"`
 }
+
+// Other
+// @description: 其他配置
+type Other struct {
+	Code     string `json:"code" label:"code" binding:"required"`
+	Data     string `json:"data" label:"data" binding:"required"`
+	Describe string `json:"describe" label:"describe" binding:"omitempty"`
+}

service/setting.go

@@ -90,6 +90,17 @@ func (s setting) GetAllSetting(blackList []string) (data []vo.SettingItem, err e
 	return
 }
 
+// GetByCode
+// @description: 获取指定code的配置
+// @receiver s
+// @param code
+// @return data
+// @return err
+func (s setting) GetByCode(code string) (data *model.Setting, err error) {
+	err = s.Model(&model.Setting{}).Where("code = ?", code).Take(&data).Error
+	return
+}
+
 // Export
 // @description: 导出
 // @receiver s
@@ -141,6 +152,13 @@ func (s setting) Export() (data vo.Export, err error) {
 		}
 	}
 
+	// 查询其他配置
+	var others []vo.Other
+	if err = s.Model(&model.Setting{}).Where("code not in ?", []string{"WG_SETTING", "WG_SERVER"}).Find(&others).Error; err != nil {
+		return
+	}
+
+	data.Other = others
 	cj, _ := json.Marshal(clients)
 	_ = json.Unmarshal(cj, &data.Clients)
 
@@ -208,5 +226,17 @@ func (s setting) Import(data *vo.Export, loginUser *vo.User) (err error) {
 		}
 	}
 
+	// 其他配置写入
+	for _, v := range data.Other {
+		if err = s.SetData(&model.Setting{
+			Code:     v.Code,
+			Data:     v.Data,
+			Describe: v.Describe,
+		}); err != nil {
+			slog.Errorf("其他配置[%s]导入失败: %v", v.Code, err)
+			continue
+		}
+	}
+
 	return nil
 }

utils/mail.go

@@ -2,28 +2,35 @@ package utils
 
 import (
 	"crypto/tls"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/jordan-wright/email"
+	"github.com/spf13/cast"
 	"mime"
 	"net/smtp"
 	"net/textproto"
 	"path/filepath"
-	"wireguard-ui/config"
+	"wireguard-ui/model"
 )
 
 type mail struct {
 	*email.Email
 	addr string
 	auth smtp.Auth
+	conf map[string]string
 }
 
-func Mail() *mail {
+func Mail(conf *model.Setting) *mail {
+	// 解析配置文件
+	var mailConf = make(map[string]string)
+	_ = json.Unmarshal([]byte(conf.Data), &mailConf)
 	var m mail
 	em := email.NewEmail()
 	m.Email = em
-	m.auth = smtp.PlainAuth("", config.Config.Mail.User, config.Config.Mail.Password, config.Config.Mail.Host)
-	m.addr = fmt.Sprintf("%s:%d", config.Config.Mail.Host, config.Config.Mail.Port)
+	m.auth = smtp.PlainAuth("", mailConf["user"], mailConf["password"], mailConf["host"])
+	m.addr = fmt.Sprintf("%s:%s", mailConf["host"], mailConf["port"])
+	m.conf = mailConf
 	return &m
 }
 
@@ -47,7 +54,7 @@ func (m *mail) VerifyConfig() (err error) {
 // @param attacheFilePath
 // @return err
 func (m *mail) SendMail(to, subject, content, attacheFilePath string) (err error) {
-	m.From = fmt.Sprintf("wg-dashboard <%s>", config.Config.Mail.User)
+	m.From = fmt.Sprintf("wg-dashboard <%s>", m.conf["user"])
 	m.To = []string{to}
 	m.Subject = subject
 	m.Text = []byte(content)
@@ -61,13 +68,13 @@ func (m *mail) SendMail(to, subject, content, attacheFilePath string) (err error
 		atch.Header = emHeader
 	}
 
-	if config.Config.Mail.SkipTls {
+	if cast.ToBool(m.conf["skipTls"]) {
 		return m.Send(m.addr, m.auth)
 	}
 
 	tlsConfig := &tls.Config{}
-	tlsConfig.InsecureSkipVerify = config.Config.Mail.SkipTls
-	tlsConfig.ServerName = config.Config.Mail.Host
+	tlsConfig.InsecureSkipVerify = cast.ToBool(m.conf["skipTls"])
+	tlsConfig.ServerName = m.conf["host"]
 
 	return m.SendWithTLS(m.addr, m.auth, tlsConfig)
 }

web/src/views/client/index.vue

@@ -85,14 +85,14 @@
                 {{ cip }}
               </n-button>
             </n-form-item>
-            <n-form-item label="可访问IP:">
-              <n-button v-if="row.allowedIps.length <= 0" dashed size="small">
-                -
-              </n-button>
-              <n-button v-else dashed mr-2 type="warning" v-for="aip in row.allowedIps" size="small">
-                {{ aip }}
-              </n-button>
-            </n-form-item>
+<!--            <n-form-item label="可访问IP:">-->
+<!--              <n-button v-if="row.allowedIps.length <= 0" dashed size="small">-->
+<!--                - -->
+<!--              </n-button>-->
+<!--              <n-button v-else dashed mr-2 type="warning" v-for="aip in row.allowedIps" size="small">-->
+<!--                {{ aip }}-->
+<!--              </n-button>-->
+<!--            </n-form-item>-->
             <n-form-item label="创建人:">
               <n-button color="#54150F" dashed size="small">
                 {{ row.createUser }}
@@ -106,7 +106,7 @@
                 禁用
               </n-button>
             </n-form-item>
-            <n-form-item label="离线监听:">
+            <n-form-item label="离线通知:">
               <n-button v-if="row.offlineMonitoring === 1" color="#067748" round :bordered="false" size="small">
                 启用
               </n-button>
@@ -114,12 +114,12 @@
                 禁用
               </n-button>
             </n-form-item>
-            <n-form-item class="timeItem" label="时间:">
-              <n-space vertical>
-                <span> 创建时间: {{ row.createdAt }}</span>
-                <span> 更新时间: {{ row.updatedAt }}</span>
-              </n-space>
-            </n-form-item>
+<!--            <n-form-item class="timeItem" label="时间:">-->
+<!--              <n-space vertical>-->
+<!--                <span> 创建时间: {{ row.createdAt }}</span>-->
+<!--                <span> 更新时间: {{ row.updatedAt }}</span>-->
+<!--              </n-space>-->
+<!--            </n-form-item>-->
           </n-form>
         </div>
       </n-card>
@@ -228,12 +228,18 @@
           <n-radio :value="0" :checked="editModalForm.enabled === 0" @change="editModalForm.enabled = 0">禁用</n-radio>
         </n-radio-group>
       </n-form-item>
-      <n-form-item label="离线监听" path="offlineMonitoring">
+      <n-form-item label="离线通知" path="offlineMonitoring">
         <n-radio-group :value="editModalForm.offlineMonitoring">
           <n-radio :value="1" :checked="editModalForm.offlineMonitoring === 1" @change="editModalForm.offlineMonitoring = 1">启用</n-radio>
           <n-radio :value="0" :checked="editModalForm.offlineMonitoring === 0" @change="editModalForm.offlineMonitoring = 0">禁用</n-radio>
         </n-radio-group>
       </n-form-item>
+      <n-form-item class="timeItem" label="时间:">
+        <n-space vertical>
+          <span> 创建时间: {{ editModalForm.createdAt }}</span>
+          <span> 更新时间: {{ editModalForm.updatedAt }}</span>
+        </n-space>
+      </n-form-item>
       <n-button type="info" style="margin-left: 40%" @click="updateClient()">确认</n-button>
     </n-form>
   </n-modal>
@@ -319,7 +325,7 @@
           <n-radio :value="0" :checked="addModalForm.enabled === 0" @change="addModalForm.enabled = 0">禁用</n-radio>
         </n-radio-group>
       </n-form-item>
-      <n-form-item label="离线监听" path="offlineMonitoring">
+      <n-form-item label="离线通知" path="offlineMonitoring">
         <n-radio-group :value="addModalForm.offlineMonitoring">
           <n-radio :value="1" :checked="addModalForm.offlineMonitoring === 1" @change="addModalForm.offlineMonitoring = 1">启用</n-radio>
           <n-radio :value="0" :checked="addModalForm.offlineMonitoring === 0" @change="addModalForm.offlineMonitoring = 0">禁用</n-radio>
@@ -440,7 +446,9 @@ const editModalForm = ref({
     presharedKey: ''
   },
   enabled: 1,
-  offlineMonitoring: 1
+  offlineMonitoring: 1,
+  createdAt: '',
+  updatedAt: ''
 })
 
 // 添加模态框的数据集
@@ -576,6 +584,8 @@ function openEditModal(row) {
   editModalForm.value.keys.presharedKey = row.keys.presharedKey
   editModalForm.value.enabled = row.enabled
   editModalForm.value.offlineMonitoring = row.offlineMonitoring
+  editModalForm.value.createdAt = row.createdAt
+  editModalForm.value.updatedAt = row.updatedAt
 }
 
 // 更改客户端信息

web/src/views/setting/index.vue

@@ -174,6 +174,9 @@
             <n-radio :value="false" :checked="editFormModel.data[index] === false" @change="editFormModel.data[index] = false">否</n-radio>
           </n-radio-group>
         </n-form-item>
+        <n-form-item label="配置描述">
+          <n-input v-model:value="editFormModel.describe" />
+        </n-form-item>
         <n-form-item>
           <n-button type="info" @click="updateSetting">确认</n-button>
         </n-form-item>