feat(server): 添加服务器地理位置信息字段

为服务器模型添加经度、纬度及中心点坐标字段，并在相关逻辑中处理这些字段
同时修复服务器用户列表缓存功能

apis/public/subscribe.api

@@ -47,6 +47,10 @@ type (
 		Tags      []string `json:"tags"`
 		Country   string   `json:"country"`
 		City      string   `json:"city"`
+		Longitude    string    `json:"longitude"`
+        Latitude     string    `json:"latitude"`
+        LatitudeCenter     string    `json:"latitude_center"`
+        LongitudeCenter    string    `json:"longitude_center"`
 		CreatedAt int64    `json:"created_at"`
 	}
 )

initialize/migrate/database/02119_node.up.sql

@@ -0,0 +1,67 @@
+-- Add longitude if not exists
+SET @col_exists := (
+    SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'servers'
+      AND COLUMN_NAME = 'longitude'
+);
+SET @sql := IF(
+    @col_exists = 0,
+    'ALTER TABLE `servers` ADD COLUMN `longitude` VARCHAR(255) DEFAULT '''' COMMENT ''longitude''',
+    'SELECT 1'
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- Add latitude if not exists
+SET @col_exists := (
+    SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'servers'
+      AND COLUMN_NAME = 'latitude'
+);
+SET @sql := IF(
+    @col_exists = 0,
+    'ALTER TABLE `servers` ADD COLUMN `latitude` VARCHAR(255) DEFAULT '''' COMMENT ''latitude''',
+    'SELECT 1'
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- Add longitude_center if not exists
+SET @col_exists := (
+    SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'servers'
+      AND COLUMN_NAME = 'longitude_center'
+);
+SET @sql := IF(
+    @col_exists = 0,
+    'ALTER TABLE `servers` ADD COLUMN `longitude_center` VARCHAR(255) DEFAULT '''' COMMENT ''longitude center''',
+    'SELECT 1'
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- Add latitude_center if not exists
+SET @col_exists := (
+    SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'servers'
+      AND COLUMN_NAME = 'latitude_center'
+);
+SET @sql := IF(
+    @col_exists = 0,
+    'ALTER TABLE `servers` ADD COLUMN `latitude_center` VARCHAR(255) DEFAULT '''' COMMENT ''latitude center''',
+    'SELECT 1'
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;

internal/logic/admin/server/createServerLogic.go

@@ -99,6 +99,10 @@ func (l *CreateServerLogic) CreateServer(req *types.CreateServerRequest) error {
 		} else {
 			data.City = result.City
 			data.Country = result.Country
+			data.Latitude = result.Latitude
+			data.Longitude = result.Longitude
+			data.LatitudeCenter = result.LatitudeCenter
+			data.LongitudeCenter = result.LongitudeCenter
 		}
 	}
 	err = l.svcCtx.NodeModel.InsertServer(l.ctx, &data)

internal/logic/admin/server/updateServerLogic.go

@@ -47,6 +47,10 @@ func (l *UpdateServerLogic) UpdateServer(req *types.UpdateServerRequest) error {
 		} else {
 			data.City = result.City
 			data.Country = result.Country
+			data.Latitude = result.Latitude
+			data.Longitude = result.Longitude
+			data.LatitudeCenter = result.LatitudeCenter
+			data.LongitudeCenter = result.LongitudeCenter
 		}
 		// update address
 		data.Address = req.Address

internal/logic/public/subscribe/queryUserSubscribeNodeListLogic.go

@@ -147,6 +147,10 @@ func (l *QueryUserSubscribeNodeListLogic) getServers(userSub *user.Subscribe) (u
 				Tags:            strings.Split(n.Tags, ","),
 				Country:         server.Country,
 				City:            server.City,
+				Latitude:        server.Latitude,
+				Longitude:       server.Longitude,
+				LongitudeCenter: server.LongitudeCenter,
+				LatitudeCenter:  server.LatitudeCenter,
 				CreatedAt:       n.CreatedAt.Unix(),
 			}
 			userSubscribeNodes = append(userSubscribeNodes, userSubscribeNode)

internal/logic/public/user/unbindDeviceLogic.go

@@ -69,6 +69,15 @@ func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error {
 		if err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete device online record err: %v", err)
 		}
+		var count int64
+		err = tx.Model(user.AuthMethods{}).Where("user_id = ?", deleteDevice.UserId).Count(&count).Error
+		if err != nil {
+			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count user auth methods err: %v", err)
+		}
+
+		if count < 1 {
+			_ = tx.Where("id = ?", deleteDevice.UserId).Delete(&user.User{}).Error
+		}
 
 		//remove device cache
 		deviceCacheKey := fmt.Sprintf("%v:%v", config.DeviceCacheKeyKey, deleteDevice.Identifier)

internal/logic/server/getServerUserListLogic.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"encoding/json"
+	"fmt"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -32,24 +33,23 @@ func NewGetServerUserListLogic(ctx *gin.Context, svcCtx *svc.ServiceContext) *Ge
 }
 
 func (l *GetServerUserListLogic) GetServerUserList(req *types.GetServerUserListRequest) (resp *types.GetServerUserListResponse, err error) {
-	//TODO Cache bug, temporarily disable the use of cache
+	cacheKey := fmt.Sprintf("%s%d", node.ServerUserListCacheKey, req.ServerId)
-	//cacheKey := fmt.Sprintf("%s%d", node.ServerUserListCacheKey, req.ServerId)
+	cache, err := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
-	//cache, err := l.svcCtx.Redis.Get(l.ctx, cacheKey).Result()
+	if cache != "" {
-	//if cache != "" {
+		etag := tool.GenerateETag([]byte(cache))
-	//	etag := tool.GenerateETag([]byte(cache))
+		resp = &types.GetServerUserListResponse{}
-	//	resp = &types.GetServerUserListResponse{}
+		//  Check If-None-Match header
-	//	//  Check If-None-Match header
+		if match := l.ctx.GetHeader("If-None-Match"); match == etag {
-	//	if match := l.ctx.GetHeader("If-None-Match"); match == etag {
+			return nil, xerr.StatusNotModified
-	//		return nil, xerr.StatusNotModified
+		}
-	//	}
+		l.ctx.Header("ETag", etag)
-	//	l.ctx.Header("ETag", etag)
+		err = json.Unmarshal([]byte(cache), resp)
-	//	err = json.Unmarshal([]byte(cache), resp)
+		if err != nil {
-	//	if err != nil {
+			l.Errorw("[ServerUserListCacheKey] json unmarshal error", logger.Field("error", err.Error()))
-	//		l.Errorw("[ServerUserListCacheKey] json unmarshal error", logger.Field("error", err.Error()))
+			return nil, err
-	//		return nil, err
+		}
-	//	}
+		return resp, nil
-	//	return resp, nil
+	}
-	//}
 	server, err := l.svcCtx.NodeModel.FindOneServer(l.ctx, req.ServerId)
 	if err != nil {
 		return nil, err
@@ -121,11 +121,10 @@ func (l *GetServerUserListLogic) GetServerUserList(req *types.GetServerUserListR
 	val, _ := json.Marshal(resp)
 	etag := tool.GenerateETag(val)
 	l.ctx.Header("ETag", etag)
-	//TODO Cache bug, temporarily disable the use of cache
+	err = l.svcCtx.Redis.Set(l.ctx, cacheKey, string(val), -1).Err()
-	//err = l.svcCtx.Redis.Set(l.ctx, cacheKey, string(val), -1).Err()
+	if err != nil {
-	//if err != nil {
+		l.Errorw("[ServerUserListCacheKey] redis set error", logger.Field("error", err.Error()))
-	//	l.Errorw("[ServerUserListCacheKey] redis set error", logger.Field("error", err.Error()))
+	}
-	//}
 	//  Check If-None-Match header
 	if match := l.ctx.GetHeader("If-None-Match"); match == etag {
 		return nil, xerr.StatusNotModified

internal/model/node/server.go

@@ -19,6 +19,10 @@ type Server struct {
 	Sort            int        `gorm:"type:int;not null;default:0;comment:Sort"`
 	Protocols       string     `gorm:"type:text;default:null;comment:Protocol"`
 	LastReportedAt  *time.Time `gorm:"comment:Last Reported Time"`
+	Longitude       string     `gorm:"type:varchar(50);not null;default:'0.0';comment:Longitude"`
+	Latitude        string     `gorm:"type:varchar(50);not null;default:'0.0';comment:Latitude"`
+	LongitudeCenter string     `gorm:"type:varchar(50);not null;default:'0.0';comment:Center Longitude"`
+	LatitudeCenter  string     `gorm:"type:varchar(50);not null;default:'0.0';comment:Center Latitude"`
 	CreatedAt       time.Time  `gorm:"<-:create;comment:Creation Time"`
 	UpdatedAt       time.Time  `gorm:"comment:Update Time"`
 }

internal/types/types.go

@@ -2674,6 +2674,10 @@ type UserSubscribeNodeInfo struct {
 	Tags            []string `json:"tags"`
 	Country         string   `json:"country"`
 	City            string   `json:"city"`
+	Longitude       string   `json:"longitude"`
+	Latitude        string   `json:"latitude"`
+	LatitudeCenter  string   `json:"latitude_center"`
+	LongitudeCenter string   `json:"longitude_center"`
 	CreatedAt       int64    `json:"created_at"`
 }
 

pkg/ip/ip.go

@@ -74,6 +74,12 @@ func GetRegionByIp(ip string) (*GeoLocationResponse, error) {
 			if response.Country == "" {
 				continue
 			}
+			response.LatitudeCenter, response.LongitudeCenter, _ = GetCapitalCoordinates(fmt.Sprintf("%s,%s", response.Country, response.City))
+			if response.LatitudeCenter == "" || response.LongitudeCenter == "" {
+				response.LatitudeCenter = response.Latitude
+				response.LongitudeCenter = response.Longitude
+
+			}
 			return response, nil
 		}
 	}
@@ -187,5 +193,7 @@ type GeoLocationResponse struct {
 	City            string `json:"city"`
 	Latitude        string `json:"latitude"`
 	Longitude       string `json:"longitude"`
+	LatitudeCenter  string `json:"latitude_center"`
+	LongitudeCenter string `json:"longitude_center"`
 	Loc             string `json:"loc"`
 }