diff --git a/bin/build-all.sh b/bin/build-all.sh index da36ce6..4b9a873 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -34,5 +34,5 @@ upload $root_path/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.ja upload $root_path/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar upload $root_path/utils/sync/target/sync-1.0.0-SNAPSHOT.jar -upload_ytp $root_path/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar -upload_ytp $root_path/service-uploader/target/service-uploader-1.0.0-SNAPSHOT.jar +upload $root_path/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar +upload $root_path/service-uploader/target/service-uploader-1.0.0-SNAPSHOT.jar diff --git a/bin/build-cli.sh b/bin/build-cli.sh index 06846c8..672e40a 100755 --- a/bin/build-cli.sh +++ b/bin/build-cli.sh @@ -3,4 +3,4 @@ root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh deploy service-cli service-cli/service-cli-core package service-cli/service-cli-runner -ytp-transfer2 $root_path/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar \ No newline at end of file +upload $root_path/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/check b/bin/check index 00800e9..ea249bf 100755 --- a/bin/check +++ b/bin/check @@ -3,5 +3,5 @@ root_path=/apps/zone_scfp/hudi/cloud jdk_path=/opt/jdk8u252-b09/bin/java -curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/service-check-1.0.0-SNAPSHOT.jar -o ${root_path}/service-check.jar +curl http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.124:36800/file/download/service-check-1.0.0-SNAPSHOT.jar -o ${root_path}/service-check.jar ${jdk_path} -jar ${root_path}/service-check.jar diff --git a/bin/generate b/bin/generate index cd61056..de141f6 100755 --- a/bin/generate +++ b/bin/generate @@ -5,7 +5,7 @@ jdk_path=/opt/jdk1.8.0_162/bin/java arguments=$@ # 手动上传jar包则注释掉这行,更显神通吧反正是 -curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/service-cli-runner-1.0.0-SNAPSHOT.jar -o ${jars_path}/service-cli-runner.jar +curl http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.124:36800/file/download/service-cli-runner-1.0.0-SNAPSHOT.jar -o ${jars_path}/service-cli-runner.jar ${jdk_path} -jar ${jars_path}/service-cli-runner.jar \ --spring.profiles.active=b12 \ --deploy.generate.command=true \ diff --git a/bin/library.sh b/bin/library.sh index b3cc5d5..4ef7378 100755 --- a/bin/library.sh +++ b/bin/library.sh @@ -2,14 +2,6 @@ build_profile=b2b12 -iap_username=iap -iap_password=IAPAb123456! -iap_url=$iap_username@132.122.1.162 - -ytp_username=yyy -ytp_password='QeY\!68\)4nH1' -ytp_url=ftp://$ytp_username:$ytp_password@132.121.122.15:2222 - upload_username=AxhEbscwsJDbYMH2 upload_password=cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4 upload_url=http://$upload_username:$upload_password@132.126.207.124:36800 @@ -28,23 +20,6 @@ function upload() { rm $source_file_path } -function upload_ytp() { - source_file_path=$(realpath $1) - file_name=$(basename $source_file_path) - echo "↪ Source md5: $(md5sum $source_file_path | awk '{print $1}')" - echo "↪ Uploading $source_file_path ↪ /tmp/$file_name" - sshpass -p $iap_password scp $source_file_path $iap_url:/tmp - echo "↪ Upload 162 success" - target_md5=$(sshpass -p $iap_password ssh -o 'StrictHostKeyChecking no' $iap_url "md5sum /tmp/$file_name | awk '{print \$1}'") - echo "↪ Target md5: $target_md5" - echo "↪ Command: sshpass -p $iap_password ssh -o 'StrictHostKeyChecking no' $iap_url \"curl --retry 5 $ytp_url -T /tmp/$file_name\"" - sshpass -p $iap_password ssh -o 'StrictHostKeyChecking no' $iap_url "curl --retry 5 $ytp_url -T /tmp/$file_name" - echo "↪ Upload ytp success" - echo "↪ Download: curl $ytp_url/$file_name -o $file_name" - echo "↪ Delete source" - rm $source_file_path -} - function joining { local d=${1-} f=${2-} if shift 2; then