修改docker部署配置
xiao.ming
parent
82c11e765e
commit
c943237207
24
README.md
24
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`即可
|
||||
|
||||
|
||||
运行界面截图:
|
||||
|
||||
|
||||
<br>
|
||||
|
||||
|
||||
|
||||
|
||||
- [goweb-gin-demo](#goweb-gin-demo)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -17,11 +17,32 @@ http {
|
|||
server_name 127.0.0.1;
|
||||
client_max_body_size 200m;
|
||||
|
||||
location / {
|
||||
root /usr/local/web;
|
||||
index index.html;
|
||||
|
||||
location / {
|
||||
# 此处的 @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;
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 214 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 241 KiB |
|
|
@ -30,7 +30,7 @@ casbin:
|
|||
# system configuration
|
||||
system:
|
||||
env: 'develop' # Change to "develop" to skip authentication for development mode # public
|
||||
addr: 8888
|
||||
addr: 8981
|
||||
db-type: 'mysql'
|
||||
oss-type: 'local' # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
|
||||
use-multipoint: false
|
||||
|
|
@ -43,7 +43,7 @@ captcha:
|
|||
|
||||
# mysql connect configuration
|
||||
mysql:
|
||||
path: '127.0.0.1:3306'
|
||||
path: '10.25.17.26:3306'
|
||||
config: 'parseTime=true'
|
||||
db-name: 'weekly_report'
|
||||
username: 'root'
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
log/2021-11-15.log
|
||||
log/2021-11-16.log
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
[goweb-demo]2021/11/16 - 03:51:53.523 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 03:51:53.546 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
|
||||
[goweb-demo]2021/11/16 - 05:04:56.337 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 05:04:56.352 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
|
||||
[goweb-demo]2021/11/16 - 05:08:29.734 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 05:08:29.769 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
|
||||
[goweb-demo]2021/11/16 - 05:12:33.710 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 05:12:33.732 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
|
||||
[goweb-demo]2021/11/16 - 06:05:42.273 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 06:05:42.351 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
|
||||
[goweb-demo]2021/11/16 - 06:08:07.064 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 06:08:07.085 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
|
||||
[goweb-demo]2021/11/16 - 06:27:45.950 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 06:27:45.973 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
|
||||
[goweb-demo]2021/11/16 - 06:29:10.017 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 06:29:10.051 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
|
||||
[goweb-demo]2021/11/16 - 06:31:27.880 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 06:31:27.908 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
|
||||
[goweb-demo]2021/11/16 - 06:31:47.987 [31merror[0m /usr/local/weekly_report/api/system/sys_user.go:36 登陆失败! 用户名不存在或者密码错误! {"err": "record not found"}
|
||||
[goweb-demo]2021/11/16 - 06:38:11.518 [34minfo[0m /usr/local/weekly_report/initialize/router.go:49 router register success
|
||||
[goweb-demo]2021/11/16 - 06:38:11.546 [34minfo[0m /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
|
||||
[goweb-demo]2021/11/16 - 06:39:03.560 [31merror[0m /usr/local/weekly_report/api/system/sys_user.go:36 登陆失败! 用户名不存在或者密码错误! {"err": "record not found"}
|
||||
|
|
@ -1 +0,0 @@
|
|||
@font-face{font-family:fontello;src:url(../../assets/fonts/fontello.e73a0647.eot);src:url(../../assets/fonts/fontello.e73a0647.eot#iefix) format("embedded-opentype"),url(../../assets/fonts/fontello.8d4a4e6f.woff2) format("woff2"),url(../../assets/fonts/fontello.a782baa8.woff) format("woff"),url(../../assets/fonts/fontello.068ca2b3.ttf) format("truetype"),url(../../assets/img/fontello.9354499c.svg#fontello) format("svg");font-weight:400;font-style:normal}[class*=" fa-mavon-"]:before,[class^=fa-mavon-]:before{font-family:fontello;font-style:normal;font-weight:400;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-mavon-bold:before{content:"\E800"}.fa-mavon-italic:before{content:"\E801"}.fa-mavon-thumb-tack:before{content:"\E802"}.fa-mavon-link:before{content:"\E803"}.fa-mavon-picture-o:before{content:"\E804"}.fa-mavon-repeat:before{content:"\E805"}.fa-mavon-undo:before{content:"\E806"}.fa-mavon-trash-o:before{content:"\E807"}.fa-mavon-floppy-o:before{content:"\E808"}.fa-mavon-compress:before{content:"\E809"}.fa-mavon-eye:before{content:"\E80A"}.fa-mavon-eye-slash:before{content:"\E80B"}.fa-mavon-question-circle:before{content:"\E80C"}.fa-mavon-times:before{content:"\E80D"}.fa-mavon-align-left:before{content:"\E80F"}.fa-mavon-align-center:before{content:"\E810"}.fa-mavon-align-right:before{content:"\E811"}.fa-mavon-arrows-alt:before{content:"\F0B2"}.fa-mavon-bars:before{content:"\F0C9"}.fa-mavon-list-ul:before{content:"\F0CA"}.fa-mavon-list-ol:before{content:"\F0CB"}.fa-mavon-strikethrough:before{content:"\F0CC"}.fa-mavon-underline:before{content:"\F0CD"}.fa-mavon-table:before{content:"\F0CE"}.fa-mavon-columns:before{content:"\F0DB"}.fa-mavon-quote-left:before{content:"\F10D"}.fa-mavon-code:before{content:"\F121"}.fa-mavon-superscript:before{content:"\F12B"}.fa-mavon-subscript:before{content:"\F12C"}.fa-mavon-header:before{content:"\F1DC"}.fa-mavon-window-maximize:before{content:"\F2D0"}.markdown-body strong{font-weight:bolder}.markdown-body .hljs-center{text-align:center}.markdown-body .hljs-right{text-align:right}.markdown-body .hljs-left{text-align:left}.ql-toolbar{position:fixed;top:104px;background-color:#fff;width:calc(100% - 270px);left:260px;border-radius:4px;box-shadow:1px 2px 1px 1px hsla(0,0%,56.5%,.1)}.quill-editor{border:1px solid #ccc;margin:20px}.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{z-index:3;top:33px}.ql-snow .ql-tooltip{left:0!important}
|
||||
|
|
@ -0,0 +1 @@
|
|||
@font-face{font-family:fontello;src:url(../fonts/fontello.e73a0647.eot);src:url(../fonts/fontello.e73a0647.eot#iefix) format("embedded-opentype"),url(../fonts/fontello.8d4a4e6f.woff2) format("woff2"),url(../fonts/fontello.a782baa8.woff) format("woff"),url(../fonts/fontello.068ca2b3.ttf) format("truetype"),url(../img/fontello.9354499c.svg#fontello) format("svg");font-weight:400;font-style:normal}[class*=" fa-mavon-"]:before,[class^=fa-mavon-]:before{font-family:fontello;font-style:normal;font-weight:400;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-mavon-bold:before{content:"\E800"}.fa-mavon-italic:before{content:"\E801"}.fa-mavon-thumb-tack:before{content:"\E802"}.fa-mavon-link:before{content:"\E803"}.fa-mavon-picture-o:before{content:"\E804"}.fa-mavon-repeat:before{content:"\E805"}.fa-mavon-undo:before{content:"\E806"}.fa-mavon-trash-o:before{content:"\E807"}.fa-mavon-floppy-o:before{content:"\E808"}.fa-mavon-compress:before{content:"\E809"}.fa-mavon-eye:before{content:"\E80A"}.fa-mavon-eye-slash:before{content:"\E80B"}.fa-mavon-question-circle:before{content:"\E80C"}.fa-mavon-times:before{content:"\E80D"}.fa-mavon-align-left:before{content:"\E80F"}.fa-mavon-align-center:before{content:"\E810"}.fa-mavon-align-right:before{content:"\E811"}.fa-mavon-arrows-alt:before{content:"\F0B2"}.fa-mavon-bars:before{content:"\F0C9"}.fa-mavon-list-ul:before{content:"\F0CA"}.fa-mavon-list-ol:before{content:"\F0CB"}.fa-mavon-strikethrough:before{content:"\F0CC"}.fa-mavon-underline:before{content:"\F0CD"}.fa-mavon-table:before{content:"\F0CE"}.fa-mavon-columns:before{content:"\F0DB"}.fa-mavon-quote-left:before{content:"\F10D"}.fa-mavon-code:before{content:"\F121"}.fa-mavon-superscript:before{content:"\F12B"}.fa-mavon-subscript:before{content:"\F12C"}.fa-mavon-header:before{content:"\F1DC"}.fa-mavon-window-maximize:before{content:"\F2D0"}.markdown-body strong{font-weight:bolder}.markdown-body .hljs-center{text-align:center}.markdown-body .hljs-right{text-align:right}.markdown-body .hljs-left{text-align:left}.ql-toolbar{position:fixed;top:104px;background-color:#fff;width:calc(100% - 270px);left:260px;border-radius:4px;box-shadow:1px 2px 1px 1px hsla(0,0%,56.5%,.1)}.quill-editor{border:1px solid #ccc;margin:20px}.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{z-index:3;top:33px}.ql-snow .ql-tooltip{left:0!important}
|
||||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 797 B After Width: | Height: | Size: 797 B |
Loading…
Reference in New Issue