From c185fd38466b2590c043d766d615010b0286b5d9 Mon Sep 17 00:00:00 2001
From: wfc <wfc@wfc.com>
Date: Tue, 17 Dec 2024 09:35:52 +0800
Subject: [PATCH] fix: setup and control sh

---
 build/bin/wfccontrol.sh                    |  6 ++--
 build/bin/wfcsetup.sh                      |  2 +-
 build/docker/env/default.env               |  2 +-
 docs/03-configuration/03-wfc-quickstart.md | 33 ++++++++++------------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/build/bin/wfccontrol.sh b/build/bin/wfccontrol.sh
index 92053ae..263ed10 100755
--- a/build/bin/wfccontrol.sh
+++ b/build/bin/wfccontrol.sh
@@ -3,7 +3,7 @@
 WFCWorkDir=/opt/wfc
 WFCBinDir=${WFCWorkDir}/bin
 DockerDir=${WFCWorkDir}/docker
-DockerCompose=/usr/bin/docker-compose
+DockerCompose=docker-compose
 PIDFile=/run/wfccontrol.pid
 
 Jars=" \
@@ -26,7 +26,9 @@ case "$1" in
     stop)
         cd ${DockerDir}
         ${DockerCompose} down
-        rm ${PIDFile}
+        if [ -f ${PIDFile} ]; then
+            rm ${PIDFile}
+        fi
     ;;
     restart)
         $0 stop
diff --git a/build/bin/wfcsetup.sh b/build/bin/wfcsetup.sh
index c6e6575..1bc7e9d 100755
--- a/build/bin/wfcsetup.sh
+++ b/build/bin/wfcsetup.sh
@@ -16,7 +16,7 @@ case "$1" in
         mkdir -p ${docker_work_dir}/mysql/tmp
         chown -R root:root ${docker_work_dir}/*
         chown -R root:root ${docker_work_dir}/.*
-        chown -R mysql:mysql ${docker_work_dir}/mysql
+        #chown -R mysql:mysql ${docker_work_dir}/mysql
         chmod -R 775 ${docker_work_dir}/nacos
         chmod -R 775 ${docker_work_dir}/nginx
         chmod -R 775 ${docker_work_dir}/redis
diff --git a/build/docker/env/default.env b/build/docker/env/default.env
index c982c27..0b2a930 100644
--- a/build/docker/env/default.env
+++ b/build/docker/env/default.env
@@ -7,4 +7,4 @@ MYSQL_USER=mysql
 MYSQL_PASSWORD=
 NACOS_SERVER_ADDR=192.168.13.128:8848
 NACOS_NAME_SPACE=wfc-prod
-GATEWAY_ADDR=192.168.13.128:8080
\ No newline at end of file
+GATEWAY_ADDR=192.168.13.128:8080
diff --git a/docs/03-configuration/03-wfc-quickstart.md b/docs/03-configuration/03-wfc-quickstart.md
index 10624cd..2535617 100644
--- a/docs/03-configuration/03-wfc-quickstart.md
+++ b/docs/03-configuration/03-wfc-quickstart.md
@@ -17,7 +17,7 @@ docker-compose >= 1.29.2
 * 版本号： 1.0.2
 * 构建日期：20241212
 
-## 安装配置软件
+## 安装和配置软件
 
 * 创建安装目录
 
@@ -93,31 +93,28 @@ docker-compose >= 1.29.2
 
 * 修改docker环境参数
 
-根据实际环境修改如下环境参数配置：
+根据实际环境修改如下环境参数配置, 以下IP地址已经在上面配置过程被替换：
 
 ```sh
-cat .env
-    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_USER=mysql
-    MYSQL_PASSWORD=
-    NACOS_SERVER_ADDR=192.168.13.128:8848
+    cd /opt/wfc/docker
+    cat .env
+        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_USER=mysql
+        MYSQL_PASSWORD=
+        NACOS_SERVER_ADDR=192.168.13.128:8848
+        NACOS_NAME_SPACE=wfc-prod
+        GATEWAY_ADDR=192.168.13.128:8080
 ```
 
 * 启动/查看/停止/版本软件
 
 ```sh
     cd /opt/wfc/bin
-    sudo ./wfccontrol.sh start/status/stop/version  
-```
-
-or
-
-```sh
-    sudo systemctl start/status/stop wfccontrol.service  
+    sudo ./wfccontrol.sh start/restart/status/stop/version  
 ```
 
 ## 通过浏览器访问客户平台和用户平台