From baf0da782dd46e328d0e4503f99635de59158b43 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 27 Mar 2024 10:44:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0jdk=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ncac/setup.ini |  5 ++++-
 ncac/setup.sh  | 39 +++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/ncac/setup.ini b/ncac/setup.ini
index 3ba60e9..32c7109 100644
--- a/ncac/setup.ini
+++ b/ncac/setup.ini
@@ -8,9 +8,12 @@ DB_INS=cacdb
 DB_USER=root
 DB_PASS=123456
 
-### 是否加入开机启动 ###
+### CAC是否加入开机启动 ###
 AUTO_START=1
 
+### 是否安装自带的JDK ###
+JDK_INS=1
+
 ### 是否安装自带的Nginx ###
 NGINX_INS=1
 
diff --git a/ncac/setup.sh b/ncac/setup.sh
index cf4eebd..0fa225d 100644
--- a/ncac/setup.sh
+++ b/ncac/setup.sh
@@ -9,12 +9,7 @@ if [ X"${SYSBIT}" != X"64" ]; then
     exit 1
 fi
 ARM=`arch`
-JAVA_PATH=$(which java)
-if [ -z $JAVA_PATH ]; then
-    JDK_INS=1
-else
-    JDK_INS=0
-fi
+
 
 
 #################### 安装OpenJDK ################################################
@@ -94,14 +89,14 @@ installRedis(){
 #################### 安装New CAC ################################################
 installNewCAC(){
     echo "************[installing New CAC]正在安装New CAC >>>>>>>>>>>>>"
-    CAC_APP=cac-backend-0.0.1
+    APP_NAME=cac-backend-0.0.1
     rm -rf ${CAC_DIR}/*
-    cp package/${CAC_APP}.jar ${CAC_DIR}/
+    cp package/${APP_NAME}.jar ${CAC_DIR}/
     unzip -q package/static.zip -d ${CAC_DIR}/
     cp package/cac.conf ${BASE_DIR}/conf/
     sed -i 's#static#'${CAC_DIR}'/static#g' ${BASE_DIR}/conf/cac.conf
     echo ${CAC_DIR}" installed."
-    unzip -qj package/${CAC_APP}.jar BOOT-INF/classes/application-prod.yml -d ${CAC_DIR}/config
+    unzip -qj package/${APP_NAME}.jar BOOT-INF/classes/application-prod.yml -d ${CAC_DIR}/config
     sleep 1
     sed -i 's/iec104/'${DB_INS}'/' ${CAC_DIR}/config/application-prod.yml
     sed -i 's/127.0.0.1:3306/'${DB_IP}':'${DB_PORT}'/' ${CAC_DIR}/config/application-prod.yml
@@ -109,22 +104,22 @@ installNewCAC(){
     sed -i 's/password: Iec@1043/password: '${DB_PASS}'/' ${CAC_DIR}/config/application-prod.yml
 
     echo '#!/bin/bash' > ${BIN_DIR}/startCac.sh
-    echo 'if [ -n "$(ps -ef | grep '${CAC_APP}' | grep -v grep | awk '"'"'{print $2}'"'"')" ]; then' >> ${BIN_DIR}/startCac.sh
-    echo '  echo "'${CAC_APP}' is running"' >> ${BIN_DIR}/startCac.sh
+    echo 'if [ -n "$(ps -ef | grep '${APP_NAME}' | grep -v grep | awk '"'"'{print $2}'"'"')" ]; then' >> ${BIN_DIR}/startCac.sh
+    echo '  echo "'${APP_NAME}' is running"' >> ${BIN_DIR}/startCac.sh
     echo 'else' >> ${BIN_DIR}/startCac.sh
     echo "  cd "${CAC_DIR} >> ${BIN_DIR}/startCac.sh
-    echo '  echo "Starting '${CAC_APP}'"' >> ${BIN_DIR}/startCac.sh
-    echo "  nohup ${JAVA_PATH} -jar ${CAC_APP}.jar --spring.profiles.active=prod >/dev/null 2>&1 &" >> ${BIN_DIR}/startCac.sh
+    echo '  echo "Starting '${APP_NAME}'"' >> ${BIN_DIR}/startCac.sh
+    echo "  nohup ${JAVA_PATH} -jar ${APP_NAME}.jar --spring.profiles.active=prod >/dev/null 2>&1 &" >> ${BIN_DIR}/startCac.sh
     echo "  rm -f ${CAC_DIR}/RUNNING.lock" >> ${BIN_DIR}/startCac.sh
     echo 'fi' >> ${BIN_DIR}/startCac.sh
 
     echo '#!/bin/bash' > ${BIN_DIR}/stopCac.sh
-    echo 'if [ -n "$(ps -ef | grep '${CAC_APP}' | grep -v grep | awk '"'"'{print $2}'"'"')" ]; then' >> ${BIN_DIR}/stopCac.sh
+    echo 'if [ -n "$(ps -ef | grep '${APP_NAME}' | grep -v grep | awk '"'"'{print $2}'"'"')" ]; then' >> ${BIN_DIR}/stopCac.sh
     echo "  rm -f ${CAC_DIR}/RUNNING.lock" >> ${BIN_DIR}/stopCac.sh
-    echo '  kill -9 $(ps -ef | grep '${CAC_APP}' | grep -v grep | awk '"'"'{print $2}'"'"')' >> ${BIN_DIR}/stopCac.sh
-    echo '  echo "Stopping '${CAC_APP}'"' >> ${BIN_DIR}/stopCac.sh
+    echo '  kill -9 $(ps -ef | grep '${APP_NAME}' | grep -v grep | awk '"'"'{print $2}'"'"')' >> ${BIN_DIR}/stopCac.sh
+    echo '  echo "Stopping '${APP_NAME}'"' >> ${BIN_DIR}/stopCac.sh
     echo 'else' >> ${BIN_DIR}/stopCac.sh
-    echo '  echo "'${CAC_APP}' is not running"' >> ${BIN_DIR}/stopCac.sh
+    echo '  echo "'${APP_NAME}' is not running"' >> ${BIN_DIR}/stopCac.sh
     echo 'fi' >> ${BIN_DIR}/stopCac.sh
     chmod +x ${BIN_DIR}/startCac.sh
     chmod +x ${BIN_DIR}/stopCac.sh
@@ -168,11 +163,16 @@ setAutoStartNginx(){
 sed -i 's/\r//g' setup.ini
 source setup.ini
 
+if [ $JDK_INS == 0 ]; then
+  JAVA_PATH=$(which java)
+  if [ -z $JAVA_PATH ]; then
+    JDK_INS=1
+  fi
+fi
 
 BASE_DIR=${BASE_DIR%*/}
 BIN_DIR=${BASE_DIR}/bin
 CAC_DIR=${BASE_DIR}/ncac
-DLHL_DIR=${BASE_DIR}/dlhl
 
 ### 创建默认的目录
 mkdir -p ${BIN_DIR}
@@ -205,8 +205,7 @@ fi
 echo "************[install finished.]安装完成. >>>>>>>>>>>>>"
 echo ""
 sleep 1
-echo "tips: 记得运行 source /etc/profile"
-echo "      使配置生效，之后可以使用${BIN_DIR}目录下的下列脚本"
+echo "tips: 记得运行 source /etc/profile 使配置生效，之后可以使用${BIN_DIR}目录下的下列脚本"
 cd ${BIN_DIR}
 ls
 echo ""
\ No newline at end of file