dd

Author: ssongliu

.gitignore

@@ -40,23 +40,23 @@ core/cmd/server/web/index.html
 frontend/auto-imports.d.ts
 frontend/components.d.ts
 frontend/src/xpack
-frontend/src/xpack-ee
+frontend/src/enterprise
 agent/xpack
-agent/xpack-ee
+agent/enterprise
 agent/router/entry_xpack.go
-agent/router/entry_xpackee.go
+agent/router/entry_enterprise.go
 agent/server/init_xpack.go
-agent/server/init_xpackee.go
+agent/server/init_enterprise.go
 agent/utils/xpack/xpack.go
-agent/utils/xpack/xpackee.go
+agent/utils/xpack/enterprise.go
 core/xpack
-core/xpack-ee
+core/enterprise
 core/router/entry_xpack.go
-core/router/entry_xpackee.go
+core/router/entry_enterprise.go
 core/server/init_xpack.go
-core/server/init_xpackee.go
+core/server/init_enterprise.go
 core/utils/xpack/xpack.go
-core/utils/xpack/xpackee.go
+core/utils/xpack/enterprise.go
 
 .history/
 dist/

agent/router/entry.go

@@ -1,4 +1,4 @@
-//go:build !xpack && !xpackee
+//go:build !xpack && !enterprise
 
 package router
 

agent/server/init.go

@@ -1,4 +1,4 @@
-//go:build !xpack && !xpackee
+//go:build !xpack && !enterprise
 
 package server
 

agent/utils/xpack/community.go

@@ -1,4 +1,4 @@
-//go:build !xpack && !xpackee
+//go:build !xpack && !enterprise
 
 package xpack
 

core/app/api/v2/auth.go

@@ -238,16 +238,16 @@ func (b *BaseApi) GetLoginSetting(c *gin.Context) {
 	ip := common.GetRealClientIP(c)
 	needCaptcha := global.IPTracker.NeedCaptcha(ip)
 	res := &dto.LoginSetting{
-		IsDemo:      global.CONF.Base.IsDemo,
-		IsIntl:      global.CONF.Base.Edition == "intl",
-		IsFxplay:    global.CONF.Base.IsFxplay,
-		IsOffLine:   global.CONF.Base.IsOffLine,
-		IsXPackEE:   global.CONF.Base.IsXpackEE,
-		Language:    settingInfo.Language,
-		MenuTabs:    settingInfo.MenuTabs,
-		PanelName:   settingInfo.PanelName,
-		Theme:       settingInfo.Theme,
-		NeedCaptcha: needCaptcha,
+		IsDemo:       global.CONF.Base.IsDemo,
+		IsIntl:       global.CONF.Base.Edition == "intl",
+		IsFxplay:     global.CONF.Base.IsFxplay,
+		IsOffLine:    global.CONF.Base.IsOffLine,
+		IsEnterprise: global.CONF.Base.IsEnterprise,
+		Language:     settingInfo.Language,
+		MenuTabs:     settingInfo.MenuTabs,
+		PanelName:    settingInfo.PanelName,
+		Theme:        settingInfo.Theme,
+		NeedCaptcha:  needCaptcha,
 	}
 	res.PasskeySetting = xpack.AuthProvider.PasskeyStatus(c)
 	helper.SuccessWithData(c, res)

core/app/dto/setting.go

@@ -293,7 +293,7 @@ type LoginSetting struct {
 	IsIntl         bool   `json:"isIntl"`
 	IsOffLine      bool   `json:"isOffLine"`
 	IsFxplay       bool   `json:"isFxplay"`
-	IsXPackEE      bool   `json:"isXpackEE"`
+	IsEnterprise   bool   `json:"isEnterprise"`
 	Language       string `json:"language"`
 	MenuTabs       string `json:"menuTabs"`
 	PanelName      string `json:"panelName"`

core/cmd/server/conf/app.yaml

@@ -4,7 +4,7 @@ base:
   is_demo: false
   is_offline: false
   is_fxplay: false
-  is_xpackee: true
+  is_enterprise: false
   port: 9999
   username: admin
   password: admin123

core/global/config.go

@@ -15,7 +15,7 @@ type Base struct {
 	IsOffLine      bool   `mapstructure:"is_offline"`
 	IsFxplay       bool   `mapstructure:"is_fxplay"`
 	Edition        string `mapstructure:"edition"`
-	IsXpackEE      bool   `mapstructure:"is_xpackee"`
+	IsEnterprise   bool   `mapstructure:"is_enterprise"`
 	Version        string `mapstructure:"version"`
 	InstallDir     string `mapstructure:"install_dir"`
 	ChangeUserInfo string `mapstructure:"change_user_info"`

core/i18n/lang/en.yaml

@@ -73,7 +73,7 @@ ErrLicenseExist: "This license record already exists. You can directly go to the
 ErrXpackNotFound: "This section requires Pro Edition. Import a license in Panel Settings > License."
 ErrXpackExceptional: "This section requires Pro Edition. Sync the license status in Panel Settings > License."
 ErrXpackLost: "The license retry limit has been reached. Go to Panel Settings > License and run a manual sync."
-ErrXpackEELicenseRequired: "Enterprise Edition license is not imported. Import a license first."
+ErrEnterpriseLicenseRequired: "Enterprise Edition license is not imported. Import a license first."
 ErrDeviceLost: "Required files for license verification are missing, check and try again!"
 ErrDeviceErr: "Current environment does not match the license import environment. Edit the license and re-import."
 ErrXpackTimeout: "Request timeout, network connection might be unstable, try again later!"

core/i18n/lang/es-ES.yaml

@@ -73,7 +73,7 @@ ErrXpackNotFound: "Esta sección requiere la edición Pro. Importa una licencia
 ErrXpackExceptional: "Esta sección requiere la edición Pro. Sincroniza el estado de la licencia en Configuración del panel > Licencia."
 ErrXpackOutOfDate: "La licencia actual ha expirado, importe nuevamente la licencia en Panel > Ajustes > Licencia"
 ErrXpackLost: "La licencia alcanzó el límite de reintentos. Ve a Configuración del panel > Licencia y ejecuta una sincronización manual."
-ErrXpackEELicenseRequired: "La licencia de la edición Enterprise no se ha importado. Importa primero una licencia."
+ErrEnterpriseLicenseRequired: "La licencia de la edición Enterprise no se ha importado. Importa primero una licencia."
 ErrDeviceLost: "Faltan archivos necesarios para la verificación de licencia, verifique e intente de nuevo"
 ErrDeviceErr: "El entorno actual no coincide con el entorno de importación de la licencia. Edite la licencia e impórtela de nuevo"
 ErrXpackTimeout: "Tiempo de espera de la solicitud, puede que la conexión de red sea inestable, intente más tarde"