perf: 调整nginx配置和路径

ncac/setup.sh

@@ -46,9 +46,7 @@ installNginx(){
     if [ ! -d ${NGX_HOME} ]; then
       tar -zxf package/nginx.tar.gz -C ${BASE_DIR}
       echo ${NGX_HOME}" installed."
-      cp package/cac.conf ${NGX_HOME}/conf.d/
+      sed -i 's#/etc/nginx/conf.d#'${BASE_DIR}'/conf#g' ${NGX_HOME}/conf/nginx.conf
-      sed -i 's#/etc/nginx#'${NGX_HOME}'#g' ${NGX_HOME}/conf/nginx.conf
-      sed -i 's#static#'${CAC_DIR}'/static#g' ${NGX_HOME}/conf.d/cac.conf
 
       echo ${NGX_HOME}'/sbin/nginx -c '${NGX_HOME}'/conf/nginx.conf' > ${BIN_DIR}/startNginx.sh
       echo ${NGX_HOME}'/sbin/nginx -s stop' > ${BIN_DIR}/stopNginx.sh
@@ -98,6 +96,8 @@ installNewCAC(){
     rm -rf ${CAC_DIR}/*
     cp package/${CAC_APP}.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
     sleep 1
@@ -127,43 +127,8 @@ installNewCAC(){
     chmod +x ${BIN_DIR}/startCac.sh
     chmod +x ${BIN_DIR}/stopCac.sh
     echo ""
-    sleep 1
+    echo 'export PATH=$PATH:'${BIN_DIR} >> /etc/profile
-}
+    source /etc/profile
-
-#################### 安装dlhl ################################################
-installDLHL(){
-    echo "************[installing cac-front-server]正在安装cac-front-server >>>>>>>>>>>>>"
-    DLHL_APP=dlhl-0.0.1
-    rm -rf ${DLHL_DIR}/*
-    cp package/${DLHL_APP}.jar ${DLHL_DIR}/
-    echo ${DLHL_DIR}" installed."
-    unzip -qj package/${DLHL_APP}.jar BOOT-INF/classes/application.yml -d ${DLHL_DIR}/config
-    sleep 1
-    sed -i 's/cac_new/'${DB_INS}'/' ${DLHL_DIR}/config/application.yml
-    sed -i 's/192.168.128.86:3306/'${DB_IP}':'${DB_PORT}'/' ${DLHL_DIR}/config/application.yml
-    sed -i 's/username: root/username: '${DB_USER}'/' ${DLHL_DIR}/config/application.yml
-    sed -i 's/password: 123456/password: '${DB_PASS}'/' ${DLHL_DIR}/config/application.yml
-    sed -i 's/#password: 111111/password: '${REDIS_PASS}'/' ${DLHL_DIR}/config/application.yml
-
-    echo '#!/bin/bash' > ${BIN_DIR}/startDlhl.sh
-    echo 'if [ -n "$(ps -ef | grep '${DLHL_APP}' | grep -v grep | awk '"'"'{print $2}'"'"')" ]; then' >> ${BIN_DIR}/startDlhl.sh
-    echo '  echo "'${DLHL_APP}' is running"' >> ${BIN_DIR}/startDlhl.sh
-    echo 'else' >> ${BIN_DIR}/startDlhl.sh
-    echo "  cd "${DLHL_DIR} >> ${BIN_DIR}/startDlhl.sh
-    echo '  echo "Starting '${DLHL_APP}'"' >> ${BIN_DIR}/startDlhl.sh
-    echo "  nohup ${JAVA_PATH} -jar ${DLHL_APP}.jar >dlhl.log 2>&1 &" >> ${BIN_DIR}/startDlhl.sh
-    echo 'fi' >> ${BIN_DIR}/startDlhl.sh
-
-    echo '#!/bin/bash' > ${BIN_DIR}/stopDlhl.sh
-    echo 'if [ -n "$(ps -ef | grep '${DLHL_APP}' | grep -v grep | awk '"'"'{print $2}'"'"')" ]; then' >> ${BIN_DIR}/stopDlhl.sh
-    echo '  kill -9 $(ps -ef | grep '${DLHL_APP}' | grep -v grep | awk '"'"'{print $2}'"'"')' >> ${BIN_DIR}/stopDlhl.sh
-    echo '  echo "Stopping '${DLHL_APP}'"' >> ${BIN_DIR}/stopDlhl.sh
-    echo 'else' >> ${BIN_DIR}/stopDlhl.sh
-    echo '  echo "'${DLHL_APP}' is not running"' >> ${BIN_DIR}/stopDlhl.sh
-    echo 'fi' >> ${BIN_DIR}/stopDlhl.sh
-    chmod +x ${BIN_DIR}/startDlhl.sh
-    chmod +x ${BIN_DIR}/stopDlhl.sh
-    echo ""
     sleep 1
 }
 
@@ -208,6 +173,7 @@ DLHL_DIR=${BASE_DIR}/dlhl
 ### 创建默认的目录
 mkdir -p ${BIN_DIR}
 mkdir -p ${CAC_DIR}
+mkdir -p ${BASE_DIR}/conf
 
 if [ $JDK_INS == 1 ]; then
     installJDK