From c943237207622ba6a56e17b5f77dc9febcea1485 Mon Sep 17 00:00:00 2001
From: "xiao.ming" <1210919685@qq.com>
Date: Tue, 16 Nov 2021 14:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=E9=83=A8=E7=BD=B2?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 24 ++++++++++++++++-
docker/docker-compose.yml | 10 ++++---
docker/nginx/nginx.conf | 25 ++++++++++++++++--
res/stat.png | Bin 0 -> 218680 bytes
res/write_report.png | Bin 0 -> 246415 bytes
server/config.yaml | 4 +--
server/latest_log | 2 +-
server/log/2021-11-16.log | 22 +++++++++++++++
web/assets/css/chunk-08177fb6.220221fb.css | 1 -
web/{ => dist}/assets/css/app.4f8f8d6c.css | 0
.../assets/css/chunk-08177fb6.220221fb.css | 1 +
.../assets/css/chunk-1eb1a21d.f9cd2804.css | 0
.../assets/css/chunk-2544b27e.e716eed4.css | 0
.../assets/css/chunk-4d0356d8.91fb9bdf.css | 0
.../assets/css/chunk-529346b8.96e618c2.css | 0
.../assets/css/chunk-6dbfa89e.d7601492.css | 0
.../assets/css/chunk-796bc39c.bc310e56.css | 0
.../assets/css/chunk-c731a980.fd2229dc.css | 0
.../assets/css/chunk-cb583cae.59e38391.css | 0
.../assets/css/chunk-vendors.09af4a6b.css | 0
.../assets/fonts/fontello.068ca2b3.ttf | Bin
.../assets/fonts/fontello.8d4a4e6f.woff2 | Bin
.../assets/fonts/fontello.a782baa8.woff | Bin
.../assets/fonts/fontello.e73a0647.eot | Bin
.../assets/img/fontello.9354499c.svg | 0
web/{ => dist}/assets/js/app.7f150e36.js | 0
web/{ => dist}/assets/js/app.7f150e36.js.map | 0
.../assets/js/chunk-08177fb6.ed465acb.js | 0
.../assets/js/chunk-08177fb6.ed465acb.js.map | 0
.../assets/js/chunk-0e8b5eab.735056d1.js | 0
.../assets/js/chunk-0e8b5eab.735056d1.js.map | 0
.../assets/js/chunk-1061a666.181a1135.js | 0
.../assets/js/chunk-1061a666.181a1135.js.map | 0
.../assets/js/chunk-1eb1a21d.103557ce.js | 0
.../assets/js/chunk-1eb1a21d.103557ce.js.map | 0
.../assets/js/chunk-2544b27e.eb71cfd5.js | 0
.../assets/js/chunk-2544b27e.eb71cfd5.js.map | 0
.../assets/js/chunk-4d0356d8.b62142b4.js | 0
.../assets/js/chunk-4d0356d8.b62142b4.js.map | 0
.../assets/js/chunk-529346b8.fd3ed210.js | 0
.../assets/js/chunk-529346b8.fd3ed210.js.map | 0
.../assets/js/chunk-5ca83e42.54ac8f8d.js | 0
.../assets/js/chunk-5ca83e42.54ac8f8d.js.map | 0
.../assets/js/chunk-6d7ce414.e9023107.js | 0
.../assets/js/chunk-6d7ce414.e9023107.js.map | 0
.../assets/js/chunk-6dbfa89e.5adaedb5.js | 0
.../assets/js/chunk-6dbfa89e.5adaedb5.js.map | 0
.../assets/js/chunk-796bc39c.a54e686a.js | 0
.../assets/js/chunk-796bc39c.a54e686a.js.map | 0
.../assets/js/chunk-c731a980.54be1077.js | 0
.../assets/js/chunk-c731a980.54be1077.js.map | 0
.../assets/js/chunk-cb583cae.fd28fce0.js | 0
.../assets/js/chunk-cb583cae.fd28fce0.js.map | 0
.../assets/js/chunk-dca361f8.329e663c.js | 0
.../assets/js/chunk-dca361f8.329e663c.js.map | 0
.../assets/js/chunk-vendors.b41fc27a.js | 0
.../assets/js/chunk-vendors.b41fc27a.js.map | 0
web/{ => dist}/favicon.ico | Bin
web/{ => dist}/index.html | 0
web/{ => dist}/static/serverconfig.json | 0
60 files changed, 78 insertions(+), 11 deletions(-)
create mode 100644 res/stat.png
create mode 100644 res/write_report.png
create mode 100644 server/log/2021-11-16.log
delete mode 100644 web/assets/css/chunk-08177fb6.220221fb.css
rename web/{ => dist}/assets/css/app.4f8f8d6c.css (100%)
create mode 100644 web/dist/assets/css/chunk-08177fb6.220221fb.css
rename web/{ => dist}/assets/css/chunk-1eb1a21d.f9cd2804.css (100%)
rename web/{ => dist}/assets/css/chunk-2544b27e.e716eed4.css (100%)
rename web/{ => dist}/assets/css/chunk-4d0356d8.91fb9bdf.css (100%)
rename web/{ => dist}/assets/css/chunk-529346b8.96e618c2.css (100%)
rename web/{ => dist}/assets/css/chunk-6dbfa89e.d7601492.css (100%)
rename web/{ => dist}/assets/css/chunk-796bc39c.bc310e56.css (100%)
rename web/{ => dist}/assets/css/chunk-c731a980.fd2229dc.css (100%)
rename web/{ => dist}/assets/css/chunk-cb583cae.59e38391.css (100%)
rename web/{ => dist}/assets/css/chunk-vendors.09af4a6b.css (100%)
rename web/{ => dist}/assets/fonts/fontello.068ca2b3.ttf (100%)
rename web/{ => dist}/assets/fonts/fontello.8d4a4e6f.woff2 (100%)
rename web/{ => dist}/assets/fonts/fontello.a782baa8.woff (100%)
rename web/{ => dist}/assets/fonts/fontello.e73a0647.eot (100%)
rename web/{ => dist}/assets/img/fontello.9354499c.svg (100%)
rename web/{ => dist}/assets/js/app.7f150e36.js (100%)
rename web/{ => dist}/assets/js/app.7f150e36.js.map (100%)
rename web/{ => dist}/assets/js/chunk-08177fb6.ed465acb.js (100%)
rename web/{ => dist}/assets/js/chunk-08177fb6.ed465acb.js.map (100%)
rename web/{ => dist}/assets/js/chunk-0e8b5eab.735056d1.js (100%)
rename web/{ => dist}/assets/js/chunk-0e8b5eab.735056d1.js.map (100%)
rename web/{ => dist}/assets/js/chunk-1061a666.181a1135.js (100%)
rename web/{ => dist}/assets/js/chunk-1061a666.181a1135.js.map (100%)
rename web/{ => dist}/assets/js/chunk-1eb1a21d.103557ce.js (100%)
rename web/{ => dist}/assets/js/chunk-1eb1a21d.103557ce.js.map (100%)
rename web/{ => dist}/assets/js/chunk-2544b27e.eb71cfd5.js (100%)
rename web/{ => dist}/assets/js/chunk-2544b27e.eb71cfd5.js.map (100%)
rename web/{ => dist}/assets/js/chunk-4d0356d8.b62142b4.js (100%)
rename web/{ => dist}/assets/js/chunk-4d0356d8.b62142b4.js.map (100%)
rename web/{ => dist}/assets/js/chunk-529346b8.fd3ed210.js (100%)
rename web/{ => dist}/assets/js/chunk-529346b8.fd3ed210.js.map (100%)
rename web/{ => dist}/assets/js/chunk-5ca83e42.54ac8f8d.js (100%)
rename web/{ => dist}/assets/js/chunk-5ca83e42.54ac8f8d.js.map (100%)
rename web/{ => dist}/assets/js/chunk-6d7ce414.e9023107.js (100%)
rename web/{ => dist}/assets/js/chunk-6d7ce414.e9023107.js.map (100%)
rename web/{ => dist}/assets/js/chunk-6dbfa89e.5adaedb5.js (100%)
rename web/{ => dist}/assets/js/chunk-6dbfa89e.5adaedb5.js.map (100%)
rename web/{ => dist}/assets/js/chunk-796bc39c.a54e686a.js (100%)
rename web/{ => dist}/assets/js/chunk-796bc39c.a54e686a.js.map (100%)
rename web/{ => dist}/assets/js/chunk-c731a980.54be1077.js (100%)
rename web/{ => dist}/assets/js/chunk-c731a980.54be1077.js.map (100%)
rename web/{ => dist}/assets/js/chunk-cb583cae.fd28fce0.js (100%)
rename web/{ => dist}/assets/js/chunk-cb583cae.fd28fce0.js.map (100%)
rename web/{ => dist}/assets/js/chunk-dca361f8.329e663c.js (100%)
rename web/{ => dist}/assets/js/chunk-dca361f8.329e663c.js.map (100%)
rename web/{ => dist}/assets/js/chunk-vendors.b41fc27a.js (100%)
rename web/{ => dist}/assets/js/chunk-vendors.b41fc27a.js.map (100%)
rename web/{ => dist}/favicon.ico (100%)
rename web/{ => dist}/index.html (100%)
rename web/{ => dist}/static/serverconfig.json (100%)
diff --git a/README.md b/README.md
index 722a0b7..c9be214 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,32 @@
cd docker && docker-compose up -d
```
-访问地址: `http://localhost:8980`
+修改IP地址为安装容器主机的IP地址
+```
+# nginx配置
+1. docker/nginx/nginx.conf
+
+ location /week/ {
+ proxy_pass http://服务器IP:8981/;
+ }
+
+2. server/config.yaml
+
+# mysql connect configuration
+mysql:
+ path: 'mysqlIP:3306'
+
+```
+
+访问地址: `http://localhost:8980`即可
运行界面截图:
+
+
+
+
+
- [goweb-gin-demo](#goweb-gin-demo)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1ae5b58..c216414 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.0'
+version: '3.7'
services:
mysql:
image: mysql:5.7
- container_name: mysql_weekly
+ container_name: mysql
restart: always
environment:
MYSQL_DATABASE: weekly_report
@@ -19,11 +19,12 @@ services:
image: nginx:1.21.4-alpine
container_name: nginx
restart: always
+ privileged: true
ports:
- 8980:8980
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
- - ./web/:/usr/local/web/
+ - ../web/dist:/usr/local/web
golang:
depends_on:
@@ -32,9 +33,10 @@ services:
container_name: weekly_report
working_dir: /usr/local/weekly_report
command: go run /usr/local/weekly_report/main.go
+ privileged: true
restart: always
ports:
- - 8981:8888
+ - 8981:8981
volumes:
- ../server/:/usr/local/weekly_report
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
index ffa78ac..39261c9 100644
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@@ -17,11 +17,32 @@ http {
server_name 127.0.0.1;
client_max_body_size 200m;
+ root /usr/local/web;
+ index index.html;
+
location / {
- root /usr/local/web;
- index index.html;
+ # 此处的 @router 实际上是引用下面的转发,否则在 Vue 路由刷新时可能会抛出 404
+ try_files $uri $uri/ @router;
+ # 请求指向的首页
+ index index.html;
}
+ # 由于路由的资源不一定是真实的路径,无法找到具体文件
+ # 所以需要将请求重写到 index.html 中,然后交给真正的 Vue 路由处理请求资源
+ location @router {
+ rewrite ^.*$ /index.html last;
+ }
+
+ location /week/ {
+ proxy_pass http://10.25.17.26:8981/;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ add_header Set-Cookie "Secure";
+ proxy_cookie_path / "/; httponly; secure; SameSite=Strict";
+ }
+
+
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
diff --git a/res/stat.png b/res/stat.png
new file mode 100644
index 0000000000000000000000000000000000000000..b137279e38dd6921d00b3503fcef2f7228af3288
GIT binary patch
literal 218680
zcmeEubx>Pxzb8^kfdZviu>!@47cXuFik0FHrMSC>K%q!+cXxLuIK?Hng+M7zaEBn9
zzIX4=&g|^Y-rnDzFEc0SOeUN;=gE`r_hZiq`TR)+8
UQY0DNQM?!jTV<{>5Syob#>a&x*nWc>>64J+zgd}vWI9dE}SIn{>KU(-b`-stw
zF;y1-Lgxu`iGM`&lb3Sg7~($-a0rD!KfX#SNf8JOBiB%Wz52X=U!9$s9_;ltbhwl8
zOG~HFqY&5!Zsz7@=2mN{jZ_b4c`5t46jiLFSuFJh$uN0b;yA4<66ZT)wQO9Q7NL{?
zLP|>1?C0mJBOo#)<#Wvp!j1?22SceS_UIENv3~LKjS-KV=rp9R`7_!n6r>-R?X&SH
zA^zr)b4fi 3$v*XsZ9gwMn@XG1M6=?V2xu(kGgjA0MVFe)~RJ;fj@-WAfe`7l$7qW@8YA8nIHM
zX2Zw}U!txQ@!gJv@d%-aYX)Dw=LJ_j*h~~L?xAKz&Y<$pGanVET_1sS2Na;rVzwKs
z;kZ>D07VArBb`=mf7=Cs(ntRpEBPb}ZxOzgZ!efp*a0{0k^I=vc5a*Qz_CMDpB-of
z0QtfS)jkUzv;+oA44l_Gk2G(lO=j3TZnMNZy9E3P$fF+ZY<~&J=`2^+nf++dYvL&+
zgG`d`Y?}feCN=;DiWzeylW*1X53TIyuy0R9$^hbC^%>gr-i%wVj-`~9zVqIIb^Z|P
z-J}NW&y|9hh^f8p;Lz39(B>3*&)|trvIm(pBWK{W> 13cYc;s(?r+7
z0!a8;K~@p=UvZSCyLLkeHxg0~@)=Y?rQzV0OWtHPm?2dr$7fnXrq6C0A<>>^4t2=J
z5D-Z|Pa~jgs5w_kD~1MFh@9Uo!=zjI!Ix+p2BkVa1A%FOH)J>*aRe}+bgbz7G3N{P
z*F8TeymJ8a4b}J_c-Ya{Rt0te#TD-SQ!-&yAWj&nn8WQ)hi&gcmi!!C+3BBVQ!%El!1UN6WmNS(tZM3^ml4~-uB@$%t4}iKsA(WhyZ4J)HjOV^N4cwLbKVi~_
zWHoC23X$h~#(lck9%~LIdc2+6croln=VZJ}zkh>0aTT_74w%q3!E2gBcZBdwxG3L9
zKni42&BmKED)wEQ)eQ>gvENgbc8P#^w#)(ib7%*=nMDUkB{g8e@K0RyE0h%8WBBnw
z1D$!~xpvoe?~%qxN^{+iPcQ+~3;I6HK)^u~Gt063LXI|LiAv?S`Rf@SekT?UX{F^@
zonZMBM~PbVxE{Qge2*B15$WFc+v3jxS%k+GYV=tfV;Q|i*CTx7v5)tyD^;TW6nv?e
zZA+=M%x1y{p7}L*0(2?{*A6j1vlI=IJs^k1DywQ2tX~iN7As+&GrOwr15E$>cgUF|
z_N(6FY3HKMVKJ*`&-C^|#I>buC`#uLP}XioOPTwf7voaDt&A$c^;n`JEiEl*<6TsA
zv`s7x_Zq(%e6+U1?B;Z%`ZejyY_PL%mNt8`=qToe)u3i?2kEV%9boUUmD9~C{{uyY
z;$h{Shw!%R0kg+J*}Qgv-h)Xn@PeucoSvZUYZE&Fm^l$JYjWG%EQlgDbm940^}W{r
zA3(*sa#TS2uhWEh#Ow4gh_lWy8`(vcKYF>8G3Dee(t_xHro~6H_=?USm4GD2m;MC$
zifR3H1s2ptR&8F{_CBl8x$D~SNGKI9RAU5F1cJ_JQ!3D8r6pm;vSjRj68;ZdVT!`H
zE_-@__+temBuX@GLsc;oB!39X@roUIBtvzle9uT1w$WIMPATX}zgV>IBPG=dynHRh
z==)eVUDk>C1*lY-7*ut9VYcR_OuU`N0${hyF9fFU4aizTuE>ciIus=T`>f0_oCZNG
z*4s38_vGSK*W3?lflfOXwAB+2IJ_cApZXkjk8BKqU_-*-PfdJiz&Wv+t$=!~It_vjSc>IW^m$hq*5YDh
z^Rbsgrjcp0D4kZv+xrx!$INx6MMG(pebDo%`U&I639N)U+ld**C1TQj8)USwNVV|&qozN|ReEcXk+O$5Lg8paO3y9Elm
zJR;k(N3V*uO_dE-kEfn4e@_~ctQx(9_UZUe-Zi%z1qGzMUVi$XnHFR_51XfIs!L#8
zqx`svi2FJ}8~NYp?0-46J4E2o0XEImj+$3oF}b?=?Qp-E%D&pMVvyMis#M@s_vJhK
z(HQAv3qPGIHIkSVslX|{!NtDyc~_kvG+9^q$LUEiS9;Y!eOj!ZZ+|v!abvzKqFsOc
zEuELp`=GGzCjFrCf!IlC+-G%jykhucqs<%Dt%J*v()R;whLm*dzO`CUMdv=OP)w+_
zo@ahhf7i$
`hLYZ|6HvG33%5
z9vfePnoEtzPv|xA=sz1GGylnY(4&!L W$<)s~r3i+4F|RfdeI6Kx+r+{8
znd|g&ByuP`q$4LJqa@ihM>~8>I1ZVO`--IykQuSE3wCU}(x!u-g^-KKhKuLeEzs&;
zkiIkD7%be!TywHga#!~<$>$eaPJ;}&J#im(aZU*sa?R&Qxz4nLTnQ6{p65X
zTSnaL_ag4