[系统设置]增加界面设置，可以定制系统名称等

internal/uimanager/ui_config.go

@@ -0,0 +1,101 @@
+package uimanager
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/logs"
+	"reflect"
+	"sync"
+)
+
+var sharedUIConfig *UIConfig = nil
+var locker sync.Mutex
+
+const (
+	UISettingName = "adminUIConfig"
+)
+
+type UIConfig struct {
+	ProductName        string `json:"productName"`        // 产品名
+	AdminSystemName    string `json:"adminSystemName"`    // 管理员系统名称
+	ShowOpenSourceInfo bool   `json:"showOpenSourceInfo"` // 是否显示开源信息
+	ShowVersion        bool   `json:"showVersion"`        // 是否显示版本号
+	Version            string `json:"version"`            // 显示的版本号
+}
+
+func LoadUIConfig() (*UIConfig, error) {
+	locker.Lock()
+	defer locker.Unlock()
+
+	config, err := loadUIConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	v := reflect.Indirect(reflect.ValueOf(config)).Interface().(UIConfig)
+	return &v, nil
+}
+
+func UpdateUIConfig(uiConfig *UIConfig) error {
+	locker.Lock()
+	defer locker.Unlock()
+
+	var rpcClient, err = rpc.SharedRPC()
+	if err != nil {
+		return err
+	}
+	valueJSON, err := json.Marshal(uiConfig)
+	if err != nil {
+		return err
+	}
+	_, err = rpcClient.SysSettingRPC().UpdateSysSetting(rpcClient.Context(0), &pb.UpdateSysSettingRequest{
+		Code:      UISettingName,
+		ValueJSON: valueJSON,
+	})
+	if err != nil {
+		return err
+	}
+	sharedUIConfig = uiConfig
+
+	return nil
+}
+
+func loadUIConfig() (*UIConfig, error) {
+	if sharedUIConfig != nil {
+		return sharedUIConfig, nil
+	}
+	var rpcClient, err = rpc.SharedRPC()
+	if err != nil {
+		return nil, err
+	}
+	resp, err := rpcClient.SysSettingRPC().ReadSysSetting(rpcClient.Context(0), &pb.ReadSysSettingRequest{
+		Code: UISettingName,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(resp.ValueJSON) == 0 {
+		sharedUIConfig = defaultUIConfig()
+		return sharedUIConfig, nil
+	}
+
+	config := &UIConfig{}
+	err = json.Unmarshal(resp.ValueJSON, config)
+	if err != nil {
+		logs.Println("[UI_MANAGER]" + err.Error())
+		sharedUIConfig = defaultUIConfig()
+		return sharedUIConfig, nil
+	}
+	sharedUIConfig = config
+	return sharedUIConfig, nil
+}
+
+func defaultUIConfig() *UIConfig {
+	return &UIConfig{
+		ProductName:        "GoEdge",
+		AdminSystemName:    "GoEdge管理员系统",
+		ShowOpenSourceInfo: true,
+		ShowVersion:        true,
+	}
+}

internal/uimanager/ui_config_test.go

@@ -0,0 +1,29 @@
+package uimanager
+
+import (
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"testing"
+	"time"
+)
+
+func TestLoadSecurityConfig(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		before := time.Now()
+		config, err := LoadUIConfig()
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+		t.Logf("%p", config)
+	}
+}
+
+func TestLoadUIConfig2(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		config, err := LoadUIConfig()
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(config)
+	}
+}

internal/web/actions/default/index/index.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
+	"github.com/TeaOSLab/EdgeAdmin/internal/uimanager"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
@@ -48,6 +49,13 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["token"] = stringutil.Md5(TokenSalt+timestamp) + timestamp
 	this.Data["from"] = params.From
 
+	config, err := uimanager.LoadUIConfig()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["systemName"] = config.AdminSystemName
+
 	this.Show()
 }
 

internal/web/actions/default/settings/index.go

@@ -13,5 +13,5 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct{}) {
-	this.RedirectURL("/settings/ui")
+	this.RedirectURL("/settings/server")
 }

internal/web/actions/default/settings/server/index.go

@@ -0,0 +1,27 @@
+package server
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	this.Data["serverIsChanged"] = serverConfigIsChanged
+
+	serverConfig, err := loadServerConfig()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["serverConfig"] = serverConfig
+
+	this.Show()
+}

internal/web/actions/default/settings/server/init.go

