From 379011c0dbaf50ca5096b8e9cb0cc2ca10b09a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= <guocheng@xinyingpower.com>
Date: Mon, 20 Jan 2025 14:09:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=81=A5=E5=BA=B7?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jkpg/centos7/setup.sh | 70 +++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/jkpg/centos7/setup.sh b/jkpg/centos7/setup.sh
index 8eb6403..ae10023 100644
--- a/jkpg/centos7/setup.sh
+++ b/jkpg/centos7/setup.sh
@@ -150,6 +150,8 @@ installTomcat(){
     TOMCAT_HOME=${BASE_DIR}/tomcat9
     if [ ! -d ${TOMCAT_HOME} ]; then
         tar -zxf package/tomcat9.tar.gz -C ${BASE_DIR}
+        sed -i 's#export XYDL_DIR=.*#export XYDL_DIR='${BASE_DIR}'#g' ${TOMCAT_HOME}/bin/startup.sh
+        echo ${TOMCAT_HOME}" installed."
 
     else
         echo ${TOMCAT_HOME}" found, 跳过Tomcat."
@@ -160,51 +162,36 @@ installTomcat(){
 
 
 installNewJKPG(){
-    echo "************[installing New JKPG]正在安装New JKPG >>>>>>>>>>>>>"
+    echo "************[installing 健康评估]正在安装健康评估 >>>>>>>>>>>>>"
     echo ""
-    TOMCAT_HOME=${BASE_DIR}/tomcat9
-    cp package/jkpg.conf ${BASE_DIR}/conf/
     unzip -q package/static.zip -d ${JKPG_HOME}/
+    unzip -q package/filestore.zip -d ${JKPG_HOME}/
 
-    cp -r package/busi-app-control ${TOMCAT_HOME}/webapps/
-    cp -r package/busi-back-control ${TOMCAT_HOME}/webapps/
-    cp -r package/busi-back-serviceImpl ${TOMCAT_HOME}/webapps/
-    cp -r package/busi-back-ws ${TOMCAT_HOME}/webapps/
-    cp -r package/frame-base-control ${TOMCAT_HOME}/webapps/
-    cp -r package/frame-base-serviceImpl ${TOMCAT_HOME}/webapps/
-
-    sed -i 's#jsyx#'${DB_INS}'#g' ${TOMCAT_HOME}/webapps/busi-back-serviceImpl/WEB-INF/classes/jdbc.properties
-    sed -i 's#root#'${DB_USER}'#g' ${TOMCAT_HOME}/webapps/busi-back-serviceImpl/WEB-INF/classes/jdbc.properties
-    sed -i 's#123456#'${DB_PASS}'#g' ${TOMCAT_HOME}/webapps/busi-back-serviceImpl/WEB-INF/classes/jdbc.properties
-
-    sed -i 's#jsyx#'${DB_INS}'#g' ${TOMCAT_HOME}/webapps/frame-base-serviceImpl/WEB-INF/classes/jdbc.properties
-    sed -i 's#root#'${DB_USER}'#g' ${TOMCAT_HOME}/webapps/frame-base-serviceImpl/WEB-INF/classes/jdbc.properties
-    sed -i 's#123456#'${DB_PASS}'#g' ${TOMCAT_HOME}/webapps/frame-base-serviceImpl/WEB-INF/classes/jdbc.properties
-
-    sed -i 's#jsyx#'${DB_INS}'#g' ${TOMCAT_HOME}/webapps/busi-app-control/WEB-INF/classes/application.properties
-    sed -i 's#root#'${DB_USER}'#g' ${TOMCAT_HOME}/webapps/busi-app-control/WEB-INF/classes/application.properties
-    sed -i 's#123456#'${DB_PASS}'#g' ${TOMCAT_HOME}/webapps/busi-app-control/WEB-INF/classes/application.properties
+    cp package/jkpg.conf ${BASE_DIR}/conf
+    cp package/application.properties ${JKPG_HOME}/
+    cp package/jdbc.properties ${JKPG_HOME}/
+    cp package/redis.properties ${JKPG_HOME}/
 
-    sed -i 's#jsyx#'${DB_INS}'#g' ${TOMCAT_HOME}/webapps/busi-back-control/WEB-INF/classes/application.properties
-    sed -i 's#root#'${DB_USER}'#g' ${TOMCAT_HOME}/webapps/busi-back-control/WEB-INF/classes/application.properties
-    sed -i 's#123456#'${DB_PASS}'#g' ${TOMCAT_HOME}/webapps/busi-back-control/WEB-INF/classes/application.properties
+    sed -i 's#jsyx#'${DB_INS}'#g' ${JKPG_HOME}/application.properties
+    sed -i 's#root#'${DB_USER}'#g' ${JKPG_HOME}/application.properties
+    sed -i 's#123456#'${DB_PASS}'#g' ${JKPG_HOME}/application.properties
 
-    sed -i 's#jsyx#'${DB_INS}'#g' ${TOMCAT_HOME}/webapps/busi-back-ws/WEB-INF/classes/application.properties
-    sed -i 's#root#'${DB_USER}'#g' ${TOMCAT_HOME}/webapps/busi-back-ws/WEB-INF/classes/application.properties
-    sed -i 's#123456#'${DB_PASS}'#g' ${TOMCAT_HOME}/webapps/busi-back-ws/WEB-INF/classes/application.properties
-
-    sed -i 's#jsyx#'${DB_INS}'#g' ${TOMCAT_HOME}/webapps/frame-base-control/WEB-INF/classes/application.properties
-    sed -i 's#root#'${DB_USER}'#g' ${TOMCAT_HOME}/webapps/frame-base-control/WEB-INF/classes/application.properties
-    sed -i 's#123456#'${DB_PASS}'#g' ${TOMCAT_HOME}/webapps/frame-base-control/WEB-INF/classes/application.properties
+    sed -i 's#jsyx#'${DB_INS}'#g' ${JKPG_HOME}/jdbc.properties
+    sed -i 's#root#'${DB_USER}'#g' ${JKPG_HOME}/jdbc.properties
+    sed -i 's#123456#'${DB_PASS}'#g' ${JKPG_HOME}/jdbc.properties
 
     if [ ! -z ${REDIS_PASS} ]; then
-        sed -i 's#redis.password.*#redis.password='${REDIS_PASS}'#g' ${TOMCAT_HOME}/webapps/busi-app-control/WEB-INF/classes/redis.properties
-        sed -i 's#redis.password.*#redis.password='${REDIS_PASS}'#g' ${TOMCAT_HOME}/webapps/busi-back-control/WEB-INF/classes/redis.properties
-        sed -i 's#redis.password.*#redis.password='${REDIS_PASS}'#g' ${TOMCAT_HOME}/webapps/busi-back-serviceImpl/WEB-INF/classes/redis.properties
-        sed -i 's#redis.password.*#redis.password='${REDIS_PASS}'#g' ${TOMCAT_HOME}/webapps/frame-base-control/WEB-INF/classes/redis.properties
-        sed -i 's#redis.password.*#redis.password='${REDIS_PASS}'#g' ${TOMCAT_HOME}/webapps/frame-base-serviceImpl/WEB-INF/classes/redis.properties
+        sed -i 's#redis.password.*#redis.password='${REDIS_PASS}'#g' ${JKPG_HOME}/redis.properties
     fi
 
+    #unzip -q package/busi-app-control.war -d ${TOMCAT_HOME}/webapps/busi-app-control
+    cp package/busi-app-control.war ${TOMCAT_HOME}/webapps/
+    cp package/busi-back-control.war ${TOMCAT_HOME}/webapps/
+    cp package/busi-back-serviceImpl.war ${TOMCAT_HOME}/webapps/
+    cp package/busi-back-ws.war ${TOMCAT_HOME}/webapps/
+    cp package/frame-base-control.war ${TOMCAT_HOME}/webapps/
+    cp package/frame-base-serviceImpl.war ${TOMCAT_HOME}/webapps/
+
     echo ""
     sleep 1
 
@@ -271,6 +258,7 @@ setAutoStartNginx(){
 setAutoStartZookeeper(){
     if [ `grep -c ${BASE_DIR}'/zookeeper-3.4.14/bin/zkServer.sh start' /etc/rc.d/rc.local` -eq '0' ]; then
       echo '#Zookeeper' >> /etc/rc.d/rc.local
+      echo export JAVA_HOME=${JAVA_HOME} >> /etc/rc.d/rc.local
       echo ${BASE_DIR}/zookeeper-3.4.14/bin/zkServer.sh start >> /etc/rc.d/rc.local
       echo "Zookeeper已加入开机启动."
       echo ""
@@ -282,7 +270,7 @@ setAutoStartZookeeper(){
 updateFirewall(){
     echo "更新防火墙规则."
     echo ""
-    firewall-cmd --permanent --zone=public --add-port=90/tcp
+    firewall-cmd --permanent --zone=public --add-port=80/tcp
     firewall-cmd --permanent --zone=public --add-port=443/tcp
     firewall-cmd --permanent --zone=public --add-port=3306/tcp
     firewall-cmd --permanent --zone=public --add-port=102/tcp
@@ -302,10 +290,12 @@ JKPG_HOME=${BASE_DIR}/jkpg
 mkdir -p ${BIN_DIR}
 mkdir -p ${JKPG_HOME}
 mkdir -p ${BASE_DIR}/conf
-if [ ! -e "/etc/rc.local" ]; then
-    cp package/rc.local /etc/
+
+if [ ! -e "/etc/rc.d/rc.local" ]; then
+    cp package/rc.local /etc/rc.d/
 fi
-chmod +x /etc/rc.local
+chmod +x /etc/rc.d/rc.local
+
 if [ `grep -c 'Install' /lib/systemd/system/rc-local.service` -eq '0' ]; then
     echo '' >> /lib/systemd/system/rc-local.service
     echo '[Install]' >> /lib/systemd/system/rc-local.service