diff --git a/.docker-compose/nginx/conf.d/my.conf b/.docker-compose/nginx/conf.d/my.conf index 6063e1f7..9a1685de 100644 --- a/.docker-compose/nginx/conf.d/my.conf +++ b/.docker-compose/nginx/conf.d/my.conf @@ -1,5 +1,5 @@ server { - listen 8000; + listen 8080; server_name localhost; #charset koi8-r; diff --git a/.docker-compose/shell/server-handle.sh b/.docker-compose/shell/server-handle.sh index 317650ae..42308129 100644 --- a/.docker-compose/shell/server-handle.sh +++ b/.docker-compose/shell/server-handle.sh @@ -26,7 +26,7 @@ zap: # redis configuration redis: db: 0 - addr: 'redis:6379' + addr: '177.7.0.14:6379' password: '' # email configuration @@ -48,9 +48,9 @@ system: env: 'public' # Change to "develop" to skip authentication for development mode addr: 8888 db-type: 'mysql' - oss-type: 'qiniu' + oss-type: 'local' config-env: 'GVA_CONFIG' - need-init-data: false + need-init-data: true use-multipoint: false # captcha configuration @@ -61,11 +61,11 @@ captcha: # mysql connect configuration mysql: - path: mysql + path: '177.7.0.13:3306' config: 'charset=utf8mb4&parseTime=True&loc=Local' db-name: 'qmPlus' username: 'root' - password: 'gdkid,,..' + password: 'Aa@6447985' max-idle-conns: 10 max-open-conns: 10 log-mode: false diff --git a/docker-compose.yaml b/docker-compose.yaml index e2350696..b78711fc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -15,7 +15,7 @@ services: container_name: gva-web restart: always ports: - - '8000:8000' + - '8080:8080' depends_on: - server command: [ 'nginx-debug', '-g', 'daemon off;' ] @@ -34,6 +34,9 @@ services: depends_on: - mysql - redis + links: + - mysql + - redis networks: network: ipv4_address: 177.7.0.12 @@ -57,7 +60,7 @@ services: container_name: gva-redis # 容器名 restart: always ports: - - '6379:6379' + - '16379:6379' networks: network: ipv4_address: 177.7.0.14 \ No newline at end of file diff --git a/dockerfile_server b/dockerfile_server index c6abceec..6c7b6584 100644 --- a/dockerfile_server +++ b/dockerfile_server @@ -24,6 +24,8 @@ COPY --from=0 /go/src/gin-vue-admin/server ./ COPY --from=0 /go/src/gin-vue-admin/config.yaml ./ COPY --from=0 /go/src/gin-vue-admin/resource ./resource +EXPOSE 8888 + ENTRYPOINT ./server # 根据Dockerfile生成Docker镜像 diff --git a/server/config.yaml b/server/config.yaml index 5d0b081d..0e478e1e 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -41,7 +41,7 @@ system: env: 'public' # Change to "develop" to skip authentication for development mode addr: 8888 db-type: 'mysql' - oss-type: 'qiniu' + oss-type: 'local' config-env: 'GVA_CONFIG' need-init-data: false use-multipoint: false @@ -58,7 +58,7 @@ mysql: config: 'charset=utf8mb4&parseTime=True&loc=Local' db-name: 'qmPlus' username: 'root' - password: 'gdkid,,..' + password: 'Aa@6447985' max-idle-conns: 10 max-open-conns: 10 log-mode: false