diff --git a/.env.development b/.env.development index af79934..8877d65 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com -VITE_SERVER_URL=https://server.gxwebsoft.com/api -VITE_API_URL=https://cms-api.websoft.top/api +#VITE_SERVER_URL=https://server.gxwebsoft.com/api +#VITE_API_URL=https://cms-api.websoft.top/api #VITE_SOCKET_URL=ws://127.0.0.1:9191 -#VITE_SERVER_URL=http://127.0.0.1:8000/api -#VITE_API_URL=http://127.0.0.1:9000/api +VITE_SERVER_URL=http://127.0.0.1:8000/api +VITE_API_URL=http://127.0.0.1:9000/api #VITE_THINK_URL=http://127.0.0.1:9099/api #/booking/bookingItem diff --git a/src/api/system/user/model/index.ts b/src/api/system/user/model/index.ts index 46c7689..708b8a1 100644 --- a/src/api/system/user/model/index.ts +++ b/src/api/system/user/model/index.ts @@ -118,7 +118,10 @@ export interface User { sortNumber?: number; isSuperAdmin?: boolean; deleted?: number; + // 克隆的模板ID templateId?: number; + // 是否安装 + installed?: boolean; } /** diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index ea524b9..5dfcabe 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -53,26 +53,22 @@ export const useUserStore = defineStore({ }); return {}; } - // 租户初始化 - if (result.authorities?.length == 0) { - result.roles?.map((d) => { - if (d.roleCode === 'superAdmin') { - const hide = message.loading('系统正在初始化...', 500); - initialization(d.roleId).then(() => { - hide(); - location.replace('/'); - return; + // 系统初始化 + if (!result.installed && result.username === 'superAdmin') { + const hide = message.loading('正在分配资源请勿刷新页面...', 500); + // @ts-ignore + clone({tenantId: Number(result.templateId)}).then(() => { + if (result.authorities?.length == 0) { + result.roles?.map((d) => { + if (d.roleCode === 'superAdmin') { + initialization(d.roleId).then(() => { + hide(); + location.reload(); + return false; + }); + } }); } - }); - } - // 克隆默认的云企业官网 - if(result?.planId == 0){ - const hide = message.loading('正在分配资源请勿刷新页面...', 0); - await clone({companyId: 10431,tenantId: 10398}).then(() => { - hide(); - location.replace('/'); - return; }) } // 用户信息