diff --git a/ncac/setup.ini b/ncac/setup.ini index e80a1fc..fa8e064 100644 --- a/ncac/setup.ini +++ b/ncac/setup.ini @@ -11,6 +11,9 @@ DB_INS=cacdb DB_USER=root DB_PASS=SHXYcac_2024 +### 是否安装CAC ### +CAC_INS=1 + ### CAC是否加入开机启动 ### AUTO_START=1 diff --git a/ncac/setup.sh b/ncac/setup.sh index 990aa9d..33e0d3f 100644 --- a/ncac/setup.sh +++ b/ncac/setup.sh @@ -5,7 +5,7 @@ rpm -i package/mysql57-community-release-el7-9.noarch.rpm rm -f /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 chmod +x prelib.sh -./prelib.sh + #################### init system env ################################################ @@ -136,7 +136,7 @@ installRedis(){ installNewCAC(){ echo "************[installing New CAC]正在安装New CAC >>>>>>>>>>>>>" echo "" - APP_NAME=cac-backend-0.0.1 + APP_NAME=cac-backend-1.0 rm -rf ${CAC_DIR}/* cp package/${APP_NAME}.jar ${CAC_DIR}/ unzip -q package/static.zip -d ${CAC_DIR}/ @@ -294,11 +294,17 @@ updateFirewall(){ 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 +if [ $GUI_INS == 1 ]; then + ./prelib.sh +fi + +if [ $CAC_INS == 1 ]; then + if [ $JDK_INS == 0 ]; then + JAVA_PATH=$(which java) + if [ -z $JAVA_PATH ]; then + JDK_INS=1 + fi + fi fi BASE_DIR=${BASE_DIR%*/} @@ -318,9 +324,6 @@ fi if [ $JDK_INS == 1 ]; then installJDK -else - echo ${JAVA_PATH}" found, 跳过JDK." - echo "" fi if [ $REDIS_INS == 1 ]; then @@ -328,10 +331,11 @@ if [ $REDIS_INS == 1 ]; then setAutoStartRedis fi -installNewCAC - -if [ $AUTO_START == 1 ]; then - setAutoStartCac +if [ $CAC_INS == 1 ]; then + installNewCAC + if [ $AUTO_START == 1 ]; then + setAutoStartCac + fi fi if [ $GUI_INS == 1 ]; then