From 1e827fcdd79d5028421994917a3d84d643327fb7 Mon Sep 17 00:00:00 2001 From: 0xJacky Date: Thu, 18 May 2023 21:16:32 +0800 Subject: [PATCH] chore: update demo --- docker-compose-demo.yml | 17 +++++++++++++++++ frontend/src/version.json | 2 +- frontend/version.json | 2 +- resources/demo/app.ini | 1 + resources/demo/demo.db | Bin 53248 -> 61440 bytes server/internal/analytic/node_record.go | 4 ++++ 6 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 docker-compose-demo.yml diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml new file mode 100644 index 00000000..b3366e2f --- /dev/null +++ b/docker-compose-demo.yml @@ -0,0 +1,17 @@ +version: '3' +services: + nginx-demo-1: + image: uozi/nginx-ui-demo:latest + restart: always + networks: + - nginx-ui-network + ports: + - "9003:80" + + nginx-demo-2: + image: uozi/nginx-ui-demo:latest + restart: always + networks: + - nginx-ui-network +networks: + nginx-ui-network: diff --git a/frontend/src/version.json b/frontend/src/version.json index 6bfae0d1..5a125bdd 100644 --- a/frontend/src/version.json +++ b/frontend/src/version.json @@ -1 +1 @@ -{"version":"1.9.9","build_id":129,"total_build":199} \ No newline at end of file +{"version":"1.9.9","build_id":131,"total_build":201} \ No newline at end of file diff --git a/frontend/version.json b/frontend/version.json index 6bfae0d1..5a125bdd 100644 --- a/frontend/version.json +++ b/frontend/version.json @@ -1 +1 @@ -{"version":"1.9.9","build_id":129,"total_build":199} \ No newline at end of file +{"version":"1.9.9","build_id":131,"total_build":201} \ No newline at end of file diff --git a/resources/demo/app.ini b/resources/demo/app.ini index 669d26e3..3f9d434c 100644 --- a/resources/demo/app.ini +++ b/resources/demo/app.ini @@ -5,6 +5,7 @@ JwtSecret = 2E1CE615-BB15-44F5-B5BE-6B5DA3581D0F Email = test@jackyu.cn HTTPChallengePort = 9180 StartCmd = bash +NodeSecret = fdc7764f-92d2-454c-9640-6a09be121139 [nginx_log] AccessLogPath = /var/log/nginx/access.local.log diff --git a/resources/demo/demo.db b/resources/demo/demo.db index 4cd437cb97544d575611424f588aed018eee2ddf..2139bec0445f2144666231a4a46e954d46566858 100644 GIT binary patch delta 1441 zcmaJg!5YCP<_#hm8fX5t`%e?B+(cm?ri0->tfFel7bQsSR`Sc!7=C;@Q zcS-SovP5!cn-r&W#Z~c1QSo}v%w9nJfdD)#8B#?9)6nUE?DWaK^z}SHQ_<3Kk?6KH zku*Tx2#H3s4s`2^@8aM@v;ru(t9j%t8uP0rc(w3vC^M1>Qbr5`lI&mw-mA0EEu zuy-KN=E)QZr$?uR$3dIv-k>EJwKJ-c(vx%f{JAyQq#o-~^o}66fnr;vO4_udxf}0O+6KZLWXj@+%(?q{!3Q|vUt5ERz!5wL zo;$i{O&i}XJ>fkzZbfeDhidh#A+2_^rz)Ur+xLRko@&o{vOlSux8CptV8oJruZM?~ zWvAnxzT^;)LEGp!8#?pYRVQ}UYT-rew)e{%DatiT(|}$DLIW7JrrmUBUPy74v|u-# zRCNPXLHpnAu5EX2eTAe&Zqj(B!weV5r<&-J&~ZzRJCzrkwt{p~cj zzgZHRrCPHnS2s7cUMyQLH!7J}XJ|>ac(1_QRN%ud!&mPxk#88xsM;=BbfO6@*UEPjvYtr z<+hj0`s<6hb@!*sBmMh3IE;>9(oMMP5MCcG6B0f!&%+*Qw*)<(xyjNjN6}G=NstVe zq7$hI6Q&cfM3Rn1)@V9K)3XR0#3aHT8%uBzj$tMcy{Q0-sToEqb?us7RrNmARVf8D tniQK#(lmXj$nkhAa!4gvg{4*^(TGeXV-cE)Np!LT7?xqU delta 5053 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 DDa-RO diff --git a/server/internal/analytic/node_record.go b/server/internal/analytic/node_record.go index d1db6fc0..457a61e5 100644 --- a/server/internal/analytic/node_record.go +++ b/server/internal/analytic/node_record.go @@ -16,6 +16,10 @@ func RetrieveNodesStatus() { env := query.Environment + if env == nil { + return + } + envs, err := env.Find() if err != nil {