Skip to content

Commit

Permalink
feat: add TRANSLATE_HOST and TRANSLATE_EXTERNAL_HOST for different to…
Browse files Browse the repository at this point in the history
… run as docker

增加 TRANSLATE_EXTERNAL_HOST TRANSLATE_HOST 让容器环境下,可以区分部署翻译服务
  • Loading branch information
sinlov committed Apr 24, 2023
1 parent 83cbb08 commit 7b57c33
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 20 deletions.
19 changes: 11 additions & 8 deletions docker/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
- `.env` 文件内配置

```env
# 对外暴露的 hostname 用于访问
EXTERNAL_HOST="192.168.1.100"
# 工具服务端口,不设置默认为 12833
PORT="12833"
# 本地翻译服务是额外的一个配置,所以需要额外配置生效
# 翻译服务 port 可以不设置,不设置默认为 19212
#TRANSLATE_PORT="19212"
# 如果是 docker 部署 不要设置,自动获取
#TRANSLATE_HOST="localhost"
# 翻译服务 port 可以不设置
TRANSLATE_PORT="19212"
# 对外暴露的 翻译服务 port
# 对外暴露的 翻译服务用于 docker 环境 必须设置
TRANSLATE_EXTERNAL_HOST="192.168.1.100"
TRANSLATE_EXTERNAL_PORT="39011"
# 翻译机配置 https://bobtranslate.com/service/translate/tencent.html
Expand Down Expand Up @@ -50,9 +53,9 @@ services:
environment:
- TENCENT_SECRET_ID=AKIDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- TENCENT_SECRET_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- EXTERNAL_HOST=192.168.50.60 # 外部访问地址,也可以是域名
- TRANSLATE_PORT=19212
- TRANSLATE_EXTERNAL_PORT=39011
- TRANSLATE_PORT=19212 # 容器运行本地翻译服务 port
- TRANSLATE_EXTERNAL_HOST=192.168.50.60 # 外部访问翻译服务地址,也可以是域名
- TRANSLATE_EXTERNAL_PORT=39011 # 外部访问翻译服务端口
ports:
- '39011:19212' # TRANSLATE_EXTERNAL_PORT:TRANSLATE_PORT
- '39010:12833' # EXTERNAL_PORT:PORT
Expand Down
8 changes: 2 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,16 +151,12 @@ OPS 支持使用 [Notion](https://www.notion.so/) 来管理自己的词典,使
```env
# 工具服务端口,不设置默认为 12833
PORT="12833"
# 对外暴露的 hostname 用于代理访问
EXTERNAL_HOST="localhost"
# 本地翻译服务是额外的一个配置,所以需要额外配置生效
# 翻译服务 port 可以不设置,不设置默认为 19212
TRANSLATE_PORT="19212"
# 对外暴露的 翻译服务 port 用于 docker 环境
#TRANSLATE_EXTERNAL_PORT="39011"
# 可以不设置,自动获取
TRANSLATE_HOST="localhost"
# 翻译机配置 https://bobtranslate.com/service/translate/tencent.html
TENCENT_SECRET_ID="AKIDXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
Expand Down
14 changes: 10 additions & 4 deletions server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,14 @@ app.post("/prompt-studio/translate/prompts", async (req: any, res: any) => {
})

const port = process.env.TRANSLATE_PORT || 19212
const host = process.env.EXTERNAL_HOST || "localhost"

app.listen({port: port, host: host}, () => {
console.log(`Server started on port ${port} EXTERNAL_HOST ${process.env.EXTERNAL_HOST}`)
})
if (process.env.TRANSLATE_HOST) {
const host = process.env.TRANSLATE_HOST || "localhost"
app.listen({port: port, host: host}, () => {
console.log(`Server started on port ${port} TRANSLATE_HOST: ${process.env.TRANSLATE_HOST}`)
})
} else {
app.listen(port, () => {
console.log(`Server started on port ${port}`)
})
}
4 changes: 2 additions & 2 deletions src/Compoents/PromptEditor/Lib/translatePrompts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export async function translatePrompts(testList: string[], options?: { server?:
})

let host = (<any>globalThis).__OPS_SERVER
if (process.env.EXTERNAL_HOST){
host = String(host).replace(/localhost/, process.env.EXTERNAL_HOST)
if (process.env.TRANSLATE_EXTERNAL_HOST){
host = String(host).replace(/localhost/, process.env.TRANSLATE_EXTERNAL_HOST)
if (process.env.TRANSLATE_EXTERNAL_PORT) {
host = host.replace(/:19212/, `:${process.env.TRANSLATE_EXTERNAL_PORT}`)
}
Expand Down
3 changes: 3 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ let config = {
},
define: {
'process.env': {
PORT: process.env.PORT || "",
EXTERNAL_HOST: process.env.EXTERNAL_HOST || "",
TRANSLATE_HOST: process.env.TRANSLATE_HOST || "",
TRANSLATE_PORT: process.env.TRANSLATE_PORT || "19212",
TRANSLATE_EXTERNAL_HOST: process.env.TRANSLATE_EXTERNAL_HOST || "19212",
TRANSLATE_EXTERNAL_PORT: process.env.TRANSLATE_EXTERNAL_PORT || "39011",
}
}
Expand Down

0 comments on commit 7b57c33

Please sign in to comment.