From 08ae659a56346f826bdb8caae7b631715e018794 Mon Sep 17 00:00:00 2001 From: 2910410219 <2910410219@qq.com> Date: Thu, 2 Apr 2026 14:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0API=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=89=8D=E7=BC=80=E4=B8=BA'/admin-go'?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=90=8E=E7=AB=AF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E4=B8=8A=E4=BC=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=80=A7=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 10 +- .env.production | 4 +- public/web/subscribe.html | 1330 ++++++++++---------- src/api/login/index.ts | 16 +- src/api/system/cache/index.ts | 8 +- src/api/system/config/index.ts | 61 +- src/api/system/dept/index.ts | 51 +- src/api/system/dict/data.ts | 126 +- src/api/system/dict/type.ts | 71 +- src/api/system/menu/index.ts | 77 +- src/api/system/monitor/loginLog/index.ts | 36 +- src/api/system/monitor/operLog/index.ts | 55 +- src/api/system/monitor/server/index.ts | 9 +- src/api/system/monitor/userOnline/index.ts | 24 +- src/api/system/personal/index.ts | 35 +- src/api/system/post/index.ts | 50 +- src/api/system/role/index.ts | 97 +- src/api/system/tenant/index.ts | 10 +- src/api/system/user/index.ts | 104 +- src/views/system/personal/index.vue | 975 +++++++------- vite.config.ts | 16 +- 21 files changed, 1567 insertions(+), 1598 deletions(-) diff --git a/.env.development b/.env.development index 3a62d8e..f929f8f 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,6 @@ # 本地环境 ENV = 'development' -# 统一后端服务地址配置（全部模块共用 8000 端口） -# 切换环境时，仅需修改下面这一个地址的 IP -# 当前环境: 192.168.3.38 -# 备用环境: 192.168.3.200 -# 备用环境: 116.204.74.41 -# 备用环境: 172.20.10.7 -VITE_API_URL = 'http://192.168.74.41:8000/' +# 统一后端服务地址前缀（网关服务名：admin-go） +# 开发环境走本地代理，避免 CORS +VITE_API_URL = 'http://192.168.74.41:8000' diff --git a/.env.production b/.env.production index fa100b0..ccfb6ae 100644 --- a/.env.production +++ b/.env.production @@ -4,5 +4,5 @@ ENV = 'production' # public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可 VITE_PUBLIC_PATH = '/sys/' -# 统一服务地址（端口8000） -VITE_API_URL = '/' +# 统一服务地址前缀（网关服务名：admin-go） +VITE_API_URL = '' diff --git a/public/web/subscribe.html b/public/web/subscribe.html index d3cc214..176420a 100644 --- a/public/web/subscribe.html +++ b/public/web/subscribe.html @@ -1,563 +1,584 @@ - + - - - - 服务开通 - 智能营销服务平台 - - - - - - + .success-message p { + margin: 0; + color: #15803d; + } + + + + + - - +
+
+

开通服务

+

选择适合您的套餐，立即开通使用

+
-
- + +
+ +

正在加载套餐信息...

+
- -
- -

正在加载套餐信息...

