feat: Page compatibility with Enterprise Edition requirements

Author: ssongliu

frontend/src/api/interface/setting.ts

@@ -253,6 +253,22 @@ export namespace Setting {
         smsTotal: number;
         smsUsed: number;
     }
+    export interface LicenseEE {
+        deviceID: string;
+        corporation: string;
+        isv: string;
+        expired: string;
+        product: string;
+        edition: string;
+        licenseVersion: string;
+        count: number;
+        serialNo: string;
+        remark: string;
+        ext: string;
+
+        status: string;
+        message: string;
+    }
     export interface NodeItem {
         id: number;
         addr: string;

frontend/src/api/modules/backup.ts

@@ -23,7 +23,7 @@ export const checkBackup = (params: Backup.BackupOperate) => {
     if (request.credential) {
         request.credential = Base64.encode(request.credential);
     }
-    if (!params.isPublic || !globalStore.isProductPro) {
+    if (!params.isPublic || !globalStore.isXpackNodeOrEE()) {
         return http.postLocalNode<Backup.CheckResult>(`/backups/conn/check`, request);
     }
     return http.post<Backup.CheckResult>(`/backups/conn/check`, request);
@@ -36,7 +36,7 @@ export const listBucket = (params: Backup.ForBucket) => {
     if (request.credential) {
         request.credential = Base64.encode(request.credential);
     }
-    if (!params.isPublic || !globalStore.isProductPro) {
+    if (!params.isPublic || !globalStore.isXpackNodeOrEE()) {
         return http.postLocalNode('/backups/buckets', request, TimeoutEnum.T_40S);
     }
     return http.post('/backups/buckets', request, TimeoutEnum.T_40S);

frontend/src/api/modules/setting.ts

@@ -57,6 +57,12 @@ export const listAppNodes = () => {
 export const loadNodeByUser = () => {
     return http.get<Array<Setting.NodeItem>>(`/core/xpackee/users/nodes`);
 };
+export const uploadXpackEELicense = (params: FormData) => {
+    return http.upload('/core/xpackee/licenses/upload', params);
+};
+export const getXpackEELicense = () => {
+    return http.get<Setting.LicenseEE>(`/core/xpackee/licenses/info`);
+};
 export const getXpackEELicenseStatus = () => {
     return http.get<Setting.LicenseStatus>(`/core/xpackee/licenses/status`);
 };

frontend/src/components/license-import/index.vue

@@ -59,7 +59,7 @@
 import i18n from '@/lang';
 import { ref } from 'vue';
 import { MsgSuccess } from '@/utils/message';
-import { uploadLicense } from '@/api/modules/setting';
+import { uploadLicense, uploadXpackEELicense } from '@/api/modules/setting';
 import DockerProxy from '@/components/docker-proxy/index.vue';
 import { GlobalStore } from '@/store';
 import { UploadFile, UploadFiles, UploadInstance, UploadProps, UploadRawFile, genFileId } from 'element-plus';
@@ -126,6 +126,19 @@ const submit = async () => {
     const file = uploaderFiles.value[0];
     const formData = new FormData();
     formData.append('file', file.raw);
+    if (globalStore.isXpackEE) {
+        loading.value = true;
+        await uploadXpackEELicense(formData)
+            .then(async () => {
+                handleAfterSubmit();
+            })
+            .catch(() => {
+                loading.value = false;
+                uploadRef.value!.clearFiles();
+                uploaderFiles.value = [];
+            });
+        return;
+    }
     if (oldLicense.value) {
         formData.append('oldLicenseName', oldLicense.value);
     }
@@ -137,23 +150,7 @@ const submit = async () => {
     loading.value = true;
     await uploadLicense(oldLicense.value, formData)
         .then(async () => {
-            loading.value = false;
-            uploadRef.value!.clearFiles();
-            uploaderFiles.value = [];
-            open.value = false;
-            MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
-            if (!isImport.value) {
-                globalStore.isProductPro = true;
-                globalStore.isMasterProductPro = true;
-            }
-            if (!withoutReload.value) {
-                loadMasterProductProFromDB();
-                loadProductProFromDB();
-                getXpackSettingForTheme();
-                window.location.reload();
-            } else {
-                em('search');
-            }
+            handleAfterSubmit();
         })
         .catch(() => {
             loading.value = false;
@@ -162,6 +159,28 @@ const submit = async () => {
         });
 };
 
+const handleAfterSubmit = () => {
+    loading.value = false;
+    uploadRef.value!.clearFiles();
+    uploaderFiles.value = [];
+    open.value = false;
+    MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
+    if (!isImport.value) {
+        if (!globalStore.isXpackEE) globalStore.isProductPro = true;
+        globalStore.isMasterProductPro = true;
+    } else {
+        globalStore.isXpackEELicensed = true;
+    }
+    if (!withoutReload.value) {
+        loadMasterProductProFromDB();
+        loadProductProFromDB();
+        getXpackSettingForTheme();
+        window.location.reload();
+    } else {
+        em('search');
+    }
+};
+
 defineExpose({
     acceptParams,
 });

frontend/src/components/system-upgrade/index.vue

@@ -18,7 +18,10 @@
                 </span>
                 <div class="flex flex-wrap items-center">
                     <el-link underline="never" type="primary" @click="toLxware">
-                        <span v-if="isMasterPro">
+                        <span v-if="isXpackEE">
+                            {{ $t('license.ee') }}
+                        </span>
+                        <span v-else-if="isMasterPro">
                             {{ $t('license.pro') }}
                         </span>
                         <span v-else-if="isOffLine">
@@ -68,6 +71,9 @@ const releasesRef = ref();
 const isMasterPro = computed(() => {
     return globalStore.isMasterPro();
 });
+const isXpackEE = computed(() => {
+    return globalStore.isEE();
+});
 
 const version = ref<string>('');
 const loading = ref(false);

frontend/src/global/use-theme.ts

@@ -11,7 +11,7 @@ export const useTheme = () => {
             itemTheme = prefersDark ? 'dark' : 'light';
         }
         document.documentElement.className = itemTheme === 'dark' ? 'dark' : 'light';
-        if (globalStore.isMasterProductPro && themeConfig.themeColor) {
+        if (globalStore.isXpackOrEE() && themeConfig.themeColor) {
             try {
                 const themeColor = JSON.parse(themeConfig.themeColor);
                 const color = itemTheme === 'dark' ? themeColor.dark : themeColor.light;

frontend/src/lang/modules/en.ts

@@ -2168,6 +2168,7 @@ const message = {
         community: 'OSS',
         oss: 'Open Source Software',
         pro: 'Pro',
+        ee: 'Enterprise Edition',
         trial: 'Trial',
         add: 'Add Community Edition',
         licenseBindHelper: 'Free node quotas can only be used when the license is bound to a node',
@@ -2199,6 +2200,16 @@ const message = {
         knowMorePro: 'Learn More',
         closeAlert: 'The current page can be closed in the panel settings',
         introduce: 'Feature Introduction',
+        deviceID: 'Device ID',
+        corporation: 'Licensing Company',
+        expired: 'Expiration Date',
+        edition: 'Edition',
+        standard: 'Standard Edition',
+        enterprise: 'Enterprise Edition',
+        licenseVersion: 'License Version',
+        count: 'License Count',
+        serialNo: 'Serial Number',
+        remark: 'Remarks',
         waf: 'Upgrading to the professional version can provide features such as interception map, logs, block records, geographical location blocking, custom rules, custom interception pages, etc.',
         tamper: 'Upgrading to the professional version can protect websites from unauthorized modifications or tampering.',
         tamperHelper: 'Operation failed, the file or folder has tamper protection enabled. Please check and try again!',

frontend/src/lang/modules/es-es.ts

@@ -2185,6 +2185,7 @@ const message = {
         community: 'OSS',
         oss: 'Software Open Source',
         pro: 'Pro',
+        ee: 'Edición Empresarial',
         trial: 'Prueba',
         add: 'Agregar versión Community',
         licenseBindHelper:
@@ -2215,6 +2216,16 @@ const message = {
         knowMorePro: 'Ver más',
         closeAlert: 'Puede cerrar la página en la configuración del panel',
         introduce: 'Introducción de funciones',
+        deviceID: 'ID del Dispositivo',
+        corporation: 'Empresa Licenciadora',
+        expired: 'Fecha de Vencimiento',
+        edition: 'Edición',
+        standard: 'Edición Estándar',
+        enterprise: 'Edición Empresarial',
+        licenseVersion: 'Versión de la Licencia',
+        count: 'Cantidad de Licencias',
+        serialNo: 'Número de Serie',
+        remark: 'Comentarios',
         waf: 'Actualizar a Pro permite interceptación, logs, geobloqueo, reglas, páginas personalizadas, etc.',
         tamper: 'Actualizar a Pro protege sitios ante modificaciones no autorizadas.',
         tamperHelper:

frontend/src/lang/modules/ja.ts

@@ -2087,6 +2087,7 @@ const message = {
         community: '無料',
         oss: '無料',
         pro: '専門',
+        ee: 'エンタープライズ版',
         trial: '体験',
         add: 'コミュニティ版を追加',
         licenseBindHelper: 'ライセンスがノードにバインドされている場合にのみ、無料ノードクォータを使用できます',
@@ -2120,6 +2121,16 @@ const message = {
         knowMorePro: 'もっと詳しく知る',
         closeAlert: '現在のページはパネル設定で閉じることができます',
         introduce: '機能の紹介',
+        deviceID: 'デバイスID',
+        corporation: 'ライセンス会社',
+        expired: '有効期限',
+        edition: 'エディション',
+        standard: 'スタンダード版',
+        enterprise: 'エンタープライズ版',
+        licenseVersion: 'ライセンスバージョン',
+        count: 'ライセンス数',
+        serialNo: 'シリアル番号',
+        remark: '備考',
         waf: 'プロフェッショナルバージョンにアップグレードすると、インターセプトマップ、ログ、ブロックレコード、地理的位置ブロッキング、カスタムルール、カスタムインターセプトページなどの機能を提供できます。',
         tamper: 'プロのバージョンにアップグレードすると、不正な変更や改ざんからWebサイトを保護できます。',
         setting:

frontend/src/lang/modules/ko.ts

@@ -2052,6 +2052,7 @@ const message = {
         community: 'OSS',
         oss: '오픈 소스 소프트웨어',
         pro: 'Pro',
+        ee: '엔터프라이즈 에디션',
         trial: '체험판',
         add: '커뮤니티 에디션 추가',
         licenseBindHelper: '라이선스가 노드에 바인딩된 경우에만 무료 노드 할당량을 사용할 수 있습니다',
@@ -2084,6 +2085,16 @@ const message = {
         knowMorePro: '더 알아보기',
         closeAlert: '현재 페이지는 패널 설정에서 닫을 수 있습니다.',
         introduce: '기능 소개',
+        deviceID: '장치 ID',
+        corporation: '라이선싱 회사',
+        expired: '만료 날짜',
+        edition: '에디션',
+        standard: '스탠다드 에디션',
+        enterprise: '엔터프라이즈 에디션',
+        licenseVersion: '라이선스 버전',
+        count: '라이선스 수',
+        serialNo: '일련번호',
+        remark: '비고',
         waf: '전문 버전으로 업그레이드하면 차단 맵, 로그, 차단 기록, 지리적 위치 차단, 사용자 정의 규칙, 사용자 정의 차단 페이지 등의 기능을 제공받을 수 있습니다.',
         tamper: '전문 버전으로 업그레이드하면 웹사이트를 무단 수정이나 변조로부터 보호할 수 있습니다.',
         setting: '전문 버전으로 업그레이드하면 패널 로고, 환영 메시지 등 정보를 사용자 정의할 수 있습니다.',