fix:健康评估脚本调整

jkpg/centos7/setup.sh

@@ -175,11 +175,11 @@ installNewJKPG(){
     chown -R sftpuser:sftpuser ${JKPG_HOME}/filestore
 
     cp package/jkpg.conf ${BASE_DIR}/conf
-	sed -i 's#/home/xydl#'${BASE_DIR}'#g' ${BASE_DIR}/conf/jkpg.conf
+	  sed -i 's#/home/xydl#'${BASE_DIR}'#g' ${BASE_DIR}/conf/jkpg.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' ${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
@@ -232,10 +232,85 @@ installZookeeper(){
 }
 
 
+installOpenCV(){
+	echo "************[installing Opencv3]正在安装Opencv3 >>>>>>>>>>>>>"
+	echo ""
+	CV_HOME=${BASE_DIR}/opencv3
+	if [ ! -d ${CV_HOME} ]; then
+		tar -zxf package/opencv3.tar.gz -C ${BASE_DIR}
+        echo ${CV_HOME}" installed."
+		
+		if [ `grep -c OPENCV_DIR=${CV_HOME} /etc/profile` -eq '0' ]; then
+			echo '' >> /etc/profile
+			echo 'export OPENCV_DIR='${CV_HOME} >> /etc/profile
+			echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPENCV_DIR/lib' >> /etc/profile
+			echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$OPENCV_DIR/lib/pkgconfig' >> /etc/profile
+			source /etc/profile
+    fi
+		
+	else
+		echo ${CV_HOME}" found, 跳过opencv."
+	fi
+	echo ""
+	sleep 1
+}
+
+
+installIecServer(){
+	echo "************[installing IecServer]正在安装IecServer >>>>>>>>>>>>>"
+	echo ""
+	IEC_HOME=${BASE_DIR}/iecserver
+	if [ ! -d ${IEC_HOME} ]; then
+		tar -zxf package/iecserver.tar.gz -C ${BASE_DIR}
+        echo ${IEC_HOME}" installed."
+		
+		sed -i 's#jsyx#'${DB_INS}'#g' ${IEC_HOME}/etc/ht_service.conf
+		sed -i 's#root#'${DB_USER}'#g' ${IEC_HOME}/etc/ht_service.conf
+		sed -i 's#123456#'${DB_PASS}'#g' ${IEC_HOME}/etc/ht_service.conf
+		
+		if [ ! -f "/usr/lib64/mysql/libmysqlclient.so.18" ]; then 
+			cp package/libmysqlclient.so.18.0.0 /usr/lib64/mysql
+			ldconfig
+		fi
+	
+	else
+		echo ${IEC_HOME}" found, 跳过iecserver."
+	fi
+	echo ""
+  sleep 1
+}
+
+
+installComtrad(){
+	echo "************[installing Comtrad]正在安装Comtrad >>>>>>>>>>>>>"
+	echo ""
+	COMTRAD_HOME=${BASE_DIR}/comtrad
+	if [ ! -d ${COMTRAD_HOME} ]; then
+		tar -zxf package/comtrad.tar.gz -C ${BASE_DIR}
+        echo ${COMTRAD_HOME}" installed."
+		
+		sed -i 's#jsyx#'${DB_INS}'#g' ${COMTRAD_HOME}/etc/htiecsvr.conf
+		sed -i 's#root#'${DB_USER}'#g' ${COMTRAD_HOME}/etc/htiecsvr.conf
+		sed -i 's#123456#'${DB_PASS}'#g' ${COMTRAD_HOME}/etc/htiecsvr.conf
+		
+		sed -i 's#/home/xydl#'${BASE_DIR}'#g' ${COMTRAD_HOME}/etc/htiecsvr.conf
+
+	else
+		echo ${COMTRAD_HOME}" found, 跳过comtrad."
+	fi
+	echo ""
+  sleep 1
+}
 
 
 
 #################### 加入开机启动 ################################################
+setWaitDbStart(){
+    echo 'while ! systemctl is-active --quiet mysqld; do' >> /etc/rc.d/rc.local
+    echo '    sleep 1' >> /etc/rc.d/rc.local
+    echo 'done' >> /etc/rc.d/rc.local
+    echo ""
+}
 setAutoStartTomcat(){
     if [ `grep -c ${BASE_DIR}/tomcat9/bin/startup.sh /etc/rc.d/rc.local` -eq '0' ]; then
         echo '#Tomcat' >> /etc/rc.d/rc.local
@@ -247,10 +322,10 @@ setAutoStartTomcat(){
 }
 setAutoStartRedis(){
     if [ `grep -c ${BIN_DIR}/startRedis.sh /etc/rc.d/rc.local` -eq '0' ]; then
-         echo '#Redis' >> /etc/rc.d/rc.local
-         echo ${BIN_DIR}/startRedis.sh >> /etc/rc.d/rc.local
-         echo "Redis已加入开机启动."
-         echo ""
+		echo '#Redis' >> /etc/rc.d/rc.local
+		echo ${BIN_DIR}/startRedis.sh >> /etc/rc.d/rc.local
+		echo "Redis已加入开机启动."
+		echo ""
     fi
 }
 
@@ -273,6 +348,28 @@ setAutoStartZookeeper(){
     fi
 }
 
+setAutoStartIecServer(){
+	if [ `grep -c ${BASE_DIR}'/iecserver/bin/iecser start' /etc/rc.d/rc.local` -eq '0' ]; then
+		echo '#IecServer' >> /etc/rc.d/rc.local
+		echo 'export OPENCV_DIR='${CV_HOME} >> /etc/rc.d/rc.local
+		echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPENCV_DIR/lib' >> /etc/rc.d/rc.local
+		echo 'cd '${BASE_DIR}/iecserver/bin >> /etc/rc.d/rc.local
+		echo ./iecser start >> /etc/rc.d/rc.local
+		echo "IecServer已加入开机启动."
+        echo ''
+	fi
+}
+
+setAutoStartComtrad(){
+	if [ `grep -c ${BASE_DIR}'/comtrad/bin/comtrad start' /etc/rc.d/rc.local` -eq '0' ]; then
+		echo '#comtrad' >> /etc/rc.d/rc.local
+		echo 'cd '${BASE_DIR}/comtrad/bin >> /etc/rc.d/rc.local
+		echo ./comtrad start >> /etc/rc.d/rc.local
+		echo "comtrad已加入开机启动."
+        echo ''
+	fi
+}
+
 
 
 updateFirewall(){
@@ -314,6 +411,7 @@ fi
 
 if [ $MYSQL_INS == 1 ]; then
     installDatabase
+    setWaitDbStart
 fi
 
 if [ $DB_CREATE == 1 ]; then
@@ -348,6 +446,20 @@ if [ $NGINX_INS == 1 ]; then
     setAutoStartNginx
 fi
 
+if [ $CV_INS == 1 ]; then
+    installOpenCV
+fi
+
+if [ $IEC_INS == 1 ]; then
+    installIecServer
+    setAutoStartIecServer
+fi
+
+if [ $COMTRAD_INS == 1 ]; then
+    installComtrad
+    setAutoStartComtrad
+fi
+
 updateFirewall
 
 echo "************[install finished.]安装完成. >>>>>>>>>>>>>"

jkpg/setup.ini

@@ -35,4 +35,13 @@ NGINX_INS=1
 ### 是否安装自带的Redis ###
 REDIS_INS=1
 ### Redis的密码 ###
-REDIS_PASS=
+REDIS_PASS=
+
+### 是否安装opencv
+CV_INS=1
+
+### 是否安装iecserver
+IEC_INS=1
+
+### 是否安装comtrad
+COMTRAD_INS=1