Skip to content

fix: refine enterprise license required flow #12634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssongliu merged 2 commits into from
Apr 29, 2026
Merged

fix: refine enterprise license required flow #12634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11dc581
fix: adjust access control menu (#12633)
ssongliu Apr 29, 2026
0202a09
fix: refine enterprise license required flow
ssongliu Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/cmd/server/conf/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ base:
is_demo: false
is_offline: false
is_fxplay: false
is_enterprise: false
is_enterprise: true
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot Apr 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Revert enterprise mode default in embedded server config

Setting base.is_enterprise to true in the embedded app.yaml makes fresh/server-default startups run in Enterprise mode by default, which forces the Enterprise license gate even when no Enterprise license is configured. The backend bootstrap path (core/init/viper/viper.go) unmarshals conf.AppYaml and uses this value for global.CONF, so this change alters runtime behavior rather than just test data.

Useful? React with 👍 / 👎.

port: 9999
username: admin
password: admin123
Expand Down
2 changes: 1 addition & 1 deletion core/init/migration/helper/menu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func LoadMenus() string {
item[i].Children = UpsertMenuByLabel(item[i].Children, dto.ShowMenu{
ID: "121",
Disabled: false,
Title: "xpack.user.userManage",
Title: "xpack.user.accessControl",
IsShow: true,
Label: "UserManagement",
Path: "/enterprise/users",
Expand Down
2 changes: 1 addition & 1 deletion core/init/migration/migrations/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ var AddUserManagementMenu = &gormigrate.Migration{
newItem := dto.ShowMenu{
ID: "121",
Disabled: false,
Title: "xpack.user.userManage",
Title: "xpack.user.accessControl",
IsShow: true,
Label: "UserManagement",
Path: "/enterprise/users",
Expand Down
7 changes: 1 addition & 6 deletions frontend/src/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,7 @@ class RequestHttp {
if (data.code == ResultEnum.ERR_ENTERPRISE) {
globalStore.isEnterpriseLicensed = false;
const routeName = router.currentRoute.value.name;
if (
globalStore.isLogin &&
routeName !== 'entrance' &&
routeName !== 'login' &&
routeName !== 'EnterpriseLicenseRequired'
) {
if (globalStore.isLogin && routeName !== 'EnterpriseLicenseRequired') {
router.push({ name: 'EnterpriseLicenseRequired' });
}
return Promise.reject(data);
Expand Down
Binary file added frontend/src/assets/images/1panel-login-enterprise.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2632,6 +2632,8 @@ const message = {
importHelper: 'Click or drag the license file here',
licenseRequiredTip:
'The license has not been imported yet. Copy the device ID, obtain the license, and import it before logging in.',
licenseRequiredShortTip:
'Please copy the device ID first to obtain a license. You can log in after importing the license.',
licenseRequiredUserTip:
'The Enterprise Edition license is not bound. Contact a super administrator to import the license.',
levelUpPro: 'Upgrade to Pro Edition',
Expand Down Expand Up @@ -3692,24 +3694,18 @@ const message = {
upage: 'AI Website Builder',
proAlert: 'Upgrade to Pro to use this feature',
user: {
accessControl: 'Permission Management',
user: 'User',
userInfo: 'User Info',
userManage: 'User Management',
superAdmin: 'Super Admin',
nodeAdmin: 'Node Admin',
bindNode: 'Bind Node',
username: 'Username',
password: 'Password',
nodeRole: 'Node Role',
tip: 'Tip',
timeout: 'Timeout',
description: 'Description',
role: 'Role',
roleManage: 'Role Management',
roleName: 'Name',
roleDescription: 'Description',
permission: 'Permissions',
selectAll: 'Select All',
nodeRoleDuplicate: 'Only one role can be assigned to each node',
permissionDuplicate: 'Only one role can be assigned to each node',
view: 'View',
manage: 'Manage',
dashboard_view: 'Dashboard View',
Expand Down
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/es-es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2692,6 +2692,8 @@ const message = {
importHelper: 'Haga clic o arrastre el archivo de licencia aquí',
licenseRequiredTip:
'La licencia aún no se ha importado. Copie el ID del dispositivo, obtenga la licencia e impórtela antes de iniciar sesión.',
licenseRequiredShortTip:
'Primero copie el ID del dispositivo para obtener una licencia. Podrá iniciar sesión después de importarla.',
licenseRequiredUserTip:
'La licencia Enterprise Edition no está vinculada. Contacte con un superadministrador para importar la licencia.',
levelUpPro: 'Actualizar a la edición Pro',
Expand Down Expand Up @@ -3734,24 +3736,18 @@ const message = {
upage: 'Constructor Web con IA',
proAlert: 'Actualiza a Pro para usar esta función',
user: {
accessControl: 'Gestión de permisos',
user: 'Usuario',
userInfo: 'Información de usuario',
userManage: 'Gestión de usuarios',
superAdmin: 'Superadministrador',
nodeAdmin: 'Administrador de nodo',
bindNode: 'Vincular nodo',
username: 'Nombre de usuario',
password: 'Contraseña',
nodeRole: 'Rol del nodo',
tip: 'Consejo',
timeout: 'Tiempo de espera',
description: 'Descripción',
role: 'Rol',
roleManage: 'Gestión de roles',
roleName: 'Nombre',
roleDescription: 'Descripción',
permission: 'Permisos',
selectAll: 'Seleccionar todo',
nodeRoleDuplicate: 'Solo se puede asignar un rol a cada nodo',
permissionDuplicate: 'Solo se puede asignar un rol a cada nodo',
view: 'Ver',
manage: 'Gestionar',
dashboard_view: 'Vista del panel',
Expand Down
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2648,6 +2648,8 @@ const message = {
importHelper: 'ここでライセンスファイルをクリックまたはドラッグしてください',
licenseRequiredTip:
'まだライセンスがインポートされていません。デバイス ID をコピーしてライセンスを取得し、インポートしてからログインしてください。',
licenseRequiredShortTip:
'まずデバイス ID をコピーしてライセンスを取得し、ライセンスをインポートするとログインできます。',
licenseRequiredUserTip:
'Enterprise Edition のライセンスがバインドされていません。スーパー管理者に連絡してライセンスをインポートしてください。',
technicalAdvice: '技術的な相談',
Expand Down Expand Up @@ -3720,24 +3722,18 @@ const message = {
upage: 'AIウェブサイトビルダー',
proAlert: 'この機能を使用するにはProにアップグレードしてください',
user: {
accessControl: '権限管理',
user: 'ユーザー',
userInfo: 'ユーザー情報',
userManage: 'ユーザー管理',
superAdmin: 'スーパー管理者',
nodeAdmin: 'ノード管理者',
bindNode: 'ノードをバインド',
username: 'ユーザー名',
password: 'パスワード',
nodeRole: 'ノードロール',
tip: 'ヒント',
timeout: 'タイムアウト',
description: '説明',
role: 'ロール',
roleManage: 'ロール管理',
roleName: '名前',
roleDescription: '説明',
permission: '権限',
selectAll: 'すべて選択',
nodeRoleDuplicate: '各ノードには1つのロールのみ割り当てられます',
permissionDuplicate: '各ノードには1つのロールのみ割り当てられます',
view: '表示',
manage: '管理',
dashboard_view: 'ダッシュボード表示',
Expand Down
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/ko.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2585,6 +2585,8 @@ const message = {
importHelper: '라이센스 파일을 여기에 클릭하거나 드래그하세요',
licenseRequiredTip:
'아직 라이선스를 가져오지 않았습니다. 장치 ID를 복사해 라이선스를 받은 뒤 가져와야 로그인할 수 있습니다.',
licenseRequiredShortTip:
'먼저 장치 ID를 복사해 라이선스를 받은 뒤, 라이선스를 가져오면 로그인할 수 있습니다.',
licenseRequiredUserTip:
'Enterprise Edition 라이선스가 바인딩되지 않았습니다. 슈퍼 관리자에게 라이선스 가져오기를 요청하세요.',
technicalAdvice: '기술 상담',
Expand Down Expand Up @@ -3637,24 +3639,18 @@ const message = {
upage: 'AI 웹사이트 빌더',
proAlert: '이 기능을 사용하려면 Pro로 업그레이드하세요',
user: {
accessControl: '권한 관리',
user: '사용자',
userInfo: '사용자 정보',
userManage: '사용자 관리',
superAdmin: '최고 관리자',
nodeAdmin: '노드 관리자',
bindNode: '노드 연결',
username: '사용자 이름',
password: '비밀번호',
nodeRole: '노드 역할',
tip: '팁',
timeout: '시간 초과',
description: '설명',
role: '역할',
roleManage: '역할 관리',
roleName: '이름',
roleDescription: '설명',
permission: '권한',
selectAll: '전체 선택',
nodeRoleDuplicate: '각 노드에는 하나의 역할만 지정할 수 있습니다',
permissionDuplicate: '각 노드에는 하나의 역할만 지정할 수 있습니다',
view: '보기',
manage: '관리',
dashboard_view: '대시보드 보기',
Expand Down
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/ms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2694,6 +2694,8 @@ const message = {
importHelper: 'Sila klik atau seret fail lesen ke sini',
licenseRequiredTip:
'Lesen belum diimport. Salin ID peranti, dapatkan lesen dan importkannya sebelum anda boleh log masuk.',
licenseRequiredShortTip:
'Sila salin ID peranti terlebih dahulu untuk mendapatkan lesen. Anda boleh log masuk selepas mengimport lesen.',
licenseRequiredUserTip:
'Lesen Enterprise Edition belum diikat. Hubungi pentadbir super untuk mengimport lesen.',
technicalAdvice: 'Konsultasi Teknikal',
Expand Down Expand Up @@ -3772,24 +3774,18 @@ const message = {
upage: 'Pembina Laman Web AI',
proAlert: 'Tingkatkan ke Pro untuk menggunakan ciri ini',
user: {
accessControl: 'Pengurusan Kebenaran',
user: 'Pengguna',
userInfo: 'Maklumat Pengguna',
userManage: 'Pengurusan Pengguna',
superAdmin: 'Pentadbir Super',
nodeAdmin: 'Pentadbir Nod',
bindNode: 'Ikat Nod',
username: 'Nama pengguna',
password: 'Kata laluan',
nodeRole: 'Peranan Nod',
tip: 'Petua',
timeout: 'Masa tamat',
description: 'Penerangan',
role: 'Peranan',
roleManage: 'Pengurusan Peranan',
roleName: 'Nama',
roleDescription: 'Penerangan',
permission: 'Kebenaran',
selectAll: 'Pilih Semua',
nodeRoleDuplicate: 'Setiap nod hanya boleh diberikan satu peranan',
permissionDuplicate: 'Setiap nod hanya boleh diberikan satu peranan',
view: 'Lihat',
manage: 'Urus',
dashboard_view: 'Paparan Papan Pemuka',
Expand Down
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/pt-br.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2817,6 +2817,8 @@ const message = {
importHelper: 'Clique ou arraste o arquivo de licença aqui',
licenseRequiredTip:
'A licença ainda não foi importada. Copie o ID do dispositivo, obtenha a licença e importe-a antes de fazer login.',
licenseRequiredShortTip:
'Copie primeiro o ID do dispositivo para obter a licença. Você poderá entrar depois de importá-la.',
licenseRequiredUserTip:
'A licença Enterprise Edition não está vinculada. Entre em contato com o superadministrador para importar a licença.',
technicalAdvice: 'Consultoria técnica',
Expand Down Expand Up @@ -3913,24 +3915,18 @@ const message = {
upage: 'Construtor de Sites com IA',
proAlert: 'Atualize para Pro para usar este recurso',
user: {
accessControl: 'Gerenciamento de permissões',
user: 'Usuário',
userInfo: 'Informações do Usuário',
userManage: 'Gerenciamento de Usuários',
superAdmin: 'Super Administrador',
nodeAdmin: 'Administrador de Nó',
bindNode: 'Vincular Nó',
username: 'Nome de usuário',
password: 'Senha',
nodeRole: 'Função do Nó',
tip: 'Dica',
timeout: 'Tempo limite',
description: 'Descrição',
role: 'Função',
roleManage: 'Gerenciamento de funções',
roleName: 'Nome',
roleDescription: 'Descrição',
permission: 'Permissões',
selectAll: 'Selecionar tudo',
nodeRoleDuplicate: 'Apenas uma função pode ser atribuída a cada nó',
permissionDuplicate: 'Apenas uma função pode ser atribuída a cada nó',
view: 'Visualizar',
manage: 'Gerenciar',
dashboard_view: 'Visualização do Painel',
Expand Down
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2676,6 +2676,8 @@ const message = {
importHelper: 'Пожалуйста, нажмите или перетащите файл лицензии сюда',
licenseRequiredTip:
'Лицензия ещё не импортирована. Скопируйте ID устройства, получите лицензию и импортируйте её, прежде чем входить в систему.',
licenseRequiredShortTip:
'Сначала скопируйте ID устройства, чтобы получить лицензию. После импорта лицензии вы сможете войти.',
licenseRequiredUserTip:
'Лицензия Enterprise Edition не привязана. Обратитесь к суперадминистратору для импорта лицензии.',
technicalAdvice: 'Техническая консультация',
Expand Down Expand Up @@ -3765,24 +3767,18 @@ const message = {
upage: 'AI Конструктор сайтов',
proAlert: 'Обновитесь до Pro, чтобы использовать эту функцию',
user: {
accessControl: 'Управление разрешениями',
user: 'Пользователь',
userInfo: 'Информация о пользователе',
userManage: 'Управление пользователями',
superAdmin: 'Суперадминистратор',
nodeAdmin: 'Администратор узла',
bindNode: 'Привязать узел',
username: 'Имя пользователя',
password: 'Пароль',
nodeRole: 'Роль узла',
tip: 'Подсказка',
timeout: 'Тайм-аут',
description: 'Описание',
role: 'Роль',
roleManage: 'Управление ролями',
roleName: 'Название',
roleDescription: 'Описание',
permission: 'Разрешения',
selectAll: 'Выбрать все',
nodeRoleDuplicate: 'Каждому узлу можно назначить только одну роль',
permissionDuplicate: 'Каждому узлу можно назначить только одну роль',
view: 'Просмотр',
manage: 'Управление',
dashboard_view: 'Просмотр панели',
Expand Down
14 changes: 5 additions & 9 deletions frontend/src/lang/modules/tr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2684,6 +2684,8 @@ const message = {
importHelper: 'Lütfen lisans dosyasını buraya tıklayın veya sürükleyin',
licenseRequiredTip:
'Lisans henüz içe aktarılmadı. Cihaz kimliğini kopyalayıp lisansı alın ve giriş yapmadan önce içe aktarın.',
licenseRequiredShortTip:
'Lütfen önce cihaz kimliğini kopyalayarak lisansı alın. Lisansı içe aktardıktan sonra giriş yapabilirsiniz.',
licenseRequiredUserTip:
'Enterprise Edition lisansı bağlı değil. Lisansı içe aktarması için süper yöneticiyle iletişime geçin.',
levelUpPro: 'Pro Sürüme Yükselt',
Expand Down Expand Up @@ -3767,24 +3769,18 @@ const message = {
upage: 'AI Web Sitesi Oluşturucu',
proAlert: 'Bu özelliği kullanmak için Proya yükseltin',
user: {
accessControl: 'İzin Yönetimi',
user: 'Kullanıcı',
userInfo: 'Kullanıcı Bilgileri',
userManage: 'Kullanıcı Yönetimi',
superAdmin: 'Süper Yönetici',
nodeAdmin: 'Düğüm Yöneticisi',
bindNode: 'Düğüm Bağla',
username: 'Kullanıcı adı',
password: 'Parola',
nodeRole: 'Düğüm Rolü',
tip: 'İpucu',
timeout: 'Zaman aşımı',
description: 'Açıklama',
role: 'Rol',
roleManage: 'Rol Yönetimi',
roleName: 'Ad',
roleDescription: 'Açıklama',
permission: 'İzinler',
selectAll: 'Tümünü Seç',
nodeRoleDuplicate: 'Her düğüme yalnızca bir rol atanabilir',
permissionDuplicate: 'Her düğüme yalnızca bir rol atanabilir',
view: 'Görüntüle',
manage: 'Yönet',
dashboard_view: 'Panel Görünümü',
Expand Down
13 changes: 4 additions & 9 deletions frontend/src/lang/modules/zh-Hant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,6 +2445,7 @@ const message = {
importLicense: '匯入許可證',
importHelper: '請點選或拖動許可檔案到此處',
licenseRequiredTip: '目前尚未匯入許可證，複製裝置 ID 後取得許可證並匯入後才能登入使用。',
licenseRequiredShortTip: '請先複製裝置 ID 取得許可證，匯入許可證後即可登入。',
licenseRequiredUserTip: '企業版許可證未綁定，請聯絡超級管理員匯入許可證。',
levelUpPro: '升級至 Pro 版',
licenseSync: '許可證同步',
Expand Down Expand Up @@ -3423,24 +3424,18 @@ const message = {
upage: 'AI 建站',
proAlert: '升級專業版以使用此功能',
user: {
accessControl: '權限管理',
user: '使用者',
userInfo: '使用者資訊',
userManage: '使用者管理',
superAdmin: '超級管理員',
nodeAdmin: '節點管理員',
bindNode: '綁定節點',
username: '使用者名稱',
password: '密碼',
nodeRole: '節點角色',
tip: '提示',
timeout: '逾時',
description: '描述',
role: '角色',
roleManage: '角色管理',
roleName: '名稱',
roleDescription: '描述',
permission: '權限',
selectAll: '全選',
nodeRoleDuplicate: '每個節點只能新增一種角色',
permissionDuplicate: '每個節點只能新增一種角色',
view: '檢視',
manage: '管理',
dashboard_view: '儀表板檢視',
Expand Down
Loading
Loading