diff --git a/.gitignore b/.gitignore index 94d2178..e69f169 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ build/docker/redis/data build/docker/mysql/log build/docker/nacos/logs build/docker/mysql/db/*.sql +build/docker/mysql/db/upgrade/*/*.sql build/docker/wfc/*/jar/*.jar build/docker/wfc/*/*/jar/*.jar diff --git a/bin/copy.sh b/bin/copy.sh index d600faf..577825f 100755 --- a/bin/copy.sh +++ b/bin/copy.sh @@ -46,9 +46,9 @@ echo -n "Begin copy wfc-auth ... " cp ${BERootDir}/wfc-auth/target/wfc-auth.jar ${BuildDockerDir}/wfc/auth/jar echo "done" -echo -n "Begin copy wfc-visual ... " -cp ${BERootDir}/wfc-visual/wfc-visual-monitor/target/wfc-visual-monitor.jar ${BuildDockerDir}/wfc/visual/monitor/jar -echo "done" +# echo -n "Begin copy wfc-visual ... " +# cp ${BERootDir}/wfc-visual/wfc-visual-monitor/target/wfc-visual-monitor.jar ${BuildDockerDir}/wfc/visual/monitor/jar +# echo "done" echo -n "Begin copy wfc-modules-system ... " cp ${BERootDir}/wfc-modules/wfc-system/target/wfc-modules-system.jar ${BuildDockerDir}/wfc/modules/system/jar @@ -58,17 +58,17 @@ echo -n "Begin copy wfc-modules-user ... " cp ${BERootDir}/wfc-modules/wfc-modules-user/target/wfc-modules-user.jar ${BuildDockerDir}/wfc/modules/user/jar echo "done" -echo -n "Begin copy wfc-modules-file ... " -cp ${BERootDir}/wfc-modules/wfc-file/target/wfc-modules-file.jar ${BuildDockerDir}/wfc/modules/file/jar -echo "done" +# echo -n "Begin copy wfc-modules-file ... " +# cp ${BERootDir}/wfc-modules/wfc-file/target/wfc-modules-file.jar ${BuildDockerDir}/wfc/modules/file/jar +# echo "done" echo -n "Begin copy wfc-modules-job ... " cp ${BERootDir}/wfc-modules/wfc-job/target/wfc-modules-job.jar ${BuildDockerDir}/wfc/modules/job/jar echo "done" -echo -n "Begin copy wfc-modules-gen ... " -cp ${BERootDir}/wfc-modules/wfc-gen/target/wfc-modules-gen.jar ${BuildDockerDir}/wfc/modules/gen/jar -echo "done" +# echo -n "Begin copy wfc-modules-gen ... " +# cp ${BERootDir}/wfc-modules/wfc-gen/target/wfc-modules-gen.jar ${BuildDockerDir}/wfc/modules/gen/jar +# echo "done" echo -n "Begin copy wfc-modules-payment ... " cp -rf ${BERootDir}/wfc-modules/wfc-payment/target/wfc-modules-payment.jar ${BuildDockerDir}/wfc/modules/payment/jar diff --git a/build/bin/wfccontrol.sh b/build/bin/wfccontrol.sh index 03e29bf..7aa4707 100755 --- a/build/bin/wfccontrol.sh +++ b/build/bin/wfccontrol.sh @@ -11,8 +11,6 @@ Jars=" \ /opt/wfc/docker/wfc/gateway/jar/wfc-gateway.jar \ /opt/wfc/docker/wfc/modules/system/jar/wfc-modules-system.jar \ /opt/wfc/docker/wfc/modules/user/jar/wfc-modules-user.jar \ - /opt/wfc/docker/wfc/modules/gen/jar/wfc-modules-gen.jar \ - /opt/wfc/docker/wfc/modules/file/jar/wfc-modules-file.jar \ /opt/wfc/docker/wfc/modules/job/jar/wfc-modules-job.jar \ /opt/wfc/docker/wfc/modules/payment/jar/wfc-modules-payment.jar \ " diff --git a/build/bin/wfcsetup.sh b/build/bin/wfcsetup.sh index bde9a45..5dd225e 100755 --- a/build/bin/wfcsetup.sh +++ b/build/bin/wfcsetup.sh @@ -6,8 +6,8 @@ src_service_dir=${wfc_work_dir}/systemd/system dst_service_dir=/etc/systemd/system base_dockers="wfc-nacos wfc-mysql wfc-redis" -jar_dockers="wfc-auth wfc-gateway wfc-modules-system wfc-modules-user wfc-modules-gen wfc-modules-job wfc-modules-file wfc-modules-payment" -modules_dockers="wfc-modules-system wfc-modules-user wfc-modules-gen wfc-modules-job wfc-modules-file wfc-modules-payment" +jar_dockers="wfc-auth wfc-gateway wfc-modules-system wfc-modules-user wfc-modules-job wfc-modules-payment" +modules_dockers="wfc-modules-system wfc-modules-user wfc-modules-job wfc-modules-payment" fe_docker=wfc-nginx case "$1" in diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml index 41b79d2..16eeec8 100644 --- a/build/docker/docker-compose.yml +++ b/build/docker/docker-compose.yml @@ -127,23 +127,6 @@ services: - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} restart: unless-stopped - wfc-modules-gen: - container_name: wfc-modules-gen - build: - context: ./wfc/modules/gen - dockerfile: dockerfile - ports: - - "9202:9202" - volumes: - - ./wfc/modules/gen/jar/wfc-modules-gen.jar:/home/wfc/wfc-modules-gen.jar - depends_on: - - wfc-mysql - links: - - wfc-mysql - environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} - restart: unless-stopped wfc-modules-job: container_name: wfc-modules-job build: @@ -161,20 +144,6 @@ services: - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} restart: unless-stopped - wfc-modules-file: - container_name: wfc-modules-file - build: - context: ./wfc/modules/file - dockerfile: dockerfile - ports: - - "9300:9300" - volumes: - - ./wfc/modules/file/jar/wfc-modules-file.jar:/home/wfc/wfc-modules-file.jar - - ./wfc/upload:/home/wfc/upload - environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} - restart: unless-stopped wfc-modules-payment: container_name: wfc-modules-payment build: @@ -191,20 +160,7 @@ services: environment: - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} - restart: unless-stopped - wfc-visual-monitor: - container_name: wfc-visual-monitor - build: - context: ./wfc/visual/monitor - dockerfile: dockerfile - ports: - - "9100:9100" - volumes: - - ./wfc/visual/monitor/jar/wfc-visual-monitor.jar:/home/wfc/wfc-visual-monitor.jar - environment: - - NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR} - - NACOS_NAME_SPACE=${NACOS_NAME_SPACE} - restart: unless-stopped + restart: ${RESTART_OPTION} wfc-nginx: container_name: wfc-nginx image: nginx diff --git a/build/docker/env/default.env b/build/docker/env/default.env index 0b2a930..abbe50e 100644 --- a/build/docker/env/default.env +++ b/build/docker/env/default.env @@ -8,3 +8,4 @@ MYSQL_PASSWORD= NACOS_SERVER_ADDR=192.168.13.128:8848 NACOS_NAME_SPACE=wfc-prod GATEWAY_ADDR=192.168.13.128:8080 +RESTART_OPTION=on-failure:3 diff --git a/build/docker/mysql/conf/.my.cnf b/build/docker/mysql/conf/.my.cnf deleted file mode 100644 index f1e7c3e..0000000 --- a/build/docker/mysql/conf/.my.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[client] -user=root -password=123456 \ No newline at end of file