diff --git a/.gitattributes b/.gitattributes index a128f1f..4278677 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,12 @@ -* text=auto -*.sh eol=lf -*.md eol=lf -*.yaml eol=lf -*.yml eol=lf -*.sql eol=lf -*.txt eol=lf -*.conf eol=lf -*.xml eol=lf -*.bat eol=crlf +* text=auto +*.sh text eol=lf +*.md text eol=lf +*.yaml text eol=lf +*.yml text eol=lf +*.sql text eol=lf +*.txt text eol=lf +*.conf text eol=lf +*.xml text eol=lf +*.bat text eol=crlf +*.png binary +*.jpg binary \ No newline at end of file diff --git a/docker/deploy.bat b/docker/deploy.bat index d84b76a..b86ab97 100644 --- a/docker/deploy.bat +++ b/docker/deploy.bat @@ -41,12 +41,12 @@ exit /b 0 REM 启动程序模块(必须) :modules -docker-compose up -d wfc-nginx wfc-gateway wfc-auth wfc-modules-file wfc-modules-job wfc-modules-gen wfc-modules-system wfc-modules-user wfc-modules-payment +docker-compose up -d wfc-nginx wfc-gateway wfc-auth wfc-modules-system wfc-modules-user wfc-modules-payment exit /b 0 REM 启动程序模块(后端) :backend -docker-compose up -d wfc-gateway wfc-auth wfc-modules-file wfc-modules-job wfc-modules-gen wfc-modules-system wfc-modules-user wfc-modules-payment +docker-compose up -d wfc-gateway wfc-auth wfc-modules-system wfc-modules-user wfc-modules-payment wfc-modules-job wfc-modules-file wfc-modules-gen exit /b 0 REM 启动程序模块(前端) diff --git a/docker/deploy.sh b/docker/deploy.sh index 0025fbb..1099455 100755 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -2,7 +2,7 @@ # 使用说明,用来提示输入参数 usage() { - echo "Usage: sh 执行脚本.sh [port|base|modules|stop|rm]" + echo "Usage: sh deploy.sh [port|base|modules|stop|rm]" exit 1 } @@ -36,7 +36,7 @@ modules(){ # 启动程序模块(后端) backend(){ - docker-compose up -d wfc-gateway wfc-auth wfc-modules-system wfc-modules-user wfc-modules-payment + docker-compose up -d wfc-gateway wfc-auth wfc-modules-system wfc-modules-user wfc-modules-payment wfc-modules-job wfc-modules-file wfc-modules-gen } # 启动程序模块(前端) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c02288c..10a2215 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,6 +6,7 @@ services: context: ./nacos environment: - MODE=standalone + - NACOS_SERVER_ADDR=192.168.13.128 volumes: - ./nacos/logs/:/home/nacos/logs - ./nacos/conf/application.properties:/home/nacos/conf/application.properties diff --git a/docker/start-backend.sh b/docker/start-backend.sh index 82197e6..0ac6144 100755 --- a/docker/start-backend.sh +++ b/docker/start-backend.sh @@ -31,4 +31,12 @@ sudo docker stop wfc-modules-job sudo docker rm wfc-modules-job sudo docker rmi docker_wfc-modules-job +sudo docker stop wfc-modules-file +sudo docker rm wfc-modules-file +sudo docker rmi docker_wfc-modules-file + +sudo docker stop wfc-modules-gen +sudo docker rm wfc-modules-gen +sudo docker rmi docker_wfc-modules-gen + sudo ./deploy.sh backend