diff --git a/build/bin/wfccontrol.sh b/build/bin/wfccontrol.sh index 56dd17a..a292262 100755 --- a/build/bin/wfccontrol.sh +++ b/build/bin/wfccontrol.sh @@ -6,15 +6,14 @@ DockerDir=${WFCWorkDir}/docker DockerCompose=docker-compose PIDFile=/run/wfccontrol.pid -Jars=" \ - /opt/wfc/docker/wfc/auth/jar/wfc-auth.jar \ - /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/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 \ - " +Jars="/opt/wfc/docker/wfc/auth/jar/wfc-auth.jar + /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/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 + " case "$1" in start) @@ -25,7 +24,7 @@ case "$1" in else ${DockerCompose} up -d $2 fi - ;; + ;; stop) cd ${DockerDir} if [ -z "$2" ]; then @@ -36,12 +35,12 @@ case "$1" in else ${DockerCompose} stop $2 fi - ;; + ;; restart) $0 stop $2 sleep 1 $0 start $2 - ;; + ;; status) cd ${DockerDir} if [ -z "$2" ]; then @@ -49,14 +48,19 @@ case "$1" in else ${DockerCompose} ps $2 fi - ;; + ;; version) cd ${WFCBinDir} - java printJarVer ${Jars} - ;; + # java printJarVer ${Jars} + for jar in ${Jars}; do + jar_name=$(basename "$jar" .jar) + version=$(unzip -p "$jar" META-INF/MANIFEST.MF | grep 'Implementation-Version' | awk '{print $2}') + echo "$jar_name version: $version" + done + ;; *) echo "WANFi Control and Billing Management System Service ... " echo "Usage: $0 start|stop|restart|status|version" exit 1 - ;; + ;; esac diff --git a/build/docker/.env b/build/docker/.env index 3a6bf41..d370c3f 100644 --- a/build/docker/.env +++ b/build/docker/.env @@ -1,17 +1,20 @@ -MYSQL_ROOT_PASSWORD=123456 -MYSQL_DATABASE=wfc_system_db WFC_CONFIG_DATABASE=wfc_config_db WFC_SYSTEM_DATABASE=wfc_system_db WFC_USER_DATABASE=wfc_user_db -MYSQL_PORT=3306 -MYSQL_USER=mysql -MYSQL_PASSWORD=123456 +MYSQL_SERVICE_NAME=wfc-mysql +MYSQL_SERVICE_PORT=3306 +MYSQL_ROOT_PASSWORD=123456 +MYSQL_SERVICE_USER=root +MYSQL_SERVICE_PASSWORD=123456 REDIS_PORT=6379 +NACOS_PROFILE_NAME=prod NACOS_NAME_SPACE=wfc-prod +NACOS_SERVER_NAME=wfc-nacos WFC_SERVER_PORT=80 NACOS_SERVER_PORT=8848 GATEWAY_SERVER_PORT=8080 AUTH_SERVER_PORT=8081 +WFC_FILE_PORT=9201 WFC_JOB_PORT=9203 WFC_PAYMENT_PORT=9204 WFC_SYSTEM_PORT=9205 @@ -19,6 +22,4 @@ WFC_USER_PORT=9206 WFC_SERVER_IP=192.168.2.116 NACOS_SERVER_IP=${WFC_SERVER_IP} GATEWAY_SERVER_IP=${WFC_SERVER_IP} -AUTH_SERVER_IP=${WFC_SERVER_IP} RESTART_OPTION=on-failure:5 -