From 808612cc1edede92d39fae3b7150f94f87d5dd50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn>
Date: Sun, 4 Jan 2026 00:16:49 +0800
Subject: [PATCH] =?UTF-8?q?```=20feat(config):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=AB=AF=E5=8F=A3=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加GetPort方法用于获取服务器当前IP和端口信息，
新增Name和Owner字段到ServerList模型中

refactor(login): 优化调试参数处理

将命令行参数解析改为使用parser.GetOpt获取debug选项，
移除未使用的fmt和qqwry导入包

refactor(main): 清理示例代码

移除main.go中的
---
 login/internal/cmd/cmd.go                  |  4 +--
 login/main.go                              | 29 ++++++----------------
 modules/base/controller/admin/base_open.go | 14 +++++++++++
 modules/base/service/base_sys_log.go       |  1 +
 modules/config/model/server_list.go        |  8 ++++--
 modules/config/service/server.go           |  7 ++++++
 6 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/login/internal/cmd/cmd.go b/login/internal/cmd/cmd.go
index 5d1421615..245ff07f4 100644
--- a/login/internal/cmd/cmd.go
+++ b/login/internal/cmd/cmd.go
@@ -21,8 +21,8 @@ var (
 		Brief: "start http server",
 		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
 			// g.Dump(g.DB("test").GetConfig())
-			r := parser.GetArgAll()
-			if len(r) > 1 {
+			r := parser.GetOpt("debug", false)
+			if r.Bool() {
 				g.DB().SetDebug(true)
 			}
 			if cool.IsRedisMode {
diff --git a/login/main.go b/login/main.go
index 6ecc5b4c5..0244c9e48 100644
--- a/login/main.go
+++ b/login/main.go
@@ -1,10 +1,7 @@
 package main
 
 import (
-	"fmt"
-
 	_ "github.com/gogf/gf/contrib/nosql/redis/v2"
-	"github.com/xiaoqidun/qqwry"
 	"golang.org/x/crypto/bcrypt"
 
 	"blazing/common/data/xmlres"
@@ -31,26 +28,14 @@ func init() {
 }
 
 func main() {
-	// 示例调用
-	// 要查询的 IP（可替换为任意 IPv4/IPv6）
-	targetIP := "58.252.115.112"
-	// 输出格式（支持 plain/xml/json/jsonp/php/csv/serialized，默认 json）
-	outputFormat := "json"
 
-	// 执行查询
-	result, err := qqwry.LookupIP(targetIP, outputFormat)
-	if err != nil {
-		fmt.Printf("查询出错: %v\n", err)
-		return
-	}
-
-	// 打印结果
-	fmt.Println("IP 定位结果:")
-	fmt.Printf("IP 地址: %s\n", result.IP)
-	fmt.Printf("IP 版本: %d\n", result.IPVersion)
-	fmt.Printf("国家: %s (%s)\n", result.CountryName, result.CountryCode2)
-	fmt.Printf("服务商: %s\n", result.ISP)
-	fmt.Printf("响应状态: %s (%s)\n", result.ResponseMessage, result.ResponseCode)
+	// // 打印结果
+	// fmt.Println("IP 定位结果:")
+	// fmt.Printf("IP 地址: %s\n", result.IP)
+	// fmt.Printf("IP 版本: %d\n", result.IPVersion)
+	// fmt.Printf("国家: %s (%s)\n", result.CountryName, result.CountryCode2)
+	// fmt.Printf("服务商: %s\n", result.ISP)
+	// fmt.Printf("响应状态: %s (%s)\n", result.ResponseMessage, result.ResponseCode)
 	// ip := "103.236.78.60"
 	// sshPort := "50799"
 	// user := "root"
diff --git a/modules/base/controller/admin/base_open.go b/modules/base/controller/admin/base_open.go
index 5ee040a4c..f011660ba 100644
--- a/modules/base/controller/admin/base_open.go
+++ b/modules/base/controller/admin/base_open.go
@@ -7,6 +7,7 @@ import (
 
 	v1 "blazing/modules/base/api/v1"
 	"blazing/modules/base/service"
+	config "blazing/modules/config/service"
 
 	"github.com/gogf/gf/v2/frame/g"
 )
@@ -80,3 +81,16 @@ func (c *BaseOpen) RefreshToken(ctx context.Context, req *RefreshTokenReq) (res
 	res = cool.Ok(data)
 	return
 }
+
+// 获取服务器当前ip和端口
+type GetPortReq struct {
+	g.Meta `path:"/getport" method:"GET"`
+}
+
+func (c *BaseOpen) GetPort(ctx context.Context, req *GetPortReq) (res *cool.BaseRes, err error) {
+	res = &cool.BaseRes{}
+	res.Data = config.NewServerService().GetPort()
+
+	return
+
+}
diff --git a/modules/base/service/base_sys_log.go b/modules/base/service/base_sys_log.go
index 5115587a1..bfc2b61e6 100644
--- a/modules/base/service/base_sys_log.go
+++ b/modules/base/service/base_sys_log.go
@@ -46,6 +46,7 @@ func (s *BaseSysLogService) Record(ctx g.Ctx) {
 	baseSysLog.UserID = admin.UserId
 	baseSysLog.Action = r.Method + ":" + r.URL.Path
 	baseSysLog.IP = r.GetClientIp()
+
 	// 从内存或缓存查询IP
 	location, err := qqwry.QueryIP(baseSysLog.IP)
 	if err != nil {
diff --git a/modules/config/model/server_list.go b/modules/config/model/server_list.go
index 14941c205..075120172 100644
--- a/modules/config/model/server_list.go
+++ b/modules/config/model/server_list.go
@@ -19,8 +19,12 @@ type ServerList struct {
 	//服务器异色概率设定ServerList
 	ShinyRate uint8 `gorm:"default:0;comment:'异色概率'" json:"shiny_rate"`
 	//服务器天气设定ServerList
-	WeatherRate uint8  `gorm:"default:0;comment:'天气概率'" json:"weather_rate"`
-	Desc        string `gorm:"comment:'服务器描述'" json:"desc"`
+	WeatherRate uint8 `gorm:"default:0;comment:'天气概率'" json:"weather_rate"`
+	//服务器名称Desc
+	Name string `gorm:"comment:'服务器名称'" json:"name"`
+	//服务器属主Desc
+	Owner uint32 `gorm:"comment:'服务器属主'" json:"owner"`
+	Desc  string `gorm:"comment:'服务器描述'" json:"desc"`
 }
 
 // TableName ServerList's table name
diff --git a/modules/config/service/server.go b/modules/config/service/server.go
index 6c802d616..7217d21b0 100644
--- a/modules/config/service/server.go
+++ b/modules/config/service/server.go
@@ -21,6 +21,13 @@ func NewServerService() *ServerService {
 		},
 	}
 }
+func (s *ServerService) GetPort() []model.ServerList {
+	var item []model.ServerList
+	cool.DBM(s.Model).Fields("ip", "port").Scan(&item)
+
+	return item
+
+}
 
 // RemoteExecuteScript 远程执行脚本并实时显示输出
 // ip: 服务器IP