Commit ef8748c6 authored by root's avatar root

a

parent a6fe258c
......@@ -50,7 +50,7 @@ function restartJavaProject()
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 &`
......
......@@ -30,7 +30,7 @@ function restartJavaProject()
sleep 2s
fi
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
config_file=`find ./ -maxdepth 2 -name "application.properties"`
if [ -n "$config_file" ]
then
......
#!/bin/bash
project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild
target_file=${project_path}/app/build.gradle
store_path=/home/ganshc/
source_file=${store_path}/build.gradle
buildapk_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives
branch_name=$1
product_flavors=$2
cd ${project_path}
if [ -z ${branch_name} ]; then
echo "checkout default branch master"
git pull
else
echo "checkout specified branch ${branch_name}"
which git
git checkout ${branch_name}
if [ $? = 0 ]; then
echo "checkout branch $1 is ok".
git pull
else
echo "Fail to checkout branch ${branch_name}".
exit -1
fi
fi
echo "copy file to app"
cp -r ${source_file} ${target_file}
echo "gradle build start"
gradle clean resguard --stacktrace --debug
echo "rename apk"
cd ${buildapk_path}
apkfile=`find ./ -name "*${product_flavors}.apk"`
cp ${apkfile} /home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk
echo "upload apk to pugongyin"
curl -F "file=@/home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv
......@@ -91,7 +91,7 @@ new pClass().init(true, "ui", "7048", "order-op-ui", "OP", null, "src/js/env.con
new pClass().init(true, "ui", "7050", "bt-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "新版白条-ui","");
// node
new pClass().init(true, "node", "7018", "AppBackend", "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, 1, "APP后台服务-server","","forever stop AppBackend");
new pClass().init(true, "node", "7041", "activity-op", "QG", null, "src/config.js", "forever start -a -s --uid activity-op src/app.js", null, 1, "优惠券中心-server","","forever stop activity-op");
new pClass().init(true, "node", "7041", "activity-op", "QG", null, "src/config.js", "sh start.sh", null, 1, "优惠券中心-server","","sh stop.sh");
new pClass().init(true, "node", "7047", "op-api", "OP", null, "src/config.js", "sh start.sh", null, 1, "系统Api Gateway-server","","sh stop.sh");
new pClass().init(true, "node", "7049", "fe-api", "QG", null, "src/config.js", "sh start.sh", null, 1, "科传项目-消息推送","","pm2 stop fe-api");
//python
......
......@@ -69,4 +69,10 @@ tranceConfig java "hubei.api.url=http:\/\/192.168.100.185:8585" "hubei.api.url=h
#tranceConfig python "192.168.4.14" "192.168.4.20" "192.168.4.14" "qin-qiong.*"
tranceConfig java "spider-center.host=http:\/\/192.168.4.12:7021\/" "spider-center.host=http:\/\/spider-center-12.ss.xyqb.loan\/" "192.168.4.12" "spider-center.properties"
tranceConfig java "qgbc-ui.url=http:\/\/192.168.4.152:7002" "qgbc-ui.url=http:\/\/192.168.4.152:7050" "192.168.4.152" "xyqb.properties"
tranceConfig java "7025" "7003" "192.168.4.152" "baitiao.properties"
tranceConfig node "112233445512345.ittun.com" "activity-op-22.ss.xyqb.loan" "192.168.4.22" "activity-op.js"
#!/bin/bash
redis-cli -p 6379 FLUSHALL
redis-cli -p 6380 FLUSHALL
redis-cli -p 6381 FLUSHALL
redis-cli -p 6382 FLUSHALL
redis-cli -p 6383 FLUSHALL
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment