Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

qa_shell_script/config_server/get_project_config.js

@@ -49,7 +49,8 @@ pClass.prototype = {
 		}
 	}
 	// projectName,projectType,port,gitPath,logName,configFile,command,nodeVersion
-new pClass().init(true, "java", "7003", "xyqb", "QG", "xyqb.log", "application.properties", null, null, 2, "现金贷和白条-server","");
+new pClass().init(true, "java", "7003", "xyqb", "QG", "xyqb.log", "application.properties", null, null, 2, "现金贷-server","");
+new pClass().init(true, "java", "7025", "baitiao", "QG", "baitiao.log", "application.properties", null, null, 2, "白条-server","");
 new pClass().init(true, "java", "7019", "xyqb-mall", "QG", "mall.log", "application.properties", null, null, 2, "商城后台-server","");
 new pClass().init(true, "java", "7010", "xyqb-offline", "QG", "xyqb_offline.log", "application.properties", null, null, 2, "线下业务-server","");
 new pClass().init(true, "java", "7042", "xyqb-user2", "head_group", "xyqb_user.log", "application.properties", null, null, 2, "用户注册登录-V2-server","");

sh-utils/center/4_java_restart.sh

@@ -45,7 +45,7 @@ then
 elif [[ "${module_name}" = "cash-loan-flow" ]]
 then 
 	log_path=/home/quant_group/logs/cash_loan_flow.log
-elif [[ "${module_name}" = "xyqb-user" ]]
+elif [[ "${module_name}" = "xyqb-user2" ]]
 then 
 	log_path=/home/quant_group/logs/xyqb_user.log
 else