From f280ff3a22f6c6e234614012b1b8a12a7ab30533 Mon Sep 17 00:00:00 2001 From: danial Date: Wed, 2 Oct 2024 16:56:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BA=E6=B4=BB=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 36 +++ controllers/pageController.go | 2 + views/index.html | 568 +++++++++++++++++----------------- views/login.html | 2 +- 4 files changed, 323 insertions(+), 285 deletions(-) diff --git a/.drone.yml b/.drone.yml index 10595fb..c3177bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -101,6 +101,42 @@ trigger: event: - push +--- +kind: pipeline +type: ssh +name: 宝宝服务器 + +server: + host: 43.163.251.22 + user: ubuntu + password: + from_secret: baby + +clone: + depth: 1 + +steps: + - name: clean old container + commands: + - docker ps -a | (grep -q kami_boss; [ $? -eq 0 ] && docker container stop kami_boss && docker container rm kami_boss) || true + - name: run docker compose + commands: + - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} docker compose down + - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} docker compose up -d + - name: clean unused image + commands: + - docker image prune -af + +trigger: + status: + - success + - failure + branch: + - production + when: + event: + - push + --- kind: pipeline type: docker diff --git a/controllers/pageController.go b/controllers/pageController.go index 6ff4272..945d531 100644 --- a/controllers/pageController.go +++ b/controllers/pageController.go @@ -24,10 +24,12 @@ func (c *PageController) Index() { } roadList := service.QueryRoad() c.Data["roadList"] = roadList + c.Data["title"] = web.AppConfig.DefaultString("baseSettings::subtitle", "聚合支付管理系统") c.Data["extraAddr"] = testExtraLink } func (c *PageController) LoginPage() { + c.Data["title"] = web.AppConfig.DefaultString("baseSettings::subtitle", "卡密核销结算平台") c.TplName = "login.html" } diff --git a/views/index.html b/views/index.html index 57a6433..3f644bc 100644 --- a/views/index.html +++ b/views/index.html @@ -6,7 +6,7 @@ 管理后台 - + @@ -135,310 +135,310 @@ - -