This commit is contained in:
yin 2026-09-10 18:04:04 +08:00
parent fd9dce6ecd
commit 598f60c6a3
9 changed files with 682 additions and 184 deletions

View File

@ -12,4 +12,13 @@ VITE_APP_IM_API_URL=https://your-im-server.com/api
# frontConfig.getByDomain 品牌豁免域名(逗号分隔,可多个;留空=不豁免,便于本地调试品牌配置)
# 注意:主域名被豁免后访问主域名将不拉取品牌(显示默认「天豹云仓」);要在 localhost 验证品牌标题请勿把 localhost 加入豁免
VITE_FRONT_CONFIG_EXEMPT_HOSTS = 'wms.wms.gztbyc.com'
VITE_FRONT_CONFIG_EXEMPT_HOSTS = 'wms.wms.gztbyc.com,127.0.0.1'
# 本地开发:浏览器直传对象存储(COS)跨域(CORS)绕过开关
# 存储桶 CORS 白名单不含开发机域名时,直传会被浏览器拦截(文件其实已上传,但响应读不到)。
# 开启后前端把直传地址改写成同源 /cos-proxy/...,由 vite dev server 转发(仅 dev 生效)
# 取值:off = 关闭(改回直传,可用于验证存储桶 CORS 是否已配好);其它/不配置 = 开启
VITE_COS_DEV_PROXY = 'on'
# /cos-proxy 代理目标存储桶,必须与后端 index.getCOSUploadConfig 返回的 uploadUrl 主机一致
VITE_COS_DEV_PROXY_TARGET = 'https://ye4s-1255377868.cos.ap-guangzhou.myqcloud.com'

View File

@ -0,0 +1,101 @@
# 本地开发:对象存储(COS)直传跨域(CORS)绕过方案
## 现象
`stock/stock` 图片组件、`basicManagement → 前端独立部署` 品牌图片上传等「浏览器直传 COS」的功能,在本地开发时控制台报 CORS 错误:
| 请求 | 结果 |
| --- | --- |
| `index.getCOSUploadConfig`(xhr) | 200 ✅(接口正常) |
| `https://<bucket>.cos.<region>.myqcloud.com/`(fetch) | ❌ CORS 错误 |
⚠️ 易误判:报错的**不是** `index.getCOSUploadConfig`,而是它之后浏览器直传存储桶的 `fetch`。
响应头里有 `Vary: Origin, Access-Control-Request-Headers, Access-Control-Request-Method`,但没有 `Access-Control-Allow-Origin`。
另外注意:网络面板里这条 COS 请求往往已经是 **200 + ETag + Location**,即**文件其实已上传成功**,只是浏览器不允许 JS 读取响应,于是 `uploadSuccessNotify` 不执行、URL 也填不进去。
## 根因定位(一条命令)
```powershell
curl.exe -s -X OPTIONS "https://<bucket>.cos.<region>.myqcloud.com/" `
-H "Origin: http://localhost:5175" -H "Access-Control-Request-Method: POST"
```
返回即说明存储桶 CORS 未放行当前站点域名:
```xml
<Error>
<Code>AccessForbidden</Code>
<Message>CORSResponse: This CORS request is not allowed ... not whitelisted by the resource's CORS spec</Message>
</Error>
```
## 方案 A:配置存储桶 CORS(根治,需腾讯云控制台权限)
控制台 → 对象存储 COS → 存储桶 → **安全管理 → 跨域访问 CORS 设置 → 添加规则**:
| 配置项 | 建议值 |
| --- | --- |
| 来源 Origin | `*`(开发期);生产改为 `https://前端域名`,多个一行一个 |
| 操作 Methods | `GET`、`POST`、`PUT`、`HEAD`、`DELETE` |
| Allow-Headers | `*` |
| Expose-Headers | `ETag`、`Location`、`x-cos-request-id` |
| 超时 Max-Age | `600` |
```xml
<CORSConfiguration>
<CORSRule>
<AllowedOrigin>*</AllowedOrigin>
<AllowedMethod>GET</AllowedMethod>
<AllowedMethod>POST</AllowedMethod>
<AllowedMethod>PUT</AllowedMethod>
<AllowedMethod>HEAD</AllowedMethod>
<AllowedMethod>DELETE</AllowedMethod>
<AllowedHeader>*</AllowedHeader>
<ExposeHeader>ETag</ExposeHeader>
<ExposeHeader>Location</ExposeHeader>
<MaxAgeSeconds>600</MaxAgeSeconds>
</CORSRule>
</CORSConfiguration>
```
> 线上域名也必须在白名单里,否则线上同样失败。
## 方案 B:本地开发走同源代理(已实现,生产不生效)
dev 下把直传地址改写为同源路径 `/cos-proxy/...`,由 vite dev server 转发到存储桶;浏览器侧变成同源请求,不再有 CORS 检查。
涉及的三个文件:
| 文件 | 作用 |
| --- | --- |
| `src/utils/cosDevProxyConfig.ts` | 共享常量:代理前缀 `/cos-proxy`、默认目标存储桶、开关取值 `off` |
| `vite.config.ts` | dev server 挂 `server.proxy['/cos-proxy']`(`changeOrigin: true`、去 `Origin/Referer`、去掉前缀) |
| `src/utils/cosImageUpload.ts` | `resolveUploadUrl()`:`import.meta.env.DEV` 且目标 host 匹配时才改写,`fetch` 用改写后的地址 |
环境变量(`.env.development`):
```ini
VITE_COS_DEV_PROXY = 'on' # off = 关闭(改回直传,可验证存储桶 CORS 是否已配好)
VITE_COS_DEV_PROXY_TARGET = 'https://<bucket>.cos.<region>.myqcloud.com'
```
### 关键点
- **只影响 dev**:`import.meta.env.DEV` 守卫,生产构建里 `resolveUploadUrl` 直接原样返回。
- **不改后端**:COS 的 POST Object 表单签名只覆盖 policy,不绑定 Host,所以代理转发后签名依然有效。
- **请求体原样流式转发**:multipart 边界与 `Content-Length` 不变,表单字段、文件都完整到达 COS。
- **`changeOrigin: true`**:转发时 Host 换成存储桶域名;同时在 `proxyReq` 上移除 `Origin`/`Referer`,避免存储桶按 CORS 规则判定。
- 已在两个上传入口生效:`src/utils/cosImageUpload.ts`(`basicManagement → 前端独立部署` 品牌图片)与 `src/components/ImagesUpload/index.vue`(`stock/stock` 图片组件)。
## 验证命令
```powershell
# 1) 代理是否生效(不是返回前端 HTML,而是 COS 的 XML 错误即说明已转发)
curl.exe -s -X POST "http://localhost:5174/cos-proxy/" -H "Origin: http://localhost:5174"
# 2) multipart 请求体是否完整转发(应返回 COS 的 InvalidPolicyDocument,且不会创建对象)
curl.exe -s -X POST "http://localhost:5174/cos-proxy/" `
-F "key=probe/not-created.png" -F "policy=invalid" -F "signature=invalid" `
-F "file=@public/logo/1.png"
```

