diff --git a/README.md b/README.md index b9f8730..2742569 100644 --- a/README.md +++ b/README.md @@ -972,9 +972,9 @@ SELINUX=disable > SELinux 主要作用就是最大限度地减小系统中服务进程可访问的资源(最小权限原则)。 > 设想一下,如果一个以 root 身份运行的网络服务存在 0day 漏洞,黑客就可以利用这个漏洞,以 root 的身份在您的服务器上为所欲为了。是不是很可怕? -> SELinux 就是来解决这个问题的。 - +> SELinux 就是来解决这个问题的。 +> 另外跨容器访问时,也需要关闭防火墙,或者增加端口规则. diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c216414..466529a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -21,10 +21,10 @@ services: restart: always privileged: true ports: - - 8980:8980 + - 8980:8980 volumes: - - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - - ../web/dist:/usr/local/web + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - ../web/dist:/usr/local/web golang: depends_on: @@ -33,10 +33,14 @@ services: container_name: weekly_report working_dir: /usr/local/weekly_report command: go run /usr/local/weekly_report/main.go + environment: + - GO111MODULE=on + - GOPROXY=https://goproxy.cn privileged: true restart: always ports: - - 8981:8981 + - 8981:8981 volumes: - - ../server/:/usr/local/weekly_report + - ../server/:/usr/local/weekly_report + - ./web/:/usr/local/web diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 39261c9..3211f0a 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -34,7 +34,7 @@ http { } location /week/ { - proxy_pass http://10.25.17.26:8981/; + proxy_pass http://127.0.0.1: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; diff --git a/docker/web/excels/excel.file b/docker/web/excels/excel.file new file mode 100644 index 0000000..e69de29 diff --git a/docker/web/uploads/upload.file b/docker/web/uploads/upload.file new file mode 100644 index 0000000..e69de29 diff --git a/server/config.yaml b/server/config.yaml index 0202fb3..3a6fda0 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -43,7 +43,7 @@ captcha: # mysql connect configuration mysql: - path: '10.25.17.26:3306' + path: '127.0.0.1:3306' config: 'parseTime=true' db-name: 'weekly_report' username: 'root' @@ -55,10 +55,10 @@ mysql: # 本地下载文件路径 local: - path: '/Users/zero/Documents/uploads/file' + path: '/usr/local/web/uploads' excel: - dir: '/Users/zero/Documents/excel/file' + dir: '/usr/local/web/excels' # timer task db clear table Timer: diff --git a/server/log/2021-11-16.log b/server/log/2021-11-16.log index dae7f5c..79fb614 100644 --- a/server/log/2021-11-16.log +++ b/server/log/2021-11-16.log @@ -20,3 +20,5 @@ [goweb-demo]2021/11/16 - 06:38:11.518 info /usr/local/weekly_report/initialize/router.go:49 router register success [goweb-demo]2021/11/16 - 06:38:11.546 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"} [goweb-demo]2021/11/16 - 06:39:03.560 error /usr/local/weekly_report/api/system/sys_user.go:36 登陆失败! 用户名不存在或者密码错误! {"err": "record not found"} +[goweb-demo]2021/11/16 - 07:16:08.828 info /usr/local/weekly_report/initialize/router.go:49 router register success +[goweb-demo]2021/11/16 - 07:16:08.838 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}