From bdf4ef34360d2f78e469ac96fe53b9d5e44784b8 Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Wed, 18 May 2022 11:33:24 +0800 Subject: [PATCH] add admin at dtm.pub --- .github/workflows/release.yml | 3 +++ main.go | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2ca1210..59a61df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,7 @@ jobs: - name: Scp admin env: host: 'ubuntu@en.dtm.pub' + host2: 'ubuntu@dtm.pub' dest: '/data/dtm-admin/' run: | cd admin @@ -42,6 +43,8 @@ jobs: tar -cvzf dist.tar.gz dist scp -i deploy_key -o StrictHostKeyChecking=no dist.tar.gz ${{env.host}}:${{env.dest}} ssh -i deploy_key -o StrictHostKeyChecking=no ${{env.host}} 'cd ${{env.dest}} && tar -zvxf dist.tar.gz' + scp -i deploy_key -o StrictHostKeyChecking=no dist.tar.gz ${{env.host2}}:${{env.dest}} + ssh -i deploy_key -o StrictHostKeyChecking=no ${{env.host2}} 'cd ${{env.dest}} && tar -zvxf dist.tar.gz' rm deploy_key dist.tar.gz echo > dist/placeholder cd .. diff --git a/main.go b/main.go index 90e33d9..2675a9b 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,8 @@ import ( "net/http" "net/http/httputil" "net/url" + "os" + "strings" "github.com/dtm-labs/dtm/dtmcli/logger" "github.com/dtm-labs/dtm/dtmsvr/config" @@ -36,7 +38,7 @@ func main() { //go:embed admin/dist var admin embed.FS -var target = "admin.dtm.pub" +var target = "" func getSub(f1 fs.FS, sub string) fs.FS { f2, err := fs.Sub(f1, sub) @@ -65,6 +67,12 @@ func addAdmin(app *gin.Engine, conf *config.Type) { app.GET("/", proxyAdmin) app.GET("/assets/*name", proxyAdmin) app.GET("/admin/*name", proxyAdmin) + lang := os.Getenv("LANG") + if strings.HasPrefix(lang, "zh_CN") { + target = "dtm.pub" + } else { + target = "end.dtm.pub" + } logger.Infof("admin is proxied to %s", target) } logger.Infof("admin is running at: http://localhost:%d", conf.HTTPPort)