调整目录结构

internal/web/actions/default/settings/ip-library/delete.go

@@ -0,0 +1,26 @@
+package iplibrary
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	LibraryId int64
+}) {
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "删除IP库 %d", params.LibraryId)
+
+	_, err := this.RPC().IPLibraryRPC().DeleteIPLibrary(this.AdminContext(), &pb.DeleteIPLibraryRequest{IpLibraryId: params.LibraryId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/settings/ip-library/download.go

@@ -0,0 +1,50 @@
+package iplibrary
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DownloadAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DownloadAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *DownloadAction) RunGet(params struct {
+	LibraryId int64
+}) {
+	// 日志
+	defer this.CreateLog(oplogs.LevelInfo, "下载IP库 %d", params.LibraryId)
+
+	libraryResp, err := this.RPC().IPLibraryRPC().FindEnabledIPLibrary(this.AdminContext(), &pb.FindEnabledIPLibraryRequest{IpLibraryId: params.LibraryId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if libraryResp.IpLibrary == nil || libraryResp.IpLibrary.File == nil {
+		this.NotFound("ipLibrary", params.LibraryId)
+		return
+	}
+
+	file := libraryResp.IpLibrary.File
+	chunkIdsResp, err := this.RPC().FileChunkRPC().FindAllFileChunkIds(this.AdminContext(), &pb.FindAllFileChunkIdsRequest{FileId: file.Id})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+
+	this.AddHeader("Content-Disposition", "attachment; filename=\""+file.Filename+"\";")
+	for _, chunkId := range chunkIdsResp.FileChunkIds {
+		chunkResp, err := this.RPC().FileChunkRPC().DownloadFileChunk(this.AdminContext(), &pb.DownloadFileChunkRequest{FileChunkId: chunkId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if chunkResp.FileChunk != nil {
+			this.Write(chunkResp.FileChunk.Data)
+		}
+	}
+}

internal/web/actions/default/settings/ip-library/helper.go

@@ -0,0 +1,22 @@
+package iplibrary
+
+import (
+	"github.com/iwind/TeaGo/actions"
+	"net/http"
+)
+
+type Helper struct {
+}
+
+func NewHelper() *Helper {
+	return &Helper{}
+}
+
+func (this *Helper) BeforeAction(action *actions.ActionObject) {
+	if action.Request.Method != http.MethodGet {
+		return
+	}
+
+	action.Data["mainTab"] = "component"
+	action.Data["secondMenuItem"] = "ip-library"
+}

internal/web/actions/default/settings/ip-library/index.go

@@ -0,0 +1,56 @@
+package iplibrary
+
+import (
+	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.FirstMenu("index")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	Type string
+}) {
+	if len(params.Type) == 0 {
+		params.Type = serverconfigs.IPLibraryTypes[0].GetString("code")
+	}
+
+	this.Data["types"] = serverconfigs.IPLibraryTypes
+	this.Data["selectedType"] = params.Type
+
+	// 列表
+	listResp, err := this.RPC().IPLibraryRPC().FindAllEnabledIPLibrariesWithType(this.AdminContext(), &pb.FindAllEnabledIPLibrariesWithTypeRequest{Type: params.Type})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	libraryMaps := []maps.Map{}
+	for _, library := range listResp.IpLibraries {
+		var fileMap maps.Map = nil
+		if library.File != nil {
+			fileMap = maps.Map{
+				"id":       library.File.Id,
+				"filename": library.File.Filename,
+				"sizeMB":   fmt.Sprintf("%.2f", float64(library.File.Size)/1024/1024),
+			}
+		}
+
+		libraryMaps = append(libraryMaps, maps.Map{
+			"id":          library.Id,
+			"file":        fileMap,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", library.CreatedAt),
+		})
+	}
+	this.Data["libraries"] = libraryMaps
+
+	this.Show()
+}

internal/web/actions/default/settings/ip-library/init.go

@@ -0,0 +1,22 @@
+package iplibrary
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth()).
+			Helper(NewHelper()).
+			Helper(settingutils.NewHelper("ipLibrary")).
+			Prefix("/settings/ip-library").
+			Get("", new(IndexAction)).
+			GetPost("/uploadPopup", new(UploadPopupAction)).
+			Post("/delete", new(DeleteAction)).
+			Get("/download", new(DownloadAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/settings/ip-library/uploadPopup.go

@@ -0,0 +1,110 @@
+package iplibrary
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/actions"
+	"io"
+)
+
+type UploadPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UploadPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UploadPopupAction) RunGet(params struct{}) {
+	this.Data["types"] = serverconfigs.IPLibraryTypes
+
+	this.Show()
+}
+
+func (this *UploadPopupAction) RunPost(params struct {
+	Type string
+	File *actions.File
+
+	Must *actions.Must
+}) {
+	libraryType := serverconfigs.FindIPLibraryWithType(params.Type)
+	if libraryType == nil {
+		this.Fail("错误的IP类型")
+	}
+
+	if params.File == nil {
+		this.Fail("请选择要上传的文件")
+	}
+
+	if params.File.Size == 0 {
+		this.Fail("文件内容不能为空")
+	}
+
+	if params.File.Ext != libraryType.GetString("ext") {
+		this.Fail("IP库文件扩展名错误，应该为：" + libraryType.GetString("ext"))
+	}
+
+	reader, err := params.File.OriginFile.Open()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	defer func() {
+		_ = reader.Close()
+	}()
+
+	// 创建文件
+	fileResp, err := this.RPC().FileRPC().CreateFile(this.AdminContext(), &pb.CreateFileRequest{
+		Filename: params.File.Filename,
+		Size:     params.File.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	fileId := fileResp.FileId
+
+	// 上传内容
+	buf := make([]byte, 512*1024)
+	for {
+		n, err := reader.Read(buf)
+		if n > 0 {
+			_, err = this.RPC().FileChunkRPC().CreateFileChunk(this.AdminContext(), &pb.CreateFileChunkRequest{
+				FileId: fileId,
+				Data:   buf[:n],
+			})
+			if err != nil {
+				this.Fail("上传失败：" + err.Error())
+			}
+		}
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			this.Fail("上传失败：" + err.Error())
+		}
+	}
+
+	// 置为已完成
+	_, err = this.RPC().FileRPC().UpdateFileFinished(this.AdminContext(), &pb.UpdateFileFinishedRequest{FileId: fileId})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+
+	// 保存
+	createResp, err := this.RPC().IPLibraryRPC().CreateIPLibrary(this.AdminContext(), &pb.CreateIPLibraryRequest{
+		Type:   params.Type,
+		FileId: fileId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "上传IP库 %d", createResp.IpLibraryId)
+
+	this.Success()
+}

internal/web/actions/default/settings/settingutils/utils.go

@@ -31,10 +31,10 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool)
 	tabbar.Add("数据库", "", "/settings/database", "", this.tab == "database")
 	tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes")
 	tabbar.Add("日志数据库", "", "/db", "", this.tab == "dbNodes")
+	tabbar.Add("IP库", "", "/settings/ip-library", "", this.tab == "ipLibrary")
 	tabbar.Add("备份", "", "/settings/backup", "", this.tab == "backup")
 	tabbar.Add("个人资料", "", "/settings/profile", "", this.tab == "profile")
 	tabbar.Add("登录设置", "", "/settings/login", "", this.tab == "login")
-	tabbar.Add("检查新版本", "", "/settings/upgrade", "", this.tab == "upgrade")
 	actionutils.SetTabbar(actionPtr, tabbar)
 
 	return