-
+ + - - + + - - + + - - + + - - + + - - + + - - + + +
- - -
+ - + // 更新提交按钮状态 + function updateSubmitButton() { + const btn = document.getElementById('btn-submit'); + // 如果有用户类型选项，则需要同时选择类型和套餐 + if (tenantModuleTypes.length > 0) { + btn.disabled = !selectedSku || !selectedType; + } else { + btn.disabled = !selectedSku; + } + } + + // 开通服务 + async function handleSubscribe() { + if (!selectedSku) { + alert('请选择套餐'); + return; + } + + // 如果有用户类型选项但未选择 + if (tenantModuleTypes.length > 0 && !selectedType) { + alert('请选择用户类型'); + return; + } + + const btn = document.getElementById('btn-submit'); + btn.disabled = true; + btn.textContent = '开通中...'; + + try { + const token = getToken(); + + // 构建请求参数 + const requestBody = { + assetSkuId: selectedSku.id, + }; + + // 如果选择了用户类型，添加到请求参数 + if (selectedType) { + requestBody.tenantModuleType = selectedType.key; + } + + const response = await fetch(`${API_BASE_MAIN}/admin-go/api/v1/system/moduleTenant/add`, { + method: 'POST', + headers: { + Authorization: token ? `Bearer ${token}` : '', + 'Content-Type': 'application/json', + }, + body: JSON.stringify(requestBody), + }); + + const result = await response.json(); + + if (result.code !== 0) { + throw new Error(result.message || '开通失败'); + } + + // 显示成功 + document.getElementById('type-section').style.display = 'none'; + document.getElementById('sku-section').style.display = 'none'; + document.getElementById('actions').style.display = 'none'; + document.getElementById('asset-info').style.display = 'none'; + document.getElementById('success').style.display = 'block'; + + // 设置开通时间标记，防止跳转后立即又触发402 + sessionStorage.setItem('lastSubscribeTime', Date.now().toString()); + + // 延迟跳转回原页面 + const targetUrl = decodeURIComponent(returnUrl); + // console.log('[subscribe] 开通成功，即将跳转到:', targetUrl); + // console.log('[subscribe] 原始 returnUrl:', returnUrl); + + setTimeout(() => { + let finalUrl; + // 如果 returnUrl 包含当前开通页面路径，则跳转到首页 + if (targetUrl.includes('/web/subscribe') || targetUrl.includes('subscribe.html')) { + console.log('[subscribe] returnUrl 指向开通页面，改为跳转首页'); + finalUrl = '/index.html#/home'; + } else { + finalUrl = targetUrl; + } + + // 使用 replace 跳转，然后强制刷新 + window.location.replace(finalUrl); + // 延迟一点再刷新，确保 URL 已经改变 + setTimeout(() => { + window.location.reload(true); + }, 100); + }, 2000); + } catch (error) { + console.error('开通失败:', error); + alert(error.message || '开通失败，请稍后重试'); + btn.disabled = false; + btn.textContent = '立即开通'; + } + } + + // 取消 - 跳转到后台首页，避免循环触发402 + function handleCancel() { + window.location.href = '/index.html#/home'; + } + + // 获取Token（从Cookie获取） + function getToken() { + try { + const cookies = document.cookie.split(';'); + for (let cookie of cookies) { + const parts = cookie.trim().split('='); + const name = parts[0]; + // token 值可能包含 = 号，所以用 slice 获取剩余部分 + const value = parts.slice(1).join('='); + if (name === 'token' && value) { + // Cookie 中的值可能被 URL 编码，需要解码 + try { + return decodeURIComponent(value); + } catch (e) { + return value; + } + } + } + } catch (e) { + console.error('获取token失败:', e); + } + return ''; + } + + // 显示/隐藏加载 + function showLoading(show) { + document.getElementById('loading').style.display = show ? 'block' : 'none'; + } + + // 显示错误 + function showError(message) { + const errorEl = document.getElementById('error'); + errorEl.textContent = message; + errorEl.style.display = 'block'; + document.getElementById('loading').style.display = 'none'; + } + + diff --git a/src/api/login/index.ts b/src/api/login/index.ts index b22986f..131f83f 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -4,9 +4,9 @@ import request from '/@/utils/request'; * 登录api接口集合 * @method signIn 用户登录 */ -export function login(params: object){ +export function login(params: object) { return request({ - url: '/api/v1/system/login', + url: '/admin-go/api/v1/system/login', method: 'post', data: params, }); @@ -15,19 +15,19 @@ export function login(params: object){ /** * 获取验证码 */ -export function captcha(){ +export function captcha() { return request({ - url:"/api/v1/pub/captcha/get", - method:"get" - }) + url: '/admin-go/api/v1/pub/captcha/get', + method: 'get', + }); } /** * 退出登录 */ -export function logout(){ +export function logout() { return request({ - url: '/api/v1/system/logout', + url: '/admin-go/api/v1/system/logout', method: 'get', }); } diff --git a/src/api/system/cache/index.ts b/src/api/system/cache/index.ts index 7d81f3e..ad1ff53 100644 --- a/src/api/system/cache/index.ts +++ b/src/api/system/cache/index.ts @@ -2,8 +2,8 @@ import request from '/@/utils/request'; // 清除缓存 export function removeCache() { - return request({ - url: '/api/v1/system/cache/remove', - method: 'delete' - }) + return request({ + url: '/admin-go/api/v1/system/cache/remove', + method: 'delete', + }); } diff --git a/src/api/system/config/index.ts b/src/api/system/config/index.ts index fe0ff2a..f59fa59 100644 --- a/src/api/system/config/index.ts +++ b/src/api/system/config/index.ts @@ -1,42 +1,41 @@ import request from '/@/utils/request'; - -export function getConfigList(query:Object) { - return request({ - url: '/api/v1/system/config/list', - method: 'get', - params:query - }) +export function getConfigList(query: Object) { + return request({ + url: '/admin-go/api/v1/system/config/list', + method: 'get', + params: query, + }); } -export function getConfig(id:string) { - return request({ - url: '/api/v1/system/config/get', - method: 'get', - params:{id} - }) +export function getConfig(id: string) { + return request({ + url: '/admin-go/api/v1/system/config/get', + method: 'get', + params: { id }, + }); } -export function addConfig(data:any) { - return request({ - url: '/api/v1/system/config/add', - method: 'post', - data:data - }) +export function addConfig(data: any) { + return request({ + url: '/admin-go/api/v1/system/config/add', + method: 'post', + data: data, + }); } -export function editConfig(data:any) { - return request({ - url: '/api/v1/system/config/edit', - method: 'put', - data:data - }) +export function editConfig(data: any) { + return request({ + url: '/admin-go/api/v1/system/config/edit', + method: 'put', + data: data, + }); } -export function deleteConfig(ids:string[]) { - return request({ - url: '/api/v1/system/config/delete', - method: 'delete', - data:{ids} - }) +export function deleteConfig(ids: string[]) { + return request({ + url: '/admin-go/api/v1/system/config/delete', + method: 'delete', + data: { ids }, + }); } diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts index 95a9b42..0e52c4c 100644 --- a/src/api/system/dept/index.ts +++ b/src/api/system/dept/index.ts @@ -1,36 +1,33 @@ import request from '/@/utils/request'; -export function getDeptList(query?:Object) { - return request({ - url: '/api/v1/system/dept/list', - method: 'get', - params:query - }) +export function getDeptList(query?: Object) { + return request({ + url: '/admin-go/api/v1/system/dept/list', + method: 'get', + params: query, + }); } - -export function addDept(data:object) { - return request({ - url: '/api/v1/system/dept/add', - method: 'post', - data:data - }) +export function addDept(data: object) { + return request({ + url: '/admin-go/api/v1/system/dept/add', + method: 'post', + data: data, + }); } - -export function editDept(data:object) { - return request({ - url: '/api/v1/system/dept/edit', - method: 'put', - data:data - }) +export function editDept(data: object) { + return request({ + url: '/admin-go/api/v1/system/dept/edit', + method: 'put', + data: data, + }); } - -export function deleteDept(id:number) { - return request({ - url: '/api/v1/system/dept/delete', - method: 'delete', - data:{id} - }) +export function deleteDept(id: number) { + return request({ + url: '/admin-go/api/v1/system/dept/delete', + method: 'delete', + data: { id }, + }); } diff --git a/src/api/system/dict/data.ts b/src/api/system/dict/data.ts index d603be7..c45af29 100644 --- a/src/api/system/dict/data.ts +++ b/src/api/system/dict/data.ts @@ -1,85 +1,83 @@ import request from '/@/utils/request'; -import {ref ,toRefs,ToRefs} from 'vue' +import { ref, toRefs, ToRefs } from 'vue'; // 根据字典类型查询字典数据信息 -export function getDict(dictType :string,defaultValue?:string):Promise { - let dv = defaultValue??'' - let params ={ - dictType:dictType, - defaultValue:dv - } - return request({ - url: '/api/v1/system/dict/data/getDictData', - method: 'get', - params:params - }) +export function getDict(dictType: string, defaultValue?: string): Promise { + let dv = defaultValue ?? ''; + let params = { + dictType: dictType, + defaultValue: dv, + }; + return request({ + url: '/admin-go/api/v1/system/dict/data/getDictData', + method: 'get', + params: params, + }); } // 根据字典类型查询字典数据信息(新方案) -export function getDicts(dictType :string,defaultValue?:string):Promise { - let dv = defaultValue??'' - let params ={ - dictType:dictType, - defaultValue:dv - } - return request({ - url: '/api/v1/system/dict/data/getDictDataTree', - method: 'get', - params:params - }) +export function getDicts(dictType: string, defaultValue?: string): Promise { + let dv = defaultValue ?? ''; + let params = { + dictType: dictType, + defaultValue: dv, + }; + return request({ + url: '/admin-go/api/v1/system/dict/data/getDictDataTree', + method: 'get', + params: params, + }); } - /** * 获取字典数据 */ -export function useDict(...args:string[]):ToRefs{ - const res:any = ref({}); - args.forEach((d:string) => { - res.value[d] = []; - getDict(d).then(resp => { - res.value[d] = resp.data.values.map((p:any) => ({ label: p.value, value: p.key, isDefault: p.isDefault })) - }) - }) - return toRefs(res.value); +export function useDict(...args: string[]): ToRefs { + const res: any = ref({}); + args.forEach((d: string) => { + res.value[d] = []; + getDict(d).then((resp) => { + res.value[d] = resp.data.values.map((p: any) => ({ label: p.value, value: p.key, isDefault: p.isDefault })); + }); + }); + return toRefs(res.value); } - -export function getDataList(query:Object) { - return request({ - url: '/api/v1/system/dict/data/list', - method: 'get', - params:query - }) +export function getDataList(query: Object) { + return request({ + url: '/admin-go/api/v1/system/dict/data/list', + method: 'get', + params: query, + }); } -export function getData(dictCode:number) { - return request({ - url: '/api/v1/system/dict/data/get', - method: 'get', - params:{dictCode} - }) +export function getData(dictCode: number) { + return request({ + url: '/admin-go/api/v1/system/dict/data/get', + method: 'get', + params: { dictCode }, + }); } -export function addData(data:any) { - return request({ - url: '/api/v1/system/dict/data/add', - method: 'post', - data:data - }) +export function addData(data: any) { + return request({ + url: '/admin-go/api/v1/system/dict/data/add', + method: 'post', + data: data, + }); } -export function editData(data:any) { - return request({ - url: '/api/v1/system/dict/data/edit', - method: 'put', - data:data - }) +export function editData(data: any) { + return request({ + url: '/admin-go/api/v1/system/dict/data/edit', + method: 'put', + data: data, + }); } -export function deleteData(ids:number[]) { - return request({ - url: '/api/v1/system/dict/data/delete', - method: 'delete', - data:{ids} - }) +export function deleteData(ids: number[]) { + return request({ + url: '/admin-go/api/v1/system/dict/data/delete', + method: 'delete', + data: { ids }, + }); } diff --git a/src/api/system/dict/type.ts b/src/api/system/dict/type.ts index 0163dbc..f190a4e 100644 --- a/src/api/system/dict/type.ts +++ b/src/api/system/dict/type.ts @@ -1,52 +1,49 @@ import request from '/@/utils/request'; -export function getTypeList(query:Object) { - return request({ - url: '/api/v1/system/dict/type/list', - method: 'get', - params:query - }) +export function getTypeList(query: Object) { + return request({ + url: '/admin-go/api/v1/system/dict/type/list', + method: 'get', + params: query, + }); } -export function getType(dictId:number) { - return request({ - url: '/api/v1/system/dict/type/get', - method: 'get', - params:{dictId} - }) +export function getType(dictId: number) { + return request({ + url: '/admin-go/api/v1/system/dict/type/get', + method: 'get', + params: { dictId }, + }); } -export function addType(data:any) { - return request({ - url: '/api/v1/system/dict/type/add', - method: 'post', - data:data - }) +export function addType(data: any) { + return request({ + url: '/admin-go/api/v1/system/dict/type/add', + method: 'post', + data: data, + }); } -export function editType(data:any) { - return request({ - url: '/api/v1/system/dict/type/edit', - method: 'put', - data:data - }) +export function editType(data: any) { + return request({ + url: '/admin-go/api/v1/system/dict/type/edit', + method: 'put', + data: data, + }); } - -export function deleteType(dictIds:number[]) { - return request({ - url: '/api/v1/system/dict/type/delete', - method: 'delete', - data:{dictIds} - }) +export function deleteType(dictIds: number[]) { + return request({ + url: '/admin-go/api/v1/system/dict/type/delete', + method: 'delete', + data: { dictIds }, + }); } - // 获取字典选择框列表 export function optionselect() { - return request({ - url: '/api/v1/system/dict/type/optionSelect', - method: 'get' - }) + return request({ + url: '/admin-go/api/v1/system/dict/type/optionSelect', + method: 'get', + }); } - diff --git a/src/api/system/menu/index.ts b/src/api/system/menu/index.ts index 758ea1c..ed9a90d 100644 --- a/src/api/system/menu/index.ts +++ b/src/api/system/menu/index.ts @@ -1,57 +1,56 @@ import request from '/@/utils/request'; -export function getMenuList(query:Object) { - return request({ - url: '/api/v1/system/menu/list', - method: 'get', - params:query - }) +export function getMenuList(query: Object) { + return request({ + url: '/admin-go/api/v1/system/menu/list', + method: 'get', + params: query, + }); } export function getUserMenus() { - return request({ - url: '/api/v1/system/user/getUserMenus', - method: 'get' - }) + return request({ + url: '/admin-go/api/v1/system/user/getUserMenus', + method: 'get', + }); } export function getMenuParams() { - return request({ - url: '/api/v1/system/menu/getParams', - method: 'get' - }) + return request({ + url: '/admin-go/api/v1/system/menu/getParams', + method: 'get', + }); } -export function addMenu(data:Object) { - return request({ - url: '/api/v1/system/menu/add', - method: 'post', - data:data - }) +export function addMenu(data: Object) { + return request({ + url: '/admin-go/api/v1/system/menu/add', + method: 'post', + data: data, + }); } -export function getMenuInfo(id:number) { - return request({ - url: '/api/v1/system/menu/get', - method: 'get', - params:{id} - }) +export function getMenuInfo(id: number) { + return request({ + url: '/admin-go/api/v1/system/menu/get', + method: 'get', + params: { id }, + }); } -export function updateMenu(data:Object) { - return request({ - url: '/api/v1/system/menu/update', - method: 'put', - data:data - }) +export function updateMenu(data: Object) { + return request({ + url: '/admin-go/api/v1/system/menu/update', + method: 'put', + data: data, + }); } - // 删除菜单 -export function delMenu(menuId:number) { - return request({ - url: '/api/v1/system/menu/delete', - method: 'delete', - data:{ids:[menuId]} - }) +export function delMenu(menuId: number) { + return request({ + url: '/admin-go/api/v1/system/menu/delete', + method: 'delete', + data: { ids: [menuId] }, + }); } diff --git a/src/api/system/monitor/loginLog/index.ts b/src/api/system/monitor/loginLog/index.ts index d2fcb61..d128f11 100644 --- a/src/api/system/monitor/loginLog/index.ts +++ b/src/api/system/monitor/loginLog/index.ts @@ -1,28 +1,24 @@ import request from '/@/utils/request'; - -export function logList(query:object) { - return request({ - url: '/api/v1/system/loginLog/list', - method: 'get', - params:query - }) +export function logList(query: object) { + return request({ + url: '/admin-go/api/v1/system/loginLog/list', + method: 'get', + params: query, + }); } - -export function deleteLog(ids:number[]) { - return request({ - url: '/api/v1/system/loginLog/delete', - method: 'delete', - params:{ids} - }) +export function deleteLog(ids: number[]) { + return request({ + url: '/admin-go/api/v1/system/loginLog/delete', + method: 'delete', + params: { ids }, + }); } - - export function clearLog() { - return request({ - url: '/api/v1/system/loginLog/clear', - method: 'delete', - }) + return request({ + url: '/admin-go/api/v1/system/loginLog/clear', + method: 'delete', + }); } diff --git a/src/api/system/monitor/operLog/index.ts b/src/api/system/monitor/operLog/index.ts index 569ec7a..e967071 100644 --- a/src/api/system/monitor/operLog/index.ts +++ b/src/api/system/monitor/operLog/index.ts @@ -1,37 +1,36 @@ -import request from '/@/utils/request' +import request from '/@/utils/request'; // 查询操作日志列表 -export function listSysOperLog(query:object) { - return request({ - url: '/api/v1/system/operLog/list', - method: 'get', - params: query - }) +export function listSysOperLog(query: object) { + return request({ + url: '/admin-go/api/v1/system/operLog/list', + method: 'get', + params: query, + }); } // 查询操作日志详细 -export function getSysOperLog(operId:number) { - return request({ - url: '/api/v1/system/operLog/get', - method: 'get', - params: { - operId: operId.toString() - } - }) +export function getSysOperLog(operId: number) { + return request({ + url: '/admin-go/api/v1/system/operLog/get', + method: 'get', + params: { + operId: operId.toString(), + }, + }); } // 删除操作日志 -export function delSysOperLog(operIds:number[]) { - return request({ - url: '/api/v1/system/operLog/delete', - method: 'delete', - data:{ - operIds:operIds - } - }) +export function delSysOperLog(operIds: number[]) { + return request({ + url: '/admin-go/api/v1/system/operLog/delete', + method: 'delete', + data: { + operIds: operIds, + }, + }); } - export function clearOperLog() { - return request({ - url: '/api/v1/system/operLog/clear', - method: 'delete', - }) + return request({ + url: '/admin-go/api/v1/system/operLog/clear', + method: 'delete', + }); } diff --git a/src/api/system/monitor/server/index.ts b/src/api/system/monitor/server/index.ts index 6603ce1..a3d5e4f 100644 --- a/src/api/system/monitor/server/index.ts +++ b/src/api/system/monitor/server/index.ts @@ -1,9 +1,8 @@ import request from '/@/utils/request'; - export function getSysInfo() { - return request({ - url: '/api/v1/system/monitor/server', - method: 'get' - }) + return request({ + url: '/admin-go/api/v1/system/monitor/server', + method: 'get', + }); } diff --git a/src/api/system/monitor/userOnline/index.ts b/src/api/system/monitor/userOnline/index.ts index bbef96d..801f821 100644 --- a/src/api/system/monitor/userOnline/index.ts +++ b/src/api/system/monitor/userOnline/index.ts @@ -1,18 +1,18 @@ import request from '/@/utils/request'; // 查询列表 -export function listSysUserOnline(query:object) { - return request({ - url: '/api/v1/system/online/list', - method: 'get', - params: query - }) +export function listSysUserOnline(query: object) { + return request({ + url: '/admin-go/api/v1/system/online/list', + method: 'get', + params: query, + }); } -export function forceLogout(ids:string[]) { - return request({ - url: '/api/v1/system/online/forceLogout', - method: 'delete', - data: {ids} - }) +export function forceLogout(ids: string[]) { + return request({ + url: '/admin-go/api/v1/system/online/forceLogout', + method: 'delete', + data: { ids }, + }); } diff --git a/src/api/system/personal/index.ts b/src/api/system/personal/index.ts index 24eb1f6..6578251 100644 --- a/src/api/system/personal/index.ts +++ b/src/api/system/personal/index.ts @@ -1,28 +1,25 @@ import request from '/@/utils/request'; export function getPersonalInfo() { - return request({ - url: '/api/v1/system/personal/getPersonalInfo', - method: 'get', - }) + return request({ + url: '/admin-go/api/v1/system/personal/getPersonalInfo', + method: 'get', + }); } - -export function editPersonal(data:object) { - return request({ - url: '/api/v1/system/personal/edit', - method: 'put', - data:data - }) +export function editPersonal(data: object) { + return request({ + url: '/admin-go/api/v1/system/personal/edit', + method: 'put', + data: data, + }); } //重置個人密碼 -export function resetPwdPersonal(data:object) { - return request({ - url: '/api/v1/system/personal/resetPwd', - method: 'put', - data:data - }) +export function resetPwdPersonal(data: object) { + return request({ + url: '/admin-go/api/v1/system/personal/resetPwd', + method: 'put', + data: data, + }); } - - diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts index a84f0bc..a2db4a1 100644 --- a/src/api/system/post/index.ts +++ b/src/api/system/post/index.ts @@ -1,35 +1,33 @@ import request from '/@/utils/request'; -export function getPostList(query:Object) { - return request({ - url: '/api/v1/system/post/list', - method: 'get', - params:query - }) +export function getPostList(query: Object) { + return request({ + url: '/admin-go/api/v1/system/post/list', + method: 'get', + params: query, + }); } -export function addPost(data:object) { - return request({ - url: '/api/v1/system/post/add', - method: 'post', - data:data - }) +export function addPost(data: object) { + return request({ + url: '/admin-go/api/v1/system/post/add', + method: 'post', + data: data, + }); } - -export function editPost(data:object) { - return request({ - url: '/api/v1/system/post/edit', - method: 'put', - data:data - }) +export function editPost(data: object) { + return request({ + url: '/admin-go/api/v1/system/post/edit', + method: 'put', + data: data, + }); } - -export function deletePost(ids:number[]) { - return request({ - url: '/api/v1/system/post/delete', - method: 'delete', - data:{ids} - }) +export function deletePost(ids: number[]) { + return request({ + url: '/admin-go/api/v1/system/post/delete', + method: 'delete', + data: { ids }, + }); } diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts index 46cdcf8..82ba4bd 100644 --- a/src/api/system/role/index.ts +++ b/src/api/system/role/index.ts @@ -1,70 +1,65 @@ import request from '/@/utils/request'; -export function getRoleList(query:Object) { - return request({ - url: '/api/v1/system/role/list', - method: 'get', - params:query - }) +export function getRoleList(query: Object) { + return request({ + url: '/admin-go/api/v1/system/role/list', + method: 'get', + params: query, + }); } export function getRoleParams() { - return request({ - url: '/api/v1/system/role/getParamsInfo', - method: 'get' - }) + return request({ + url: '/admin-go/api/v1/system/role/getParamsInfo', + method: 'get', + }); } -export function addRole(data:object) { - return request({ - url: '/api/v1/system/role/add', - method: 'post', - data:data - }) +export function addRole(data: object) { + return request({ + url: '/admin-go/api/v1/system/role/add', + method: 'post', + data: data, + }); } -export function getRole(id:string) { - return request({ - url: '/api/v1/system/role/get', - method: 'get', - params:{id} - }) +export function getRole(id: string) { + return request({ + url: '/admin-go/api/v1/system/role/get', + method: 'get', + params: { id }, + }); } - -export function editRole(data:object) { - return request({ - url: '/api/v1/system/role/edit', - method: 'put', - data:data - }) +export function editRole(data: object) { + return request({ + url: '/admin-go/api/v1/system/role/edit', + method: 'put', + data: data, + }); } - -export function deleteRole(id:string) { - return request({ - url: '/api/v1/system/role/delete', - method: 'delete', - data:{ids:[id]} - }) +export function deleteRole(id: string) { + return request({ + url: '/admin-go/api/v1/system/role/delete', + method: 'delete', + data: { ids: [id] }, + }); } -export function dataScope(data:any) { - return request({ - url: '/api/v1/system/role/dataScope', - method: 'put', - data:data - }) +export function dataScope(data: any) { + return request({ + url: '/admin-go/api/v1/system/role/dataScope', + method: 'put', + data: data, + }); } - // 根据角色ID查询部门树结构 -export function roleDeptTreeSelect(roleId:string) { - return request({ - url: '/api/v1/system/role/deptTreeSelect', - method: 'get', - params:{roleId} - }) +export function roleDeptTreeSelect(roleId: string) { + return request({ + url: '/admin-go/api/v1/system/role/deptTreeSelect', + method: 'get', + params: { roleId }, + }); } - - diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index 4792ac9..d882c68 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -3,7 +3,7 @@ import request from '/@/utils/request'; // 获取租户列表 export function getTenantList(query: Object) { return request({ - url: '/api/v1/system/tenant/list', + url: '/admin-go/api/v1/system/tenant/list', method: 'get', params: query, }); @@ -12,7 +12,7 @@ export function getTenantList(query: Object) { // 获取租户详情 export function getTenant(id: number) { return request({ - url: '/api/v1/system/tenant/get', + url: '/admin-go/api/v1/system/tenant/get', method: 'get', params: { id }, }); @@ -23,7 +23,7 @@ export function addTenant(data: object) { // 如果是 FormData，需要让浏览器自动设置 Content-Type（包含 boundary） const isFormData = data instanceof FormData; return request({ - url: '/api/v1/system/tenant/add', + url: '/admin-go/api/v1/system/tenant/add', method: 'post', data: data, headers: isFormData ? { 'Content-Type': undefined } : undefined, @@ -35,7 +35,7 @@ export function editTenant(data: object) { // 如果是 FormData，需要让浏览器自动设置 Content-Type（包含 boundary） const isFormData = data instanceof FormData; return request({ - url: '/api/v1/system/tenant/edit', + url: '/admin-go/api/v1/system/tenant/edit', method: 'put', data: data, headers: isFormData ? { 'Content-Type': undefined } : undefined, @@ -45,7 +45,7 @@ export function editTenant(data: object) { // 删除租户 export function deleteTenant(ids: number[]) { return request({ - url: '/api/v1/system/tenant/delete', + url: '/admin-go/api/v1/system/tenant/delete', method: 'delete', data: { ids }, }); diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index bfb063a..fd86784 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -1,75 +1,71 @@ import request from '/@/utils/request'; -export function getUserList(query:Object) { - return request({ - url: '/api/v1/system/user/getList', - method: 'get', - params:query - }) +export function getUserList(query: Object) { + return request({ + url: '/admin-go/api/v1/system/user/getList', + method: 'get', + params: query, + }); } export function getDeptTree() { - return request({ - url: '/api/v1/system/dept/treeSelect', - method: 'get' - }) + return request({ + url: '/admin-go/api/v1/system/dept/treeSelect', + method: 'get', + }); } export function getParams() { - return request({ - url: '/api/v1/system/user/paramsInfo', - method: 'get' - }) + return request({ + url: '/admin-go/api/v1/system/user/paramsInfo', + method: 'get', + }); } -export function getEditUser(id:number) { - return request({ - url: '/api/v1/system/user/getEdit', - method: 'get', - params:{id} - }) +export function getEditUser(id: number) { + return request({ + url: '/admin-go/api/v1/system/user/getEdit', + method: 'get', + params: { id }, + }); } -export function addUser(data:object) { - return request({ - url: '/api/v1/system/user/add', - method: 'post', - data:data - }) +export function addUser(data: object) { + return request({ + url: '/admin-go/api/v1/system/user/add', + method: 'post', + data: data, + }); } - -export function editUser(data:object) { - return request({ - url: '/api/v1/system/user/edit', - method: 'put', - data:data - }) +export function editUser(data: object) { + return request({ + url: '/admin-go/api/v1/system/user/edit', + method: 'put', + data: data, + }); } -export function resetUserPwd(userId:number, password:string) { - return request({ - url: '/api/v1/system/user/resetPwd', - method: 'put', - data:{userId,password} - }) +export function resetUserPwd(userId: number, password: string) { + return request({ + url: '/admin-go/api/v1/system/user/resetPwd', + method: 'put', + data: { userId, password }, + }); } -export function changeUserStatus(userId:number, status:number) { - return request({ - url: '/api/v1/system/user/setStatus', - method: 'put', - data:{userId,status} - }) +export function changeUserStatus(userId: number, status: number) { + return request({ + url: '/admin-go/api/v1/system/user/setStatus', + method: 'put', + data: { userId, status }, + }); } - -export function deleteUser(ids:number[]) { - return request({ - url: '/api/v1/system/user/delete', - method: 'delete', - data:{ids} - }) +export function deleteUser(ids: number[]) { + return request({ + url: '/admin-go/api/v1/system/user/delete', + method: 'delete', + data: { ids }, + }); } - - diff --git a/src/views/system/personal/index.vue b/src/views/system/personal/index.vue index e7dea6d..db10222 100644 --- a/src/views/system/personal/index.vue +++ b/src/views/system/personal/index.vue @@ -1,516 +1,511 @@ diff --git a/vite.config.ts b/vite.config.ts index 3877c2e..0cdbfea 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -44,21 +44,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => { port: env.VITE_PORT as unknown as number, open: false, hmr: true, - // proxy: { - // '/gitee': { - // target: 'https://gitee.com', - // ws: true, - // changeOrigin: true, - // rewrite: (path) => path.replace(/^\/gitee/, ''), - // }, - // }, - proxy: { - '/api': { - target: 'http://localhost:8808', - changeOrigin: true, - rewrite: (path) => path.replace(/^\/api/, '/api'), - }, - }, + // 无代理模式：前端直连后端，由后端处理 CORS }, build: { outDir: 'dist',