@@ -0,0 +1,20 @@
+package server
+
+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(settingutils.NewHelper("server")).
+			Prefix("/settings/server").
+			Get("", new(IndexAction)).
+			GetPost("/updateHTTPPopup", new(UpdateHTTPPopupAction)).
+			GetPost("/updateHTTPSPopup", new(UpdateHTTPSPopupAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/settings/server/updateHTTPPopup.go

@@ -1,4 +1,4 @@
-package ui
+package server
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"

internal/web/actions/default/settings/server/updateHTTPSPopup.go

@@ -1,4 +1,4 @@
-package ui
+package server
 
 import (
 	"encoding/json"

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

@@ -1,4 +1,4 @@
-package ui
+package server
 
 import (
 	"github.com/iwind/TeaGo"

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

@@ -25,7 +25,8 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool)
 
 	// 标签栏
 	tabbar := actionutils.NewTabbar()
-	tabbar.Add("管理界面", "", "/settings", "", this.tab == "ui")
+	tabbar.Add("Web服务", "", "/settings/server", "", this.tab == "server")
+	tabbar.Add("界面设置", "", "/settings/ui", "", this.tab == "ui")
 	tabbar.Add("安全设置", "", "/settings/security", "", this.tab == "security")
 	tabbar.Add("数据库", "", "/settings/database", "", this.tab == "database")
 	tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes")

internal/web/actions/default/settings/ui/index.go

@@ -1,7 +1,9 @@
-package ui
+package server
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/uimanager"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/actions"
 )
 
 type IndexAction struct {
@@ -13,15 +15,47 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct{}) {
-	this.Data["serverIsChanged"] = serverConfigIsChanged
+	config, err := uimanager.LoadUIConfig()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["config"] = config
 
-	serverConfig, err := loadServerConfig()
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ProductName        string
+	AdminSystemName    string
+	ShowOpenSourceInfo bool
+	ShowVersion        bool
+	Version            string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("productName", params.ProductName).
+		Require("请输入产品名称").
+		Field("adminSystemName", params.AdminSystemName).
+		Require("请输入管理员系统名称")
+
+	config, err := uimanager.LoadUIConfig()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	config.ProductName = params.ProductName
+	config.AdminSystemName = params.AdminSystemName
+	config.ShowOpenSourceInfo = params.ShowOpenSourceInfo
+	config.ShowVersion = params.ShowVersion
+	config.Version = params.Version
+	err = uimanager.UpdateUIConfig(config)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	this.Data["serverConfig"] = serverConfig
-
-	this.Show()
+	this.Success()
 }

internal/web/actions/default/settings/ui/init.go

@@ -1,4 +1,4 @@
-package ui
+package server
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils"
@@ -12,9 +12,7 @@ func init() {
 			Helper(helpers.NewUserMustAuth()).
 			Helper(settingutils.NewHelper("ui")).
 			Prefix("/settings/ui").
-			Get("", new(IndexAction)).
-			GetPost("/updateHTTPPopup", new(UpdateHTTPPopupAction)).
-			GetPost("/updateHTTPSPopup", new(UpdateHTTPSPopupAction)).
+			GetPost("", new(IndexAction)).
 			EndAll()
 	})
 }

internal/web/helpers/user_must_auth.go

@@ -5,6 +5,7 @@ import (
 	nodes "github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/securitymanager"
 	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
+	"github.com/TeaOSLab/EdgeAdmin/internal/uimanager"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
@@ -83,13 +84,20 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam
 		return true
 	}
 
+	config, err := uimanager.LoadUIConfig()
+	if err != nil {
+		action.WriteString(err.Error())
+		return false
+	}
+
 	// 初始化内置方法
 	action.ViewFunc("teaTitle", func() string {
 		return action.Data["teaTitle"].(string)
 	})
 
-	action.Data["teaTitle"] = teaconst.ProductNameZH
-	action.Data["teaName"] = teaconst.ProductNameZH
+	action.Data["teaShowVersion"] = config.ShowVersion
+	action.Data["teaTitle"] = config.AdminSystemName
+	action.Data["teaName"] = config.ProductName
 
 	resp, err := rpc.AdminRPC().FindAdminFullname(rpc.Context(0), &pb.FindAdminFullnameRequest{AdminId: int64(this.AdminId)})
 	if err != nil {
@@ -105,7 +113,12 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam
 	action.Data["teaModules"] = this.modules()
 	action.Data["teaSubMenus"] = []map[string]interface{}{}
 	action.Data["teaTabbar"] = []map[string]interface{}{}
-	action.Data["teaVersion"] = teaconst.Version
+	if len(config.Version) == 0 {
+		action.Data["teaVersion"] = teaconst.Version
+	} else {
+		action.Data["teaVersion"] = config.Version
+	}
+	action.Data["teaShowOpenSourceInfo"] = config.ShowOpenSourceInfo
 	action.Data["teaIsSuper"] = false
 	action.Data["teaDemoEnabled"] = teaconst.IsDemo
 	if !action.Data.Has("teaSubMenu") {

internal/web/import.go

@@ -77,6 +77,7 @@ import (
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/login"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/profile"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/security"
+	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/server"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/ui"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/upgrade"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/setup"