update

qa_shell_script/3_link_config_file_by_name.sh

@@ -39,6 +39,8 @@ else
 		
 		if [ "$project" = "xyqb-mall" ]
 		then
+			rm -rf /home/quant_group/xyqb-mall/baitiao
+			echo "~~ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao"
 			ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao
 		fi
 	fi

qa_shell_script/3_link_config_file_by_type.sh

@@ -32,6 +32,7 @@ function linkProjectConfig()
 	
 	if [ "$project" = "xyqb-mall" ]
 	then
+		rm -rf /home/quant_group/xyqb-mall/baitiao
 		echo "~~ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao"
 		ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao
 	fi

qa_shell_script/5_restart_by_name.sh

@@ -45,18 +45,23 @@ function restartJavaProject()
 		fi
 	fi
 	
-	if [ "$project" = "xyqb-mall" ]
-	then
-	    rm -rf /home/quant_group/xyqb-mall/baitiao
-		echo `ln -s $config_path/pem_file/ /home/quant_group/xyqb-mall/baitiao/`
-	fi
+	#if [ "$project" = "xyqb-mall" ]
+	#then
+	#    rm -rf /home/quant_group/xyqb-mall/baitiao
+	#	echo `ln -s $config_path/pem_file/ /home/quant_group/xyqb-mall/baitiao/`
+	#fi
 	
 	echo "-----project:$project while be run command: java -Xmx256m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &"
 	log_name=`node $config_server/get_project_config.js  -name $project -attr log_name`
 	
-	mv $project_path/logs/$log_name $project_path/logs/logs_back/$project-$time.log
+	#mv $project_path/logs/$log_name $project_path/logs/logs_back/$project-$time.log
 	
+	if [[ $project == "redpacket" ]]; then
+		echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
+	else
 		echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
+	fi
+	#echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
 	
 	#sleep 30s
 	ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}

qa_shell_script/5_restart_by_type.sh

@@ -47,14 +47,20 @@ function restartJavaProject()
 			fi
 		fi
 		
-		if [ "$project" = "xyqb-mall" ]
-		then
-		    rm -rf /home/quant_group/xyqb-mall/baitiao
-			echo `ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao`
-		fi
+		#if [ "$project" = "xyqb-mall" ]
+		#then
+		#    rm -rf /home/quant_group/xyqb-mall/baitiao
+		#	echo `ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao`
+		#fi
 		
 		echo "-----project:$project while be run command: java -Xmx256m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &"
+		#echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
+		if [[ $project == "redpacket" ]]; then
+			echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
+		else
 			echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
+		fi
+
 		#sleep 30s
 		ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
 

qa_shell_script/config_server/get_project_config.js

@@ -55,19 +55,19 @@ new pClass().init(true, "java", "7042", "xyqb-user2", "head_group", "xyqb_user.l
 new pClass().init(true, "java", "7005", "di-ting", "QG", "di_ting.log", "application.properties", null, null, 2, "风控审计-server");
 new pClass().init(true, "java", "7013", "han-gu-guan", "QG", "han-gu-guan.log", "application.properties", null, null, 2, "用户注册登录-V1-server");
 new pClass().init(true, "java", "7015", "jian-men-guan", "QG", "jian_men_guan.log", "application.properties", null, null, 2, "信审服务-server");
-new pClass().init(true, "java", "7014", "du-jiang-yan", "QG", "du_jiang_yan.log", "application.properties", null, null, 2, "第三方对接-server");
 new pClass().init(true, "java", "7028", "black-hole", "QG", "black-hole.log", "application.properties", null, null, 2, "合同中心-server");
+new pClass().init(true, "java", "7021", "spider-center", "QG", "spider-center.log", "application.properties", null, null, 2, "授信-server"); 
+new pClass().init(true, "java", "7006", "gu-bei", "QG", "pay-center.log", "application.properties", null, null, 2, "支付中心-server"); 
+new pClass().init(true, "java", "7023", "xyqb-quartz", "QG", "quartz.log", "application.properties", null, null, 2, "定时任务-server");
 new pClass().init(true, "java", "7037", "cash-loan-flow", "QG", "cash_loan_flow.log", "application.properties", null, null, 2, "现金贷流量对接-server");
 new pClass().init(true, "java", "7012", "financial-system", "QG", "financial_system.log", "application.properties", null, null, 2, "财务系统-server");
 new pClass().init(true, "java", "7034", "fund-manage", "QG", "fund_manage.log", "application.properties", null, null, 2, "债转系统-server");
 new pClass().init(true, "java", "7029", "gyxd", "QG", "gyxd.log", "application.properties", null, null, 2, "广源小贷-server");
 new pClass().init(true, "java", "7038", "merchant-backend", "QG", "merchant.log", "application.properties", null, null, 2, "商户后台-server","凌子华／陈东亮");
-new pClass().init(true, "java", "7021", "spider-center", "QG", "spider-center.log", "application.properties", null, null, 2, "爬虫-server"); //名称需要改一下
-new pClass().init(true, "java", "7006", "gu-bei", "QG", "pay-center.log", "application.properties", null, null, 2, "支付中心-server"); //支付中心
-new pClass().init(true, "java", "7023", "xyqb-quartz", "QG", "quartz.log", "application.properties", null, null, 2, "定时任务-server");
 new pClass().init(true, "java", "7031", "redpacket", "QG", "redpacket.log", "application.properties", null, null, 2, "红包系统-server");
 new pClass().init(true, "java", "7044", "finance-api", "bo.wang", "finance-api.log", "application.properties", null, null, 2, "财务系统-server");
 new pClass().init(true, "java", "7045", "check-accounts", "QG", "check_accounts.log", "application.properties", null, null, 2, "对账系统-server");
+new pClass().init(true, "java", "7014", "du-jiang-yan", "QG", "du_jiang_yan.log", "application.properties", null, null, 2, "第三方对接-server");
 // new pClass(true,"java","7027","sms-center","QG","sms-center.log",null,null,null,"短信中心-server");
 // ui----
 // projectName,projectType,port,gitPath,logName,configFile,command,nodeVersion