diff --git a/.env.development b/.env.development index 15ddaf7..b57434a 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 平台本地运行端口号 -VITE_PORT=3000 +VITE_PORT=7000 # 预发布环境路由历史模式(Hash模式传"hash"、HTML5模式传"h5"、Hash模式带base参数传"hash,base参数"、HTML5模式带base参数传"h5,base参数") VITE_ROUTER_HISTORY="hash" @@ -8,7 +8,7 @@ VITE_ROUTER_HISTORY="hash" VITE_BASE_API=/api # 跨域代理地址 -VITE_APP_URL=http://localhost:6060 +VITE_APP_URL=http://localhost:7070 # mock地址 VITE_MOCK_BASE_API=/mock @@ -22,13 +22,5 @@ VITE_BASE_API_RETRY=5 # 失败重试时间 VITE_BASE_API_RETRY_DELAY=3000 -# 是否在打包时使用cdn替换本地库 替换 true 不替换 false -VITE_CDN=false - -# 是否启用gzip压缩或brotli压缩(分两种情况,删除原始文件和不删除原始文件) -# 压缩时不删除原始文件的配置:gzip、brotli、both(同时开启 gzip 与 brotli 压缩)、none(不开启压缩,默认) -# 压缩时删除原始文件的配置:gzip-clear、brotli-clear、both-clear(同时开启 gzip 与 brotli 压缩)、none(不开启压缩,默认) -VITE_COMPRESSION="none" - # 开发环境读取配置文件路径 VITE_PUBLIC_PATH=/ diff --git a/.env.production b/.env.production index b0a7302..5abfbd1 100644 --- a/.env.production +++ b/.env.production @@ -7,9 +7,6 @@ VITE_ROUTER_HISTORY="hash" # 基础请求路径 VITE_BASE_API=/admin -# 跨域代理地址 -VITE_APP_URL=http://localhost:8000 - # mock地址 VITE_MOCK_BASE_API=/mock @@ -23,12 +20,12 @@ VITE_BASE_API_RETRY=5 VITE_BASE_API_RETRY_DELAY=3000 # 是否在打包时使用cdn替换本地库 替换 true 不替换 false -VITE_CDN=true +VITE_CDN=false # 是否启用gzip压缩或brotli压缩(分两种情况,删除原始文件和不删除原始文件) # 压缩时不删除原始文件的配置:gzip、brotli、both(同时开启 gzip 与 brotli 压缩)、none(不开启压缩,默认) # 压缩时删除原始文件的配置:gzip-clear、brotli-clear、both-clear(同时开启 gzip 与 brotli 压缩)、none(不开启压缩,默认) -VITE_COMPRESSION="none" +VITE_COMPRESSION="gzip" # 开发环境读取配置文件路径 VITE_PUBLIC_PATH=/ diff --git a/docker/nginx.conf b/docker/nginx.conf index fca77a4..951a0e5 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -16,7 +16,7 @@ server { # 后端跨域请求 location ~/admin/ { - proxy_pass http://172.17.0.1:8000; + proxy_pass http://172.17.0.1:7070; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/src/api/v1/financial/debtCollectionManagement.ts b/src/api/v1/financial/debtCollectionManagement.ts deleted file mode 100644 index 0e87b65..0000000 --- a/src/api/v1/financial/debtCollectionManagement.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { http } from '@/api/service/request'; -import type { BaseResult, ResultTable } from '@/api/service/types'; - -/** 债务回收管理表---获取债务回收管理表列表 */ -export const fetchGetDebtCollectionManagementList = (data: any) => { - return http.request>('get', `debtCollectionManagement/getDebtCollectionManagementList/${data.currentPage}/${data.pageSize}`, { - params: data, - }); -}; - -/** 债务回收管理表---添加债务回收管理表 */ -export const fetchAddDebtCollectionManagement = (data: any) => { - return http.request>('post', 'debtCollectionManagement/addDebtCollectionManagement', { data }); -}; - -/** 债务回收管理表---更新债务回收管理表 */ -export const fetchUpdateDebtCollectionManagement = (data: any) => { - return http.request>('put', 'debtCollectionManagement/updateDebtCollectionManagement', { data }); -}; - -/** 债务回收管理表---删除债务回收管理表 */ -export const fetchDeleteDebtCollectionManagement = (data: any) => { - return http.request>('delete', 'debtCollectionManagement/deleteDebtCollectionManagement', { data }); -}; diff --git a/src/api/v1/financial/bill.ts b/src/api/v1/financialUser/billUser.ts similarity index 100% rename from src/api/v1/financial/bill.ts rename to src/api/v1/financialUser/billUser.ts diff --git a/src/api/v1/financial/categoryUser.ts b/src/api/v1/financialUser/categoryUser.ts similarity index 53% rename from src/api/v1/financial/categoryUser.ts rename to src/api/v1/financialUser/categoryUser.ts index 98dbc42..b7b7fea 100644 --- a/src/api/v1/financial/categoryUser.ts +++ b/src/api/v1/financialUser/categoryUser.ts @@ -3,25 +3,25 @@ import type { BaseResult, ResultTable } from '@/api/service/types'; /** 分类信息---获取分类信息列表 */ export const fetchGetCategoryUserList = (data: any) => { - return http.request>('get', `categoryUser/noManage/getCategoryUserList/${data.currentPage}/${data.pageSize}`, { params: data }); + return http.request>('get', `category/noManage/getCategoryUserList/${data.currentPage}/${data.pageSize}`, { params: data }); }; /** 分类信息---查询当前用户下所有的分类 */ export const fetchGetCategoryUserAllList = () => { - return http.request>('get', 'categoryUser/noManage/getCategoryUserAllList'); + return http.request>('get', 'category/noManage/getCategoryUserAllList'); }; /** 分类信息---添加分类信息 */ export const fetchAddCategoryUser = (data: any) => { - return http.request>('post', 'categoryUser/noManage/addCategoryUser', { data }); + return http.request>('post', 'category/noManage/addCategoryUser', { data }); }; /** 分类信息---更新分类信息 */ export const fetchUpdateCategoryUser = (data: any) => { - return http.request>('put', 'categoryUser/noManage/updateCategoryUser', { data }); + return http.request>('put', 'category/noManage/updateCategoryUser', { data }); }; /** 分类信息---删除分类信息 */ export const fetchDeleteCategoryUser = (data: any) => { - return http.request>('delete', 'categoryUser/noManage/deleteCategoryUser', { data }); + return http.request>('delete', 'category/noManage/deleteCategoryUser', { data }); }; diff --git a/src/layout/components/lay-bill/index.vue b/src/layout/components/lay-bill/index.vue index de18434..7ac0c3c 100644 --- a/src/layout/components/lay-bill/index.vue +++ b/src/layout/components/lay-bill/index.vue @@ -1,5 +1,5 @@