4
env.d.ts vendored
View File

@ -3,6 +3,10 @@
interface ImportMetaEnv {
/** frontConfig.getByDomain 品牌豁免域名(逗号分隔多个;显式置空=不豁免,未配置回退主域名 wms.wms.gztbyc.com) */
readonly VITE_FRONT_CONFIG_EXEMPT_HOSTS?: string
/** 本地开发:对象存储直传 CORS 绕过开关(`off` 关闭,默认开启;仅 dev 生效) */
readonly VITE_COS_DEV_PROXY?: string
/** 本地开发:`/cos-proxy` 代理目标存储桶(默认见 src/utils/cosDevProxyConfig.ts) */
readonly VITE_COS_DEV_PROXY_TARGET?: string
}
declare module '@/utils/auth' {

View File

@ -122,6 +122,7 @@ import { Plus, Camera, CameraFilled } from '@element-plus/icons-vue'
import * as indexApi from '@/api/index/index'
import SparkMD5 from 'spark-md5'
import { useUserStore } from '@/stores/modules/user'
import { resolveUploadUrl } from '@/utils/cosImageUpload'
const props = defineProps<{
type: string
@ -312,7 +313,8 @@ const uploadFile = async (file: any) => {
}
formData.append('file', rawFile)
const response = await fetch(cosConfig.uploadUrl, {
// 本地开发:改写成同源代理地址绕过对象存储 CORS(生产原样直传,见 utils/cosImageUpload.ts)
const response = await fetch(resolveUploadUrl(cosConfig.uploadUrl), {
method: 'POST',
headers: cosConfig.headers || {},
body: formData

View File

@ -0,0 +1,24 @@
/**
* 本地开发「对象存储直传跨域(CORS)」绕过的共享配置。
*
* 背景:浏览器直传 COS 时,响应必须带 `Access-Control-Allow-Origin`,否则浏览器判定跨域失败
* (即使文件已上传成功,JS 也读不到响应)。开发机域名通常不在存储桶 CORS 白名单里,
* 因此 dev 环境把直传地址改写成同源路径 `/cos-proxy/...`,由 vite dev server 代理转发到存储桶,
* 浏览器侧就变成同源请求,不再有 CORS 检查。
*
* 生产构建**不使用**该代理(`src/utils/cosImageUpload.ts` 里有 `import.meta.env.DEV` 守卫)。
*
* 该文件被多处引用,请保持"纯常量、无副作用":
* - `vite.config.ts`(读 env 决定代理 target)
* - `src/utils/cosImageUpload.ts`(dev 下改写 uploadUrl)
* - `env.d.ts`(类型声明)
*/
/** dev 代理路径前缀(与 vite.config.ts 的 server.proxy key 保持一致) */
export const COS_DEV_PROXY_PREFIX = '/cos-proxy'
/** 默认代理目标:与后端 `index.getCOSUploadConfig` 返回的 uploadUrl 主机一致 */
export const DEFAULT_COS_DEV_PROXY_TARGET = 'https://ye4s-1255377868.cos.ap-guangzhou.myqcloud.com'
/** 开关取值:`VITE_COS_DEV_PROXY = 'off'` 时关闭(改为直传,便于验证存储桶 CORS 是否已配好) */
export const COS_DEV_PROXY_OFF = 'off'

202
src/utils/cosImageUpload.ts Normal file
View File

@ -0,0 +1,202 @@
import SparkMD5 from 'spark-md5'
import { getCOSUploadConfig, uploadSuccessNotify } from '@/api/index/index'
import { COS_DEV_PROXY_PREFIX, COS_DEV_PROXY_OFF, DEFAULT_COS_DEV_PROXY_TARGET } from '@/utils/cosDevProxyConfig'
/**
* 图片直传对象存储(与 stock/stock 「图片」组件 `src/components/ImagesUpload/index.vue` 同一套接口):
*
* 1. `index.getCOSUploadConfig` 取直传配置(同 MD5 命中时 `isNew === false`,可直接复用已有文件)
* 2. `fetch` 直传对象存储(不经过项目 request 封装,因此不带 Authorization)
* 3. `index.uploadSuccessNotify` 通知后端登记文件,返回文件信息(含图片 URL)
*
* 本地开发补充:存储桶若未把开发机域名加进 CORS 白名单,第 2 步会被浏览器拦截
* (文件其实已上传成功,只是响应读不到)。因此 dev 下会把直传地址改写成同源代理
* `/cos-proxy/...`,由 vite dev server 转发到存储桶,见 `resolveUploadUrl()` 与
* `src/utils/cosDevProxyConfig.ts`;生产环境(含 staging)不做任何改写。
*
* 注意:本函数只负责"拿到图片 URL / file_id",若要建立业务关联仍需调用方自行处理
* (如 stock 图片组件是另外调 `index.ReferenceFile` 传 `file_id`)。
*/
/** index.getCOSUploadConfig 返回的直传配置 */
export type CosUploadConfig = Record<string, unknown> & {
uploadUrl?: string
upload_url?: string
headers?: Record<string, string>
data?: Record<string, unknown>
fileInfo?: Record<string, unknown>
isNew?: boolean
error?: boolean
msg?: string
fileId?: number | string
file_id?: number | string
}
export type CosUploadedFile = {
/** 图片可访问地址(fileUrl / file_url) */
fileUrl: string
/** 后端文件记录 ID(需要建立业务关联时使用) */
fileId?: number | string
/** 后端返回的原始文件信息 */
raw: Record<string, unknown>
}
const CHUNK_SIZE = 2 * 1024 * 1024 // 分片 2MB(与 ImagesUpload 一致)
const QUICK_MD5_MAX_SIZE = 5 * 1024 * 1024 // 5MB 以下一次性计算
/** 需要走同源代理的存储桶 host(仅 dev 生效,非 dev 为空串表示不启用) */
const devProxyHost = (() => {
if (!import.meta.env.DEV) return ''
if (import.meta.env.VITE_COS_DEV_PROXY === COS_DEV_PROXY_OFF) return ''
const target = String(import.meta.env.VITE_COS_DEV_PROXY_TARGET || DEFAULT_COS_DEV_PROXY_TARGET).trim()
try {
return new URL(target).host
} catch {
return ''
}
})()
/**
* dev 下把直传地址改写成同源代理:`https://<存储桶>/path?x=1` → `/cos-proxy/path?x=1`
* 同源请求浏览器不做 CORS 检查,由 vite dev server 转发到存储桶;生产/staging 原样返回。
*/
export function resolveUploadUrl(uploadUrl: string): string {
if (!devProxyHost) return uploadUrl
const base = typeof window !== 'undefined' ? window.location.origin : 'http://localhost'
try {
const url = new URL(uploadUrl, base)
// 同源地址(后端已代理)或非目标存储桶:不做改写
if (url.origin === base || url.host !== devProxyHost) return uploadUrl
return `${COS_DEV_PROXY_PREFIX}${url.pathname}${url.search}`
} catch {
return uploadUrl
}
}
function readAsArrayBuffer(blob: Blob): Promise<ArrayBuffer> {
return new Promise((resolve, reject) => {
const reader = new FileReader()
reader.onload = (e) => resolve(e.target?.result as ArrayBuffer)
reader.onerror = () => reject(new Error('读取文件失败'))
reader.readAsArrayBuffer(blob)
})
}
/** 计算文件 MD5:小文件一次算完,大文件按 2MB 分片累加(与 ImagesUpload 保持一致) */
export async function calculateFileMd5(file: File): Promise<string> {
const spark = new SparkMD5.ArrayBuffer()
if (file.size <= QUICK_MD5_MAX_SIZE) {
spark.append(await readAsArrayBuffer(file))
return spark.end()
}
const chunks = Math.ceil(file.size / CHUNK_SIZE)
for (let i = 0; i < chunks; i += 1) {
const start = i * CHUNK_SIZE
spark.append(await readAsArrayBuffer(file.slice(start, Math.min(start + CHUNK_SIZE, file.size))))
}
return spark.end()
}
/** 取直传地址的 host,用于错误提示定位(跨域问题需要知道是哪个存储桶) */
function cosHost(uploadUrl: string): string {
const base = typeof window !== 'undefined' ? window.location.origin : 'http://localhost'
try {
return new URL(uploadUrl, base).host || uploadUrl
} catch {
return uploadUrl
}
}
/**
* 直传 fetch 失败时把浏览器的 `Failed to fetch` 翻译成可定位的提示。
* 浏览器出于安全策略不会暴露 CORS 细节,只会抛统一的 TypeError,
* 所以这里结合"目标不是同源"来推断是存储桶跨域(CORS)配置问题。
*/
function describeUploadError(uploadUrl: string, err: unknown): Error {
const message = err instanceof Error ? err.message : String(err)
if (/failed to fetch|network\s?error|load failed|fetch failed/i.test(message)) {
return new Error(
`上传失败:无法访问存储桶 ${cosHost(uploadUrl)}(跨域 CORS 或网络不通)。` +
`请确认该存储桶的「跨域访问 CORS 设置」已允许当前站点域名(Origin),详见 docs 或联系运维。`
)
}
return err instanceof Error ? err : new Error(message)
}
/** 兼容 fileUrl / file_url / file.file_url */
function pickFileUrl(src: Record<string, unknown>): string {
const nested = src.file as Record<string, unknown> | undefined
const value = src.fileUrl ?? src.file_url ?? nested?.file_url ?? ''
return value ? String(value) : ''
}
/** 兼容 fileId / file_id / file.id */
function pickFileId(src: Record<string, unknown>): number | string | undefined {
const nested = src.file as Record<string, unknown> | undefined
const value = src.fileId ?? src.file_id ?? nested?.id
if (value === null || value === undefined || value === '') return undefined
return value as number | string
}
/**
* 上传图片并返回图片地址
* @param file 待上传的图片文件
* @param ctx 可选业务上下文(type / id),不传也可上传(后端支持仅按文件信息登记)
*/
export async function uploadImageToCos(
file: File,
ctx?: { type?: string; id?: string | number }
): Promise<CosUploadedFile> {
const md5 = await calculateFileMd5(file).catch(() => '')
const configRes: any = await getCOSUploadConfig({
fileName: file.name,
fileType: file.type,
fileSize: file.size,
md5,
...(ctx?.type ? { type: ctx.type } : {}),
...(ctx?.id !== undefined && ctx?.id !== null && ctx?.id !== '' ? { id: ctx.id } : {})
})
const config = ((configRes?.data ?? configRes ?? {}) as CosUploadConfig) || {}
if (config.error) throw new Error(config.msg || '获取上传配置失败')
// 同 MD5 文件已存在:无需重复上传,直接用已有文件信息
if (config.isNew === false) {
const raw = config as Record<string, unknown>
const fileUrl = pickFileUrl(raw)
if (!fileUrl) throw new Error('文件已存在,但未返回图片地址')
return { fileUrl, fileId: pickFileId(raw), raw }
}
const uploadUrl = config.uploadUrl || config.upload_url
if (!uploadUrl) throw new Error('未获取到上传地址')
const formData = new FormData()
if (config.data) {
Object.keys(config.data).forEach((key) => formData.append(key, String(config.data?.[key] ?? '')))
}
formData.append('file', file)
// dev:改写成同源代理地址绕过浏览器 CORS;生产:原样直传存储桶
const requestUrl = resolveUploadUrl(uploadUrl)
let uploadRes: Response
try {
uploadRes = await fetch(requestUrl, {
method: 'POST',
headers: config.headers || {},
body: formData
})
} catch (e) {
throw describeUploadError(uploadUrl, e)
}
if (!uploadRes.ok) throw new Error(`上传失败:${uploadRes.status}`)
// 通知后端登记文件,响应 data 里带回图片 URL(fileUrl/file_url)
const notifyRes: any = await uploadSuccessNotify(config.fileInfo || config)
const info = ((notifyRes?.data ?? notifyRes ?? {}) as Record<string, unknown>) || {}
const fileUrl = pickFileUrl(info)
if (!fileUrl) throw new Error('上传成功但未返回图片地址')
return { fileUrl, fileId: pickFileId(info), raw: info }
}

View File

@ -146,6 +146,14 @@ export const COMMON_TRANSLATIONS: Record<string, Record<string, string>> = {
'2': '重货',
'3': '冷链'
},
/** 波次类型 wave_scope(订单详情/列表同源映射) */
wave_scope: {
'0': '未分配',
'1': '大团购',
'2': '散单',
'3': '小团购',
'4': '单品单件'
},
create_channel: {
'QM': '奇门',
'API': 'API',
@ -893,7 +901,8 @@ export const ORDER_DETAIL_TIME_FIELDS = new Set([
'updated_at',
'delete_at',
'operate_time',
'recheck_time'
'recheck_time',
'intercept_time'
])
export type OrderDetailFieldConfig = {
@ -967,11 +976,16 @@ export const orderDetailFullSections: OrderDetailSectionConfig[] = [
{ prop: 'print_status', label: '打印状态', tag: true },
{ prop: 'sended_status', label: '发货状态', tag: true },
{ prop: 'claim_status', label: '认领状态', tag: true },
{ prop: 'claim_operator_id', label: '认领操作人ID' },
{ prop: 'claim_operator', label: '认领操作人' },
{ prop: 'grab_operator_id', label: '抢单操作人ID' },
{ prop: 'grab_operator', label: '抢单操作人' },
{ prop: 'lock_status', label: '锁定状态', tag: true },
{ prop: 'intercept_status', label: '拦截状态', tag: true },
{ prop: 'print_lock_status', label: '打印锁定', tag: true },
{ prop: 'wave_no', label: '波次号' },
{ prop: 'wave_id', label: '波次ID' },
{ prop: 'wave_scope', label: '波次类型' },
{ prop: 'wave_strategy_version', label: '波次策略版本' },
{ prop: 'wave_scan_result', label: '波次扫描结果' },
{ prop: 'basket_number', label: '篮号' }
@ -1035,6 +1049,7 @@ export const orderDetailFullSections: OrderDetailSectionConfig[] = [
{ prop: 'updated_at', label: '更新时间', time: true },
{ prop: 'delete_at', label: '删除时间', time: true },
{ prop: 'recheck_time', label: '复核时间', time: true },
{ prop: 'intercept_time', label: '拦截时间', time: true },
{ prop: 'operator_name', label: '操作人' },
{ prop: 'operate_time', label: '操作时间', time: true }
]

View File

@ -1,7 +1,8 @@
<!--
FrontConfigForm — 仓库「前端独立部署」配置页(独立标签页,表单项页面)
对接接口:
- setting.warehouse.getFrontConfig:加载当前仓库前端部署配置(品牌 + 域名/证书状态 + cert_pem/key_pem 证书内容回显)
- setting.warehouse.getFrontConfig:加载当前仓库前端部署配置(品牌 + 域名/证书状态,
并把 cert_pem/key_pem 回显到「证书 PEM / 私钥 PEM」输入框,可直接修改后重新上传)
- setting.warehouse.saveFrontConfig:保存品牌配置(title/logo/favicon/login_bg/theme)
- setting.warehouse.saveFrontCert:上传自持域名 HTTPS 证书(domain + pem/key)
该页从基础设置(WarehouseSettingsForm)独立拆出,作为 basicManagement/newview 的
@ -19,56 +20,85 @@
</div>
</div>
<div class="front-config-section">
<el-divider content-position="left" class="front-config-divider">前端独立部署(品牌配置)</el-divider>
<el-alert
v-if="frontCertStatus.level === 'danger' || frontCertStatus.level === 'warning'"
:type="frontCertStatus.level"
:title="frontCertStatus.title"
:description="frontCertStatus.desc"
show-icon
:closable="false"
class="mb-16 front-config-alert"
/>
<el-alert
v-if="frontSyncFailed"
type="error"
title="证书部署同步失败"
:description="frontMeta.last_sync_error || '同步失败,请重新上传证书或稍后重试'"
show-icon
:closable="false"
class="mb-16 front-config-alert"
/>
<!-- 配置回显全量展示(getFrontConfig 响应字段;无数据显式置空占位,不做条件隐藏) -->
<el-descriptions :column="2" border size="small" class="front-config-meta">
<el-descriptions-item label="当前仓库 ID">{{ frontMeta.warehouse_id ?? '—' }}</el-descriptions-item>
<el-descriptions-item label="自持域名">{{ frontMeta.domain || '—' }}</el-descriptions-item>
<el-descriptions-item label="证书状态">
<el-tag :type="frontCertTagType" size="small" effect="plain">{{ frontCertStatus.text }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="证书到期时间">{{ formatFrontDateTime(frontMeta.cert_expire_at) }}</el-descriptions-item>
<el-descriptions-item label="证书内容">
<span v-if="frontHasCert">已配置(见下方回显)</span>
<span v-else>未配置</span>
</el-descriptions-item>
<el-descriptions-item label="配置更新时间">{{ formatFrontDateTime(frontMeta.updated_at) }}</el-descriptions-item>
<el-descriptions-item label="同步状态">{{ frontSyncStatusText }}</el-descriptions-item>
<el-descriptions-item label="同步尝试次数">{{ frontMeta.sync_attempts ?? 0 }} 次</el-descriptions-item>
<el-descriptions-item label="最近同步成功时间">{{ formatFrontDateTime(frontMeta.last_synced_at) }}</el-descriptions-item>
<el-descriptions-item label="最近同步失败原因">{{ frontMeta.last_sync_error || '—' }}</el-descriptions-item>
</el-descriptions>
<el-alert
v-if="frontCertStatus.level === 'danger' || frontCertStatus.level === 'warning'"
:type="frontCertStatus.level"
:title="frontCertStatus.title"
:description="frontCertStatus.desc"
show-icon
:closable="false"
class="front-config-alert"
/>
<el-alert
v-if="frontSyncFailed"
type="error"
title="证书部署同步失败"
:description="frontMeta.last_sync_error || '同步失败,请重新上传证书或稍后重试'"
show-icon
:closable="false"
class="front-config-alert"
/>
<!-- ===== 品牌配置 ===== -->
<section class="front-config-panel">
<header class="front-config-panel__head">
<h3 class="front-config-panel__title">品牌配置</h3>
<p class="front-config-panel__desc">站点标题、Logo、favicon、登录页背景图与主题变量;图片可直接上传自动填入 URL,也可手填;留空即清空</p>
</header>
<el-form label-width="140px" label-position="right" class="front-config-form">
<el-form-item label="站点标题">
<el-input v-model="frontForm.title" maxlength="100" clearable placeholder="站点标题(留空表示清空)" />
<el-input v-model="frontForm.title" class="front-config-field" maxlength="100" clearable placeholder="站点标题(留空表示清空)" />
</el-form-item>
<el-form-item label="Logo 地址">
<el-input v-model="frontForm.logo_url" maxlength="255" clearable placeholder="Logo 图片 URL(留空清空)" />
<div class="front-config-field-row">
<el-input v-model="frontForm.logo_url" class="front-config-field" maxlength="255" clearable placeholder="Logo 图片 URL(留空清空)" />
<el-upload
action="#"
:show-file-list="false"
:http-request="(opt: any) => handleBrandImageUpload(opt, 'logo_url')"
accept="image/*"
class="front-config-upload"
>
<el-button :loading="uploadingField === 'logo_url'" :disabled="frontPageLoading">上传图片</el-button>
</el-upload>
<el-image v-if="frontForm.logo_url" :src="frontForm.logo_url" fit="contain" class="front-config-thumb">
<template #error><span class="front-config-thumb__tip">无效</span></template>
</el-image>
</div>
</el-form-item>
<el-form-item label="favicon 地址">
<el-input v-model="frontForm.favicon_url" maxlength="255" clearable placeholder="favicon 图标 URL(留空清空)" />
<div class="front-config-field-row">
<el-input v-model="frontForm.favicon_url" class="front-config-field" maxlength="255" clearable placeholder="favicon 图标 URL(留空清空)" />
<el-upload
action="#"
:show-file-list="false"
:http-request="(opt: any) => handleBrandImageUpload(opt, 'favicon_url')"
accept="image/*"
class="front-config-upload"
>
<el-button :loading="uploadingField === 'favicon_url'" :disabled="frontPageLoading">上传图片</el-button>
</el-upload>
<el-image v-if="frontForm.favicon_url" :src="frontForm.favicon_url" fit="contain" class="front-config-thumb">
<template #error><span class="front-config-thumb__tip">无效</span></template>
</el-image>
</div>
</el-form-item>
<el-form-item label="登录页背景图">
<el-input v-model="frontForm.login_bg_url" maxlength="255" clearable placeholder="登录页背景图 URL(留空清空)" />
<div class="front-config-field-row">
<el-input v-model="frontForm.login_bg_url" class="front-config-field" maxlength="255" clearable placeholder="登录页背景图 URL(留空清空)" />
<el-upload
action="#"
:show-file-list="false"
:http-request="(opt: any) => handleBrandImageUpload(opt, 'login_bg_url')"
accept="image/*"
class="front-config-upload"
>
<el-button :loading="uploadingField === 'login_bg_url'" :disabled="frontPageLoading">上传图片</el-button>
</el-upload>
<el-image v-if="frontForm.login_bg_url" :src="frontForm.login_bg_url" fit="contain" class="front-config-thumb">
<template #error><span class="front-config-thumb__tip">无效</span></template>
</el-image>
</div>
</el-form-item>
<el-form-item label="主题配置">
<div class="front-theme-editor">
@ -83,75 +113,57 @@
<div class="front-config-hint front-theme-hint">主题仅承载 CSS 变量自定义键(保存后应用为 --&lt;key&gt;);网页名称/Logo/favicon/登录背景等品牌字段见上方表单(getFrontConfig/saveFrontConfig 顶层字段),不再写入主题。</div>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="frontSaving" @click="saveFrontConfig">保存品牌配置</el-button>
<span class="front-config-hint">品牌字段留空即清空;主题删空全部键后保存即清空主题;保存成功后自动重新加载</span>
</el-form-item>
</el-form>
<div class="front-config-panel__footer">
<el-button type="primary" :loading="frontSaving" @click="saveFrontConfig">保存品牌配置</el-button>
<span class="front-config-hint">品牌字段留空即清空;主题删空全部键后保存即清空主题;保存成功后自动重新加载</span>
</div>
</section>
<el-divider content-position="left" class="front-config-divider">前端独立部署(自持域名 & 证书)</el-divider>
<!-- ===== 自持域名 & 证书 ===== -->
<section class="front-config-panel">
<header class="front-config-panel__head">
<h3 class="front-config-panel__title">自持域名 &amp; 证书</h3>
<p class="front-config-panel__desc">域名全局唯一;证书与私钥已回显当前配置,可修改后重新上传</p>
</header>
<el-form label-width="140px" label-position="right" class="front-config-form">
<el-form-item label="自持域名">
<el-input v-model="frontCert.domain" maxlength="100" clearable placeholder="如 self.example.com(全局唯一)" />
<el-input v-model="frontCert.domain" class="front-config-field" maxlength="100" clearable placeholder="如 self.example.com(全局唯一)" />
</el-form-item>
<el-form-item label="证书 PEM">
<el-input v-model="frontCert.pem" type="textarea" :rows="4" placeholder="-----BEGIN CERTIFICATE-----..." />
<el-input
v-model="frontCert.pem"
type="textarea"
:rows="6"
placeholder="-----BEGIN CERTIFICATE-----..."
/>
<div class="front-cert-meta">
<el-tag v-if="frontHasCert" type="success" size="small" effect="plain">已配置</el-tag>
<el-tag v-else type="info" size="small" effect="plain">未配置</el-tag>
<span class="front-config-hint">已回显当前仓库证书,可直接修改;证书到期:{{ formatFrontDateTime(frontMeta.cert_expire_at) }}</span>
<el-button link type="primary" size="small" :disabled="!frontHasCert" @click="copyFrontText(frontMeta.cert_pem)">复制</el-button>
</div>
</el-form-item>
<el-form-item label="私钥 PEM">
<el-input v-model="frontCert.key" type="textarea" :rows="4" placeholder="-----BEGIN PRIVATE KEY-----..." />
</el-form-item>
<el-form-item>
<el-button type="warning" :loading="frontCertSaving" @click="submitFrontCert">上传证书</el-button>
<span class="front-config-hint">上传成功后自动写入证书到期时间、重置同步状态并重新加载配置</span>
<el-input
v-model="frontCert.key"
type="textarea"
:rows="6"
placeholder="-----BEGIN PRIVATE KEY-----..."
/>
<div class="front-cert-meta">
<el-tag v-if="frontHasKey" type="success" size="small" effect="plain">已配置</el-tag>
<el-tag v-else type="info" size="small" effect="plain">未配置</el-tag>
<span class="front-config-hint">已回显当前仓库私钥,可直接修改;私钥敏感,请勿外泄</span>
<el-button link type="primary" size="small" :disabled="!frontHasKey" @click="copyFrontText(frontMeta.key_pem)">复制</el-button>
</div>
</el-form-item>
</el-form>
<!-- 证书内容回显:getFrontConfig 响应返回 cert_pem/key_pem(PEM 原文),仅本仓库设置页可见;
始终渲染该区块,未配置时显式置空占位,有证书时默认展开 -->
<el-divider content-position="left" class="front-config-divider">证书内容回显(cert_pem / key_pem)</el-divider>
<div class="front-cert-echo">
<el-alert
type="info"
show-icon
:closable="false"
class="front-cert-echo__alert"
title="证书内容已直接存库并由 getFrontConfig 回显"
:description="`来自接口响应(仅登录仓库主体 settings 页可见,公共接口 frontConfig.getByDomain 不返回);未配置时为空。证书到期:${formatFrontDateTime(frontMeta.cert_expire_at)}。私钥敏感,请勿外泄。`"
/>
<el-collapse v-model="frontCertEchoOpen" class="front-cert-echo__collapse">
<el-collapse-item name="cert_pem" title="证书 PEM(cert_pem)">
<div class="front-cert-echo__bar">
<el-tag v-if="frontHasCert" type="success" size="small" effect="plain">已配置</el-tag>
<el-tag v-else type="info" size="small" effect="plain">未配置</el-tag>
<el-button size="small" :disabled="!frontHasCert" @click="copyFrontText(frontMeta.cert_pem)">复制证书</el-button>
</div>
<el-input
type="textarea"
:rows="6"
readonly
:model-value="String(frontMeta.cert_pem ?? '')"
placeholder="未配置(空)"
class="front-cert-echo__pem"
/>
</el-collapse-item>
<el-collapse-item name="key_pem" title="私钥 PEM(key_pem · 敏感)">
<div class="front-cert-echo__bar">
<el-tag v-if="frontHasKey" type="success" size="small" effect="plain">已配置</el-tag>
<el-tag v-else type="info" size="small" effect="plain">未配置</el-tag>
<el-button size="small" :disabled="!frontHasKey" @click="copyFrontText(frontMeta.key_pem)">复制私钥</el-button>
</div>
<el-input
type="textarea"
:rows="6"
readonly
:model-value="String(frontMeta.key_pem ?? '')"
placeholder="未配置(空)"
class="front-cert-echo__pem"
/>
</el-collapse-item>
</el-collapse>
<div class="front-config-panel__footer">
<el-button type="warning" :loading="frontCertSaving" @click="submitFrontCert">上传证书</el-button>
<span class="front-config-hint">点击上传生效(域名 + 证书 PEM + 私钥 PEM 均必填)</span>
</div>
</div>
</section>
</div>
</template>
@ -164,6 +176,7 @@ import {
settingWarehouseSaveFrontCert,
unwrapSettingWarehousePayload
} from '@/api/setting.warehouse/settingwarehouse'
import { uploadImageToCos } from '@/utils/cosImageUpload'
defineOptions({ name: 'FrontConfigForm' })
@ -195,8 +208,6 @@ const frontPageLoading = ref(false)
const frontSaving = ref(false)
const frontCertSaving = ref(false)
const frontMeta = reactive<FrontConfigMeta>({})
/** 证书回显折叠面板展开项(有证书时默认展开 cert_pem/key_pem) */
const frontCertEchoOpen = ref<string[]>([])
const frontForm = reactive({ title: '', logo_url: '', favicon_url: '', login_bg_url: '' })
/** 历史遗留 theme 约定键(曾承载 网页名称/主页面Logo/登录页Logo/登录页文字)。
* 现已改由品牌顶层字段(saveFrontConfig:title/logo_url 等)配置,theme 不再约定这些业务键。
@ -238,6 +249,46 @@ async function copyFrontText(text: unknown) {
}
}
// ── 品牌图片上传(Logo / favicon / 登录页背景图):与 stock 图片组件同一套接口,成功后自动回填 URL ──
/** 正在上传的字段(按钮 loading) */
const uploadingField = ref('')
const BRAND_IMAGE_LABELS: Record<string, string> = {
logo_url: 'Logo',
favicon_url: 'favicon',
login_bg_url: '登录页背景图'
}
async function handleBrandImageUpload(
opt: any,
field: 'logo_url' | 'favicon_url' | 'login_bg_url'
) {
const file: File | undefined = opt?.file
if (!file) return
if (!file.type.startsWith('image/')) {
ElMessage.warning('请选择图片文件')
opt?.onError?.(new Error('非图片文件'))
return
}
if (file.size > 10 * 1024 * 1024) {
ElMessage.warning('图片不能超过 10MB')
opt?.onError?.(new Error('图片超过 10MB'))
return
}
uploadingField.value = field
try {
const { fileUrl } = await uploadImageToCos(file)
frontForm[field] = fileUrl
ElMessage.success(`${BRAND_IMAGE_LABELS[field] || '图片'}上传成功,URL 已自动填入(点击「保存品牌配置」生效)`)
opt?.onSuccess?.({ url: fileUrl })
} catch (e) {
ElMessage.error(e instanceof Error ? e.message : '图片上传失败')
opt?.onError?.(e as Error)
} finally {
uploadingField.value = ''
}
}
function fmtFrontDate(ts: number): string {
const d = new Date(ts)
const p = (n: number) => String(n).padStart(2, '0')
@ -332,9 +383,9 @@ async function loadFrontConfig() {
const cfg = unwrapSettingWarehousePayload(res as Record<string, unknown>)
Object.keys(frontMeta).forEach((k) => delete frontMeta[k])
Object.assign(frontMeta, cfg)
// 有证书内容时默认展开证书/私钥回显面板(无则收起,字段仍以「未配置」占位展示)
frontCertEchoOpen.value =
cfg.cert_pem || cfg.key_pem ? ['cert_pem', 'key_pem'] : []
// 证书/私钥回显到上传表单:直接展示当前仓库已配置的证书内容(可修改后重新上传)
frontCert.pem = String(cfg.cert_pem ?? '')
frontCert.key = String(cfg.key_pem ?? '')
frontForm.title = String(cfg.title ?? '')
frontForm.logo_url = String(cfg.logo_url ?? '')
frontForm.favicon_url = String(cfg.favicon_url ?? '')
@ -471,30 +522,104 @@ loadFrontConfig()
gap: 8px;
}
.mb-16 {
margin-bottom: 16px;
}
.front-config-section {
margin-top: 8px;
}
.front-config-divider {
margin: 12px 0;
}
.front-config-meta {
margin-bottom: 12px;
max-width: 720px;
}
.front-config-alert {
margin: 0 0 12px;
max-width: 720px;
max-width: 760px;
}
/* ── 分区面板(品牌配置 / 自持域名 & 证书) ──────────────── */
.front-config-panel {
max-width: 760px;
padding: 16px 20px 18px;
margin-bottom: 14px;
box-sizing: border-box;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 8px;
&__head {
margin-bottom: 16px;
}
&__title {
position: relative;
margin: 0;
padding-left: 10px;
font-size: 14px;
font-weight: 600;
line-height: 20px;
color: #1f2d3d;
&::before {
content: '';
position: absolute;
top: 3px;
left: 0;
width: 3px;
height: 14px;
border-radius: 2px;
background: var(--el-color-primary);
}
}
&__desc {
margin: 4px 0 0 10px;
font-size: 12px;
line-height: 18px;
color: #8c939d;
}
&__footer {
display: flex;
align-items: center;
gap: 10px;
flex-wrap: wrap;
margin-top: 14px;
padding-top: 14px;
border-top: 1px solid #f2f5f9;
.front-config-hint {
margin-left: 0;
}
}
}
.front-config-form {
max-width: 720px;
max-width: 100%;
}
/* 单行输入框固定宽度(不随表单宽度拉伸);文本域铺满剩余宽度 */
.front-config-field {
width: 360px;
max-width: 100%;
}
/* 输入框 + 上传按钮 + 缩略图(Logo / favicon / 登录页背景图) */
.front-config-field-row {
display: flex;
align-items: center;
gap: 8px;
flex-wrap: wrap;
width: 100%;
}
.front-config-upload {
flex: 0 0 auto;
line-height: 1;
}
.front-config-thumb {
flex: 0 0 auto;
width: 56px;
height: 56px;
background: #fafbfd;
border: 1px solid #e8eef7;
border-radius: 6px;
&__tip {
font-size: 12px;
color: #c0c4cc;
}
}
.front-config-hint {
@ -533,29 +658,15 @@ loadFrontConfig()
margin-top: 6px;
}
.front-cert-echo {
max-width: 720px;
.front-cert-meta {
width: 100%;
display: flex;
align-items: center;
gap: 8px;
margin-top: 6px;
&__alert {
margin-bottom: 12px;
}
&__collapse {
margin-bottom: 8px;
}
&__bar {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
margin-bottom: 6px;
}
&__pem {
:deep(.el-textarea__inner) {
font-family: var(--el-font-family-mono), Consolas, Menlo, monospace;
}
.front-config-hint {
margin-left: 0;
}
}
</style>

View File

@ -1,48 +1,78 @@
import { fileURLToPath, URL } from 'node:url'
import path from 'path'
import { defineConfig } from 'vite'
import { defineConfig, loadEnv } from 'vite'
import vue from '@vitejs/plugin-vue'
import vueDevTools from 'vite-plugin-vue-devtools'
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
import { COS_DEV_PROXY_PREFIX, COS_DEV_PROXY_OFF, DEFAULT_COS_DEV_PROXY_TARGET } from './src/utils/cosDevProxyConfig'
// https://vite.dev/config/
export default defineConfig({
plugins: [
vue(),
vueDevTools(),
createSvgIconsPlugin({
// Specify the icon folder to be cached
iconDirs: [path.resolve(process.cwd(), 'src/icons/svg')],
// Specify symbolId format
symbolId: 'icon-[dir]-[name]',
}),
],
server: {
export default defineConfig(({ mode }) => {
const env = loadEnv(mode, process.cwd(), 'VITE_')
// 本地开发:浏览器直传对象存储会被跨域(CORS)拦截,这里挂一条同源代理绕过。
// 仅 dev server 生效,生产构建/部署不包含该代理。
const cosProxyEnabled = env.VITE_COS_DEV_PROXY !== COS_DEV_PROXY_OFF
const cosProxyTarget = env.VITE_COS_DEV_PROXY_TARGET || DEFAULT_COS_DEV_PROXY_TARGET
const cosProxyPrefixRe = new RegExp(`^${COS_DEV_PROXY_PREFIX}`)
return {
plugins: [
vue(),
vueDevTools(),
createSvgIconsPlugin({
// Specify the icon folder to be cached
iconDirs: [path.resolve(process.cwd(), 'src/icons/svg')],
// Specify symbolId format
symbolId: 'icon-[dir]-[name]',
}),
],
server: {
port: 5174,
host: '0.0.0.0',
// 允许所有主机访问开发服务器(如 test.wms.com、局域网 IP 等)
allowedHosts: true,
proxy: {
'/dev-api': {
target: 'http://localhost:9528', // Assuming Vue 2 backend is running here, user can change
changeOrigin: true,
rewrite: (path) => path.replace(/^\/dev-api/, '')
},
'/dl-api': {
target: 'https://dl.wms.gztbyc.com',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/dl-api/, '')
},
// 海康 SDK ISAPI 请求 → 本地代理 → NVR
'/ISAPI': {
target: 'http://localhost:17311',
changeOrigin: true
proxy: {
'/dev-api': {
target: 'http://localhost:9528', // Assuming Vue 2 backend is running here, user can change
changeOrigin: true,
rewrite: (path) => path.replace(/^\/dev-api/, '')
},
'/dl-api': {
target: 'https://dl.wms.gztbyc.com',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/dl-api/, '')
},
// 海康 SDK ISAPI 请求 → 本地代理 → NVR
'/ISAPI': {
target: 'http://localhost:17311',
changeOrigin: true
},
// 对象存储直传同源代理:/cos-proxy/<原路径> → <存储桶>/<原路径>
// 把浏览器直传变成同源请求,绕过存储桶 CORS 白名单限制(详见 src/utils/cosDevProxyConfig.ts)
...(cosProxyEnabled
? {
[COS_DEV_PROXY_PREFIX]: {
target: cosProxyTarget,
changeOrigin: true,
secure: true,
rewrite: (path) => path.replace(cosProxyPrefixRe, '') || '/',
configure: (proxy) => {
// 去掉浏览器带来的 Origin / Referer,避免存储桶按 CORS 规则判定请求
proxy.on('proxyReq', (proxyReq) => {
proxyReq.removeHeader('origin')
proxyReq.removeHeader('referer')
})
}
}
}
: {})
}
}
},
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url))
},
},
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url))
},
},
}
})