a

qa_shell_script/3_link_config_file_by_name.sh

@@ -18,7 +18,7 @@ then
 	sh $config_server/show_info.sh $project 连接配置文件 $desc $3
 	project_type=`node $config_server/get_project_config.js  -name $project -attr type`
 	file=`node $config_server/get_project_config.js  -name $project -attr config_file`
-	file=${file:="application.properties"}
+	#file=${file:="application.properties"}
 	
 	echo "rm -rf /home/quant_group/${project}/$file"
 	rm -rf /home/quant_group/$project/$file

qa_shell_script/base_script/restartJava.sh

@@ -83,22 +83,22 @@ fi
 
 config_file=`find ./ -maxdepth 2 -name "application.properties"`
 
-if [ -n "$config_file" ]
-then
-    echo "$project already have config file"
-else
-    echo "$project have no config file"
-    if $is_public_ip && [ -n "$is_public_ip" ]
-    then
-        rm -rf /home/quant_group/${project}/application.properties
-        echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
-        ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties
-    else
-        rm -rf /home/quant_group/${project}/application.properties
-        echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties"
-        ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties
-    fi
-fi
+#if [ -n "$config_file" ]
+#then
+#    echo "$project already have config file"
+#else
+#    echo "$project have no config file"
+#    if $is_public_ip && [ -n "$is_public_ip" ]
+#    then
+#        rm -rf /home/quant_group/${project}/application.properties
+#        echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
+#        ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties
+#    else
+#        rm -rf /home/quant_group/${project}/application.properties
+#        echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties"
+#        ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties
+#    fi
+#fi
 
 echo "Project: $project will be start"
 log_name=`node $config_server/get_project_config.js  -name $project -attr log_name`

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -126,7 +126,8 @@ createNginxHttpAndSSLConf h5sp h5sp-25 192.168.4.25 7057 7057 $nginxname/base.co
 
 
 # 业务要求
-createNginxHttpAndSSLConf h5 h5 192.168.6.19 44585 44585 $nginxname/base.conf
+createNginxHttpAndSSLConf h5 h5 192.168.6.19 61672 61672 $nginxname/base.conf
+createNginxHttpAndSSLConf tyw tyw 192.168.28.170 8081 8081 $nginxname/base.conf
 createNginxHttpAndSSLConf qg1 qg1-21 172.30.220.20 8018 8018 $nginxname/base.conf
 createNginxHttpAndSSLConf qg1 qg1-21-server 172.30.220.20 9019 9019 $nginxname/base.conf
 createNginxHttpAndSSLConf uanguang uanguang 193.168.4.124 80 80 $nginxname/base.conf
@@ -179,6 +180,7 @@ createNginxHttpAndSSLConf git git 172.30.10.23 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf gitabc gitabc 172.30.10.24 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf sonar sonar 172.30.3.42 9000 9000 $nginxname/base.conf
 createNginxHttpAndSSLConf pipes pipes 10.17.115.10 80 80 $nginxname/base.conf
+createNginxHttpAndSSLConf kafka kafka 10.17.115.10 80 80 $nginxname/base.conf
 
 for ip_last in ${ips[@]}
 do

qa_shell_script/script_by_Contorller/xhed_spider.sh

@@ -21,10 +21,16 @@ function basicData()
 	#spider_center.user_auth_info插入基础资料、拍照、运营商认证
 	spider="INSERT INTO spider_center.user_auth_info (auth_type, last_auth_time, auth_account_name, user_id, auth_status) VALUES (14, '${date}', ${phone_no}, '${uid}', 1),(7, '${date}', ${phone_no}, '${uid}', 1),(0,'${date}',${phone_no}, '${uid}', 1)"
      	#xyqb_user.address插入地址
-	address="INSERT INTO xyqb_user.address (user_id, province_code, province, city_code, city, district_code, district, address, created_at, updated_at) VALUES(${userid}, 450000, '广西壮族自治区', 450500, '北海市', 450503, '银海区', '海淀区中关村102号', '${date}', '${date}');"
+	address="INSERT INTO xyqb_user.address (user_id, province_code, province, city_code, city, district_code, district, address, created_at, updated_at) VALUES(${userid}, 450000, '广西壮族自治区', 450500, '北海市', 450503, '银海区', '海淀区中关村102号', '${date}', '${date}')"
         #xyqb_user.contact插入联系人信息
-	contact="INSERT INTO xyqb_user.contact (user_id, name, phone_no, relation, created_at, updated_at)VALUES(${userid}, '张三', '13888888889', 3, '${date}', '${date}'),( ${userid}, '李四', '13888888888', 3, '${date}', '${date}');"
-        mysql ${mysql} -e"set names utf8;${spider};${address};${contact}"
+	contact="INSERT INTO xyqb_user.contact (user_id, name, phone_no, relation, created_at, updated_at)VALUES(${userid}, '张三', '13888888889', 3, '${date}', '${date}'),( ${userid}, '李四', '13888888888', 3, '${date}', '${date}')"
+	#xyqb_user.user_detail添加联系人邮箱
+        userDetail="update xyqb_user.user_detail set email='19925632562@163.com' where user_id=${userid}"
+	#xyqb_user.user_ext_info插入用户职业、学历
+        userExtInfo="INSERT INTO xyqb_user.user_ext_info (user_id, means_of_income_payment, monthly_income_range, occupation, education, has_car, has_social_security, has_house, has_credit_card, marry_status, created_at, updated_at) VALUES(${userid}, 0, 3, 3, 3, 0, 0, 0, 0, 0, '${date}', '${date}')"
+	
+	#执行sql
+	mysql ${mysql} -e"set names utf8;${spider};${address};${contact};${userDetail};${userExtInfo}"
 
 	echo "done!!!!${date} "
 }