1 parent
dc188b1ed8
commit
d6cc81ed87
53 files changed
+909
-127
No files matched your search
@@ -1,5 +1,5 @@
|
||||
VITE_DEV_BACKEND_URL=http://127.0.0.1:5201
|
||||
VITE_DEV_BACKEND_ORIGIN=https://xuans.com
|
||||
VITE_DEV_FRONTEND_ORIGIN=https://xuans.com
|
||||
SMAIL_DEV_TLS_CERTIFICATE=../config/ssl/xuans.com.crt
|
||||
SMAIL_DEV_TLS_PRIVATE_KEY=../config/ssl/xuans.com.key
|
||||
SMAIL_DEV_TLS_CERTIFICATE=../data/ssl/xuans.com.crt
|
||||
SMAIL_DEV_TLS_PRIVATE_KEY=../data/ssl/xuans.com.key
|
||||
+1
-1
@@ -18,7 +18,7 @@ yarn dev
|
||||
VITE_DEV_BACKEND_URL=http://127.0.0.1:5201
|
||||
```
|
||||
|
||||
前端开发服务使用 `config/ssl` 下的证书提供 HTTPS,HTTP `80` 只负责跳转到 HTTPS。生产环境应使用有效证书,并由正式 Web 服务器承载前端入口。
|
||||
前端开发服务使用 `data/ssl` 下的证书提供 HTTPS,HTTP `80` 只负责跳转到 HTTPS。生产环境应使用有效证书,并由正式 Web 服务器承载前端入口。生产构建不读取本机开发证书。
|
||||
|
||||
### 生产构建
|
||||
|
||||
|
||||
@@ -131,9 +131,9 @@ const lang = {
|
||||
"ssl_crt_path": "SSL 证书路径",
|
||||
"ssl_auto_storage_title": "自动证书保存位置",
|
||||
"ssl_auto_storage_desc": "自动申请成功后,证书由系统统一保存和轮换,不需要手动填写证书路径。",
|
||||
"ssl_auto_certificate_path": "证书:./config/ssl/managed/default/current/public.crt",
|
||||
"ssl_auto_private_key_path": "私钥:./config/ssl/managed/default/current/private.key",
|
||||
"ssl_auto_account_key_path": "ACME 账户密钥:./config/ssl/account_private.pem",
|
||||
"ssl_auto_certificate_path": "证书:./data/ssl/managed/default/current/public.crt",
|
||||
"ssl_auto_private_key_path": "私钥:./data/ssl/managed/default/current/private.key",
|
||||
"ssl_auto_account_key_path": "ACME 账户密钥:./data/ssl/account_private.pem",
|
||||
"ssl_manual_key_desc": "可填写服务器上任意可读取的完整路径,也可填写相对于 Smail 目录的路径;系统校验后会导入受控目录。",
|
||||
"ssl_manual_crt_desc": "可填写服务器上任意可读取的完整路径,也可填写相对于 Smail 目录的路径;证书必须与私钥匹配。",
|
||||
"ssl_dns_title": "DNS验证记录",
|
||||
|
||||
@@ -74,7 +74,7 @@ export function usePage() {
|
||||
|
||||
const dbSettings = reactive({
|
||||
"type": "sqlite",
|
||||
"dsn": "./config/smail.db",
|
||||
"dsn": "./data/smail.db",
|
||||
"mode": "fields",
|
||||
"user": "",
|
||||
"host": "127.0.0.1",
|
||||
@@ -92,8 +92,8 @@ export function usePage() {
|
||||
const sslSettings = reactive({
|
||||
"type": "0",
|
||||
"challenge": "",
|
||||
"key_path": "./config/ssl/private.key",
|
||||
"crt_path": "./config/ssl/public.crt",
|
||||
"key_path": "./data/ssl/private.key",
|
||||
"crt_path": "./data/ssl/public.crt",
|
||||
"paramsList": [],
|
||||
})
|
||||
|
||||
@@ -223,7 +223,7 @@ export function usePage() {
|
||||
databaseError.value = ""
|
||||
|
||||
if (dbSettings.type === "sqlite" && !dbSettings.dsn) {
|
||||
dbSettings.dsn = "./config/smail.db";
|
||||
dbSettings.dsn = "./data/smail.db";
|
||||
}
|
||||
|
||||
const usesStructuredFields = dbSettings.type === "mysql" || dbSettings.type === "postgres"
|
||||
@@ -295,7 +295,7 @@ export function usePage() {
|
||||
dbSettings.name = "smail"
|
||||
} else {
|
||||
dbSettings.mode = "dsn"
|
||||
dbSettings.dsn = "./config/smail.db"
|
||||
dbSettings.dsn = "./data/smail.db"
|
||||
dbSettings.host = "127.0.0.1"
|
||||
dbSettings.port = ""
|
||||
dbSettings.name = ""
|
||||
|
||||
@@ -181,13 +181,13 @@ const sslGroups = [
|
||||
field('tls.certificateRef', '证书文件', 'text', {
|
||||
wide: true,
|
||||
show: externalManagedCertificate,
|
||||
placeholder: 'config/ssl/example.com/fullchain.pem',
|
||||
placeholder: 'data/ssl/example.com/fullchain.pem',
|
||||
hint: '填写后端服务器上的 PEM 证书路径。自定义模式支持绝对路径或相对运行根目录的路径,保存后显示导入后的受管路径;Web 服务器管理模式填写已有受管证书的相对路径。'
|
||||
}),
|
||||
field('tls.privateKeyRef', '私钥文件', 'text', {
|
||||
wide: true,
|
||||
show: externalManagedCertificate,
|
||||
placeholder: 'config/ssl/example.com/privkey.pem',
|
||||
placeholder: 'data/ssl/example.com/privkey.pem',
|
||||
hint: '填写与证书匹配的 PEM 私钥文件路径,不是私钥内容。文件必须可被后端运行用户读取;自定义模式保存后显示受管副本的路径。'
|
||||
})
|
||||
])
|
||||
|
||||
@@ -32,13 +32,13 @@ const developmentHTTPRedirect = (frontendOrigin, host = '127.0.0.1', port = 80)
|
||||
})
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig(({ mode }) => {
|
||||
export default defineConfig(({ mode, command }) => {
|
||||
const env = loadEnv(mode, process.cwd(), '')
|
||||
const backendUrl = (env.VITE_DEV_BACKEND_URL || 'http://127.0.0.1:5201').replace(/\/$/, '')
|
||||
const backendOrigin = (env.VITE_DEV_BACKEND_ORIGIN || 'https://xuans.com').replace(/\/$/, '')
|
||||
const frontendOrigin = (env.VITE_DEV_FRONTEND_ORIGIN || 'https://xuans.com').replace(/\/$/, '')
|
||||
const certificatePath = path.resolve(process.cwd(), env.SMAIL_DEV_TLS_CERTIFICATE || '../config/ssl/xuans.com.crt')
|
||||
const privateKeyPath = path.resolve(process.cwd(), env.SMAIL_DEV_TLS_PRIVATE_KEY || '../config/ssl/xuans.com.key')
|
||||
const certificatePath = path.resolve(process.cwd(), env.SMAIL_DEV_TLS_CERTIFICATE || '../data/ssl/xuans.com.crt')
|
||||
const privateKeyPath = path.resolve(process.cwd(), env.SMAIL_DEV_TLS_PRIVATE_KEY || '../data/ssl/xuans.com.key')
|
||||
|
||||
return {
|
||||
plugins: [
|
||||
@@ -60,10 +60,11 @@ export default defineConfig(({ mode }) => {
|
||||
host: '127.0.0.1',
|
||||
port: 443,
|
||||
strictPort: true,
|
||||
https: {
|
||||
// 生产构建不依赖本机开发证书,只有开发服务器启动时才读取私钥。
|
||||
https: command === 'serve' ? {
|
||||
cert: readFileSync(certificatePath),
|
||||
key: readFileSync(privateKeyPath)
|
||||
},
|
||||
} : undefined,
|
||||
cors: true,
|
||||
proxy: {
|
||||
"/api": {
|
||||
|
||||
Reference in new issue
Block a user