Browse Source

add admin at dtm.pub

pull/294/head
yedf2 4 years ago
parent
commit
bdf4ef3436
  1. 3
      .github/workflows/release.yml
  2. 10
      main.go

3
.github/workflows/release.yml

@ -34,6 +34,7 @@ jobs:
- name: Scp admin - name: Scp admin
env: env:
host: 'ubuntu@en.dtm.pub' host: 'ubuntu@en.dtm.pub'
host2: 'ubuntu@dtm.pub'
dest: '/data/dtm-admin/' dest: '/data/dtm-admin/'
run: | run: |
cd admin cd admin
@ -42,6 +43,8 @@ jobs:
tar -cvzf dist.tar.gz dist tar -cvzf dist.tar.gz dist
scp -i deploy_key -o StrictHostKeyChecking=no dist.tar.gz ${{env.host}}:${{env.dest}} 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' 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 rm deploy_key dist.tar.gz
echo > dist/placeholder echo > dist/placeholder
cd .. cd ..

10
main.go

@ -14,6 +14,8 @@ import (
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
"os"
"strings"
"github.com/dtm-labs/dtm/dtmcli/logger" "github.com/dtm-labs/dtm/dtmcli/logger"
"github.com/dtm-labs/dtm/dtmsvr/config" "github.com/dtm-labs/dtm/dtmsvr/config"
@ -36,7 +38,7 @@ func main() {
//go:embed admin/dist //go:embed admin/dist
var admin embed.FS var admin embed.FS
var target = "admin.dtm.pub" var target = ""
func getSub(f1 fs.FS, sub string) fs.FS { func getSub(f1 fs.FS, sub string) fs.FS {
f2, err := fs.Sub(f1, sub) f2, err := fs.Sub(f1, sub)
@ -65,6 +67,12 @@ func addAdmin(app *gin.Engine, conf *config.Type) {
app.GET("/", proxyAdmin) app.GET("/", proxyAdmin)
app.GET("/assets/*name", proxyAdmin) app.GET("/assets/*name", proxyAdmin)
app.GET("/admin/*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 proxied to %s", target)
} }
logger.Infof("admin is running at: http://localhost:%d", conf.HTTPPort) logger.Infof("admin is running at: http://localhost:%d", conf.HTTPPort)

Loading…
Cancel
Save