From c43c799ae01bd0aea1ad60fafddebc0e8ed2ca47 Mon Sep 17 00:00:00 2001
From: zhangsz <zhangsz@wfc.com>
Date: Thu, 26 Dec 2024 19:03:28 +0800
Subject: [PATCH] feat: enhance build and setup

---
 bin/build.sh              |  2 +-
 build/bin/wfcsetup.sh     | 58 ++++++++++++++++++++++++---------------
 docs/99-reference/tips.md | 19 +++++++++++++
 3 files changed, 56 insertions(+), 23 deletions(-)
 create mode 100644 docs/99-reference/tips.md

diff --git a/bin/build.sh b/bin/build.sh
index ce0faf6..1ab05f2 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -44,7 +44,7 @@ build-extras(){
 	git pull	
 	echo -n "Begin build extras file ... "
 	cd ${BuildRootDir}/bin
-	javac -source 8 -target 8 -bootclasspath /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar -extdirs "" printJarVer.java	
+	javac -source 8 -target 8 -bootclasspath /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar -extdirs ""  -Xlint:-options printJarVer.java	
 	echo "done"
 }
 
diff --git a/build/bin/wfcsetup.sh b/build/bin/wfcsetup.sh
index 6465889..56f773c 100755
--- a/build/bin/wfcsetup.sh
+++ b/build/bin/wfcsetup.sh
@@ -13,6 +13,9 @@ fe_docker=wfc-nginx
 docker_mysql_conf_d=/etc/mysql/conf.d
 docker_my_conf_file=${docker_mysql_conf_d}/my.cnf
 
+wfc_jar_images=$(docker images --format "{{.Repository}}"|grep -E "docker-wfc-|docker_wfc-")
+wfc_modules_images=$(docker images --format "{{.Repository}}"|grep -E "docker-wfc-modules-|docker_wfc-modules-")
+
 case "$1" in
     env)
         # prepare directory
@@ -59,7 +62,7 @@ case "$1" in
             sed "s|proxy_pass http://.*:8080/;|proxy_pass http://${new_ip}:8080/;|" $org_nginx_conf > $tmp_nginx_conf
             mv $tmp_nginx_conf $org_nginx_conf
         fi           
-    ;;
+        ;;
     initdb)
         # init database
         cd ${docker_work_dir}
@@ -82,31 +85,31 @@ case "$1" in
         cd ${docker_work_dir}
         docker-compose stop ${base_dockers}
         docker-compose build ${base_dockers}   
-    ;;
+        ;;
     jar)
         # build docker compose
         cd ${docker_work_dir}
         docker-compose stop ${jar_dockers}
         docker-compose build ${jar_dockers}
-    ;;
+        ;;
     modules)
         # build docker compose
         cd ${docker_work_dir}
         docker-compose stop ${modules_dockers}
         docker-compose build ${modules_dockers}  
-    ;;
+        ;;
     fe)
         # build docker compose
         cd ${docker_work_dir}
         docker-compose stop ${fe_docker}
         docker-compose build ${fe_docker}
-    ;;
+        ;;
     all)
         $0 env $2
         $0 base
         $0 jar
         $0 fe
-    ;;                                  
+        ;;                                  
     rm)
         case "$2" in
             base)
@@ -115,46 +118,57 @@ case "$1" in
                 for base_docker in ${base_dockers}; do
                     docker rm ${base_docker}
                 done   
-            ;;
+                ;;
             jar)
                 cd ${docker_work_dir}
                 docker-compose stop ${jar_dockers}
-                for jar_docker in ${jar_dockers}; do
-                    docker rm ${jar_docker}
-                    docker rmi docker_${jar_docker}
-                done               
-            ;;
+                docker rm ${jar_dockers}
+                if [ ! -z "${wfc_jar_images}" ]; then
+                    docker rmi ${wfc_jar_images} 
+                fi
+               
+                # for jar_docker in ${jar_dockers}; do
+                #     docker rm ${jar_docker}
+                #     docker rmi docker_${jar_docker}                
+                # done               
+                ;;
             modules)
                 cd ${docker_work_dir}
                 docker-compose stop ${modules_dockers}
-                for modules_docker in ${modules_dockers}; do
-                    docker rm ${modules_docker}
-                    docker rmi docker_${modules_docker}
-                done               
-            ;;
+                docker rm ${modules_dockers}
+                if [ ! -z "${wfc_modules_images}" ]; then
+                    docker rmi ${wfc_modules_images} 
+                fi
+           
+                # for modules_docker in ${modules_dockers}; do
+                #     docker rm ${modules_docker}
+                #     docker rmi docker_${modules_docker}
+                #     docker rmi docker-${modules_docker}
+                # done               
+                ;;
             fe)
                 cd ${docker_work_dir}
                 docker-compose stop ${fe_docker}
                 docker rm ${fe_docker}
                 docker rmi nginx                    
-            ;;
+                ;;
             all)
                 $0 rm base
                 $0 rm jar
                 $0 rm fe
-            ;;
+                ;;
             *)
                 echo "WANFi Controller Setup "
                 echo "Usage: $0 rm [base|jar|modules|fe|all]"
                 exit 1 
-            ;;               
+                ;;               
         esac
-    ;;
+        ;;
     *)
         echo "WANFi Control and Billing Management System Setup ... "
         echo "Usage: $0 env|initdb|base|jar|modules|fe|all|rm [base|jar|modules|fe|all]"
         exit 1
-    ;;
+        ;;
 esac
 
 
diff --git a/docs/99-reference/tips.md b/docs/99-reference/tips.md
new file mode 100644
index 0000000..af3fc2f
--- /dev/null
+++ b/docs/99-reference/tips.md
@@ -0,0 +1,19 @@
+# Tips list
+
+## git tips
+
+git clone by ssh
+
+```sh
+    git clone ssh://git@192.168.2.166:3122/WFC/build.wfc.git
+    git remote set-url origin git@192.168.2.166:3122/zhangsz/WFC/be.wfc.git
+```
+
+## docker tips
+
+使用 Docker 日志清理工具
+你可以使用 Docker 提供的 docker system prune 命令来清理未使用的数据，包括日志文件：
+
+```sh
+    docker system prune -a
+```
\ No newline at end of file