From 8462356f3f3587d30ac0e0619748d12afb31b5f7 Mon Sep 17 00:00:00 2001 From: shixuesen Date: Tue, 19 May 2020 07:01:01 +0800 Subject: [PATCH] update at 2020-05-19 07:01:01 --- .backup/brew_packages | 198 ------------------------------ .backup/cargo_packages | 32 ----- .backup/composer_packages | 21 ---- .backup/npm_packages | 3 - .backup/pip_packages | 17 --- .zsh_history | 248 +++++++++++++++++++------------------- .zshrc | 5 +- 7 files changed, 128 insertions(+), 396 deletions(-) diff --git a/.backup/brew_packages b/.backup/brew_packages index 6b26eed..e69de29 100644 --- a/.backup/brew_packages +++ b/.backup/brew_packages @@ -1,198 +0,0 @@ -annie -aom -apache-flink -apr -apr-util -argon2 -aspell -autoconf -automake -bat -brew-php-switcher -brotli -c-ares -cairo -ccache -cmake -cocoapods -composer -curl -curl-openssl -dnsmasq -dos2unix -exa -faac -fdk-aac -ffmpeg -flac -fontconfig -freetds -freetype -frei0r -fribidi -fzf -gawk -gcc -gdbm -geoip -gettext -giflib -git -git-flow-avh -glib -gmp -gnu-getopt -gnu-sed -gnutls -go -gphotos-uploader-cli -gradle -graphite2 -groovy -guetzli -harfbuzz -htop -icu4c -ideviceinstaller -imageoptim-cli -ios-deploy -isl -jansson -jemalloc -jenv -jpeg -jq -krb5 -lame -leptonica -libass -libav -libbluray -libev -libevent -libffi -libgcrypt -libgpg-error -libidn -libidn2 -libimobiledevice -libmetalink -libmpc -libogg -libplist -libpng -libpq -libsamplerate -libsndfile -libsodium -libsoxr -libssh2 -libtasn1 -libtermkey -libtiff -libtool -libunistring -libusb -libusbmuxd -libuv -libvidstab -libvorbis -libvpx -libvterm -libxml2 -libyaml -libzip -little-cms2 -lrzsz -lua -luajit -lzo -make -maven -mcrypt -media-info -mercurial -meson -mhash -mongodb-community -mpfr -msgpack -mtr -mycli -mysql-client -mysql@5.7 -nasm -navi -ncurses -neovim -nettle -nghttp2 -nginx -ninja -node -node@10 -nvm -oniguruma -opencore-amr -openjdk -openjpeg -openldap -openresty -openresty-openssl -openssl -openssl@1.1 -opus -p11-kit -pcre -pcre2 -percona-xtrabackup -perl -php -php@7.1 -pixman -pkg-config -proxychains-ng -python -python@2 -python@3.8 -qpdf -readline -redis -rename -rsync -rtmpdump -rubberband -ruby -rust -sdl -sdl2 -snappy -speex -sphinx-doc -sqlite -srt -supervisor -swig -telnet -tesseract -texi2html -theora -tidy-html5 -tree -unbound -unibilium -unixodbc -usbmuxd -vim -webp -wget -x264 -x265 -xvid -xz -yadm -yarn -you-get -youtube-dl -zeromq -zsh-syntax-highlighting diff --git a/.backup/cargo_packages b/.backup/cargo_packages index 3cedd49..e69de29 100644 --- a/.backup/cargo_packages +++ b/.backup/cargo_packages @@ -1,32 +0,0 @@ -benchExecuteallbenchmarksofalocalpackage -buildCompilealocalpackageandallofitsdependencies -checkCheckalocalpackageandallofitsdependenciesforerrors -cleanRemoveartifactsthatcargohasgeneratedinthepast -clippy-previewChecksapackagetocatchcommonmistakesandimproveyourRustcode. -docBuildapackage'sdocumentation -fetchFetchdependenciesofapackagefromthenetwork -fixAutomaticallyfixlintwarningsreportedbyrustc -generate-lockfileGeneratethelockfileforapackage -git-checkoutCheckoutacopyofaGitrepository -initCreateanewcargopackageinanexistingdirectory -installInstallaRustbinary.Defaultlocationis$HOME/.cargo/bin -locate-projectPrintaJSONrepresentationofaCargo.tomlfile'slocation -loginSaveanapitokenfromtheregistrylocally.Iftokenisnotspecified,itwillbereadfromstdin. -metadataOutputtheresolveddependenciesofapackage,theconcreteusedversionsincludingoverrides,inmachine-readableformat -newCreateanewcargopackageat -ownerManagetheownersofacrateontheregistry -packageAssemblethelocalpackageintoadistributabletarball -pkgidPrintafullyqualifiedpackagespecification -publishUploadapackagetotheregistry -read-manifestPrintaJSONrepresentationofaCargo.tomlmanifest. -runRunabinaryorexampleofthelocalpackage -rustcCompileapackage,andpassextraoptionstothecompiler -rustdocBuildapackage'sdocumentation,usingspecifiedcustomflags. -searchSearchpackagesincrates.io -testExecuteallunitandintegrationtestsandbuildexamplesofalocalpackage -uninstallRemoveaRustbinary -updateUpdatedependenciesasrecordedinthelocallockfile -vendorVendoralldependenciesforaprojectlocally -verify-projectCheckcorrectnessofcratemanifest -versionShowversioninformation -yankRemoveapushedcratefromtheindex diff --git a/.backup/composer_packages b/.backup/composer_packages index d3ebef1..e69de29 100644 --- a/.backup/composer_packages +++ b/.backup/composer_packages @@ -1,21 +0,0 @@ -doctrine/inflector -illuminate/container -illuminate/contracts -illuminate/support -laravel/valet -mnapoli/silly -nategood/httpful -nesbot/carbon -php-di/invoker -psr/container -psr/simple-cache -symfony/console -symfony/polyfill-mbstring -symfony/polyfill-php72 -symfony/polyfill-php73 -symfony/process -symfony/service-contracts -symfony/translation -symfony/translation-contracts -symfony/var-dumper -tightenco/collect diff --git a/.backup/npm_packages b/.backup/npm_packages index 950b337..e69de29 100644 --- a/.backup/npm_packages +++ b/.backup/npm_packages @@ -1,3 +0,0 @@ -/Users/shixuesen/.nvm/versions/node/v10.20.1/lib -└── npm@6.14.4 - diff --git a/.backup/pip_packages b/.backup/pip_packages index ed69707..e69de29 100644 --- a/.backup/pip_packages +++ b/.backup/pip_packages @@ -1,17 +0,0 @@ -Package Version ------------------ -------- -certifi 2019.3.9 -chardet 3.0.4 -configparser 3.7.4 -futures 2.2.0 -idna 2.8 -instagram-scraper 1.6.0 -pip 19.3.1 -PySocks 1.6.8 -requests 2.21.0 -setuptools 41.4.0 -six 1.12.0 -tqdm 4.31.1 -urllib3 1.24.1 -wheel 0.33.6 -xmltodict 0.12.0 diff --git a/.zsh_history b/.zsh_history index a2c65d3..1b2124e 100644 --- a/.zsh_history +++ b/.zsh_history @@ -610,7 +610,6 @@ done : 1557368105:0;./tikv-ctl -h : 1557370611:0;git commit -m "fix: add member trade payment interval" : 1557381253:0;cargo clean -: 1557384450:0;go : 1557384454:0;which go : 1557384463:0;ls -alh /usr/local/bin/go : 1557387774:0;git commit -m "add dislok" @@ -1719,7 +1718,6 @@ done : 1562070610:0;open url2pdf_97a65feb6c332415e087c4eba620232b.pdf : 1562071225:0;open 缃¶è¯ƒ±åƒ®ƒ¿çƒ°ƒ¦\(龃¹ä¹¦\)\ 第亃¬çƒ©ƒ¨.pdf : 1562071567:0;mkdir tnrrt -: 1562071586:0;mv *.torrent tnrrt : 1562071653:0;rm -rf Compiler\ Construction\ -\ Principles\ and\ Practice.djvu : 1562121855:0;git checkout -b hotfix/fix_batch_get_course_source_sxs0703 : 1562130519:0;cd english_corner_php @@ -3729,7 +3727,6 @@ done : 1575888713:0;cd twitter-image-scraper : 1575888911:0;vim app.js : 1575888926:0;node app.js -: 1575889110:0;cd node_modules : 1575893862:0;sudo mdutil -a -i off : 1575897225:0;sudo mdutil -a -i on : 1575897244:0;sudo rm -rf /.Spotlight-V100/* @@ -3834,7 +3831,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1576141497:0;mail : 1576141664:0;traceroute qq.com : 1576141705:0;traceroute www.live.com -: 1576143057:0;pip3 install -r requirements.txt : 1576143076:0;sudo pip3 install -r requirements.txt : 1576151571:0;/usr/local/Cellar/python/3.7.5/bin/python3 wxhub.py -biz 练½å¯¹éƒ‚ƒ¦åƒ¿ƒ¿ : 1576152070:0;brew cask install upic @@ -4169,7 +4165,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1577782344:0;curl www.bibilibili.com : 1577782363:0;curl www.bilibili.com : 1577782383:0;traceroute www.bilibili.com -: 1577782881:0;cd Downloads : 1577782884:0;annie -p av81183725 : 1577782995:0;annie -d av81183725 : 1577783038:0;you-get --playlist https://www.bilibili.com/video/av81183725 @@ -4769,7 +4764,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1582530285:0;rm -rf 1.7.4-series-SNAPSHOT : 1582534096:0;ping bb.nicksxs.me : 1582546529:0;ssh nick@192.168.2.143 -: 1582546543:0;ping 192.168.2.143 : 1582557013:0;ssh zmiffang@192.168.200.2 : 1582557033:0;ssh zmiffang@192.168.200.129 : 1582557045:0;ping 192.168.200.129 @@ -4861,127 +4855,10 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1583385616:0;git commit -m "feature: filter item type is series" : 1583389058:0;git commit -m "upgrade: upgrade sentinel" : 1583389628:0;git commit -m "feature: add redeem filter" -: 1583394915:0;gl -: 1583394988:0;gco test -: 1583394989:0;gl -: 1583395026:0;gco - -: 1583395027:0;gl -: 1583395055:0;gco master -: 1583395056:0;gl -: 1583396857:0;gst -: 1583396860:0;mi -: 1583396894:0;gst -: 1583396896:0;git add . : 1583396909:0;git commit -m "feature: add course goods rela page query" -: 1583396911:0;gp -: 1583396912:0;gl -: 1583396926:0;gp -: 1583396930:0;gco - -: 1583396932:0;gl -: 1583396935:0;git merge feature/lego_v1 -: 1583396941:0;gp -: 1583397062:0;mi -: 1583397314:0;gst -: 1583397315:0;gp -: 1583397516:0;gl -: 1583397523:0;gco - -: 1583397525:0;gl -: 1583397798:0;ssh ubuntu@117.50.38.74 -: 1583398295:0;gst -: 1583398296:0;gl -: 1583398301:0;gco test -: 1583398303:0;gl -: 1583398443:0;gco feature/lego_v1 -: 1583398444:0;gl -: 1583398509:0;gst -: 1583398511:0;git add . : 1583398528:0;git commit -m "feature: add course subscription is write is 2" -: 1583398530:0;gp -: 1583398531:0;gl -: 1583398534:0;gco dev -: 1583398535:0;gl -: 1583398538:0;git merge feature/lego_v1 -: 1583398542:0;gp -: 1583398544:0;gco test -: 1583398545:0;gl -: 1583398549:0;git merge feature/lego_v1 -: 1583398648:0;gst -: 1583398649:0;git add . -: 1583398666:0;git commit -m "merge: merge feature lego_V1" -: 1583398668:0;gp -: 1583399073:0;gl -: 1583399077:0;gco feature/lego_v1 -: 1583399079:0;gl -: 1583399081:0;gco test -: 1583399082:0;gl -: 1583399087:0;git merge feature/lego_v1 -: 1583399277:0;mi -: 1583399571:0;gst -: 1583399574:0;git add . -: 1583399578:0;git commit -m "merge: merge feature lego_V1" -: 1583399580:0;gp -: 1583400697:0;ping 67.216.215.124 -: 1583400715:0;ping 64.52.109.110 -: 1583400869:0;ssh root@64.52.109.110 -: 1583407620:0;ssh jump -: 1583407765:0;gl -: 1583407769:0;gco test -: 1583407771:0;gl -: 1583407789:0;gco feature/lego_v1 -: 1583407790:0;gl -: 1583407795:0;gco - -: 1583407796:0;gl -: 1583407798:0;git merge feature/lego_v1 -: 1583407854:0;gst -: 1583407867:0;mi -: 1583407888:0;gst -: 1583407891:0;git add . : 1583407894:0;git commit -m "merge: merge feature lego_V1" -: 1583407895:0;gp -: 1583407909:0;cd trade-common -: 1583407911:0;md -: 1583407934:0;gst -: 1583407937:0;cd .. -: 1583407938:0;gp -: 1583408011:0;gco feature/lego_v1 -: 1583408013:0;gl -: 1583408988:0;git log -: 1583411423:0;gst -: 1583411426:0;git add . -: 1583411445:0;git commit -m "fix: fix series course redeem" -: 1583411446:0;gl -: 1583411459:0;gst -: 1583411461:0;gp -: 1583411468:0;gst -: 1583411472:0;gco dev -: 1583411473:0;gl -: 1583411476:0;git merge feature/lego_v1 -: 1583411549:0;gst -: 1583411551:0;git add . -: 1583411554:0;git commit -m "fix: fix series course redeem" -: 1583411555:0;gp -: 1583411594:0;gco test -: 1583411596:0;gl -: 1583411600:0;git merge feature/lego_v1 -: 1583411641:0;gst -: 1583411643:0;git add . : 1583411645:0;git commit -m "fix: fix series course redeem" -: 1583411648:0;mi -: 1583411727:0;gst -: 1583411731:0;gp -: 1583412368:0;gst -: 1583412372:0;gp -: 1583415365:0;exit -: 1583415470:0;gcp1 -: 1583418442:0;exit -: 1583418472:0;pwd -: 1583418474:0;exit -: 1583420747:0;cd OneDrive/Pictures/instagram -: 1583420749:0;./2.sh -: 1583420772:0;vim ~/.zshrc -: 1583420802:0;source ~/.zshrc -: 1583420820:0;./2.sh -: 1583421048:0;dev : 1583421053:0;cd src/graph-tutorial : 1583421056:0;php artisan nvshen:get -v : 1583421158:0;ssh ubuntu@117.50.38.74 @@ -10276,3 +10153,128 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1589766974:0;cat back.sh : 1589766989:0;npm list -g : 1589767007:0;./back.sh +: 1589767201:0;dev +: 1589767205:0;cd test/JD_DailyBonus +: 1589767206:0;ll +: 1589767211:0;node JD_DailyBonus.js +: 1589768003:0;cd JDScript +: 1589768003:0;ll +: 1589768005:0;gst +: 1589768007:0;gl +: 1589768035:0;cd JD-DailyBonus +: 1589768036:0;ll +: 1589768043:0;cd .. +: 1589768045:0;ll +: 1589768077:0;mv JD_DailyBonus.js JD_DailyBonus.js.2020å¹´05惼ƒ¨18惷¥.back +: 1589768089:0;cp JDScript/JD-DailyBonus/JD_DailyBonus.js +: 1589768093:0;cp JDScript/JD-DailyBonus/JD_DailyBonus.js . +: 1589768098:0;gst +: 1589768107:0;ll +: 1589768115:0;code . +: 1589768223:0;node JD_DailyBonus.js +: 1589768962:0;cd Downloads +: 1589768970:0;ls *.torrent +: 1589768990:0;mv *.torrent tnrrt +: 1589768997:0;ls *.pdf +: 1589772191:0;exit +: 1589772199:0;rm -rf 02丨惷¥å¿ƒ·ç³»ç»ƒ¿ï¼ƒºä¸€æƒ½ƒSQL惻´æƒ¶°è¯­åƒ¯¥æƒ¸¯å¦‚佃µæƒ©§èƒƒ¬çƒºƒ¤ï¼ƒ¿.pdf +: 1589772219:0;mv effectivejava.pdf ~/OneDrive/Documents/惶ƒ§æƒ£ +: 1589772242:0;mv jls8.pdf ~/OneDrive/Documents/惶ƒ§æƒ£ +: 1589772991:0;brew update -v +: 1589778277:0;brew upgrade -v +: 1589778858:0;source ~/.zshrc +: 1589778865:0;vim ~/.zshrc +: 1589778955:0;source ~/.zshrc +: 1589778959:0;brew upgrade -v +: 1589778996:0;dev +: 1589779004:0;cd src +: 1589779006:0;gcl https://github.com/geektime-geekbang/geektime-ELK.git +: 1589779651:0;open geektime-ELK +: 1589780406:0;cd ../test +: 1589780409:0;gcl https://github.com/jumper2014/lianjia-beike-spider.git +: 1589780467:0;cd lianjia-beike-spider +: 1589780485:0;pip3 install -r requirements.txt +: 1589780520:0;code . +: 1589780723:0;python ershou.py hz +: 1589780736:0;python3 ershou.py hz +: 1589782482:0;ll +: 1589783684:0;python3 ershou.py hz +: 1589785612:0;nm5 +: 1589785627:0;nm1 +: 1589785699:0;gst +: 1589785701:0;gl +: 1589785703:0;gco - +: 1589785704:0;gl +: 1589785843:0;gst +: 1589785885:0;git add . +: 1589785898:0;git commit -m "fix: fix feature map" +: 1589785899:0;gst +: 1589785901:0;go +: 1589785902:0;gp +: 1589785905:0;gco - +: 1589785906:0;gl +: 1589785910:0;git merge feature/art_v1 +: 1589785920:0;gp +: 1589786120:0;gco - +: 1589786121:0;gl +: 1589786129:0;gst +: 1589786131:0;git add . +: 1589786135:0;git commit -m "fix: fix feature map" +: 1589786136:0;gp +: 1589786140:0;gco - +: 1589786141:0;gl +: 1589786145:0;git merge feature/art_v1 +: 1589786152:0;gp +: 1589786165:0;mi +: 1589786227:0;gco - +: 1589786246:0;gst +: 1589786248:0;git add . +: 1589786251:0;git commit -m "fix: fix feature map" +: 1589786252:0;gp +: 1589786255:0;gco - +: 1589786256:0;gl +: 1589786259:0;git merge feature/art_v1 +: 1589786262:0;gp +: 1589786264:0;mi +: 1589786921:0;gco - +: 1589786923:0;gl +: 1589787594:0;gst +: 1589787597:0;git add . +: 1589787627:0;git commit -m "add feature" +: 1589787628:0;gp +: 1589787631:0;gco - +: 1589787633:0;gl +: 1589787636:0;git merge feature/art_v1 +: 1589787640:0;gp +: 1589787669:0;exit +: 1589787681:0;mi +: 1589787714:0;nm1 +: 1589789773:0;vim +: 1589792074:0;www +: 1589792080:0;cd admin-web/logs +: 1589792080:0;ll +: 1589792086:0;tail -fn 1000 admin-web_other.2020-05-18.log +: 1589793173:0;ll +: 1589793176:0;rm -rf * +: 1589793197:0;ll +: 1589793206:0;rm -rf * +: 1589793209:0;ll +: 1589793275:0;tail -fn 1000 admin-web_other.2020-05-18.log +: 1589801790:0;ll +: 1589801802:0;rm -rf * +: 1589801805:0;ll +: 1589802019:0;grep 'columnService' admin-web_other.2020-05-18.log +: 1589802172:0;grep 'columnService' admin-web_other.2020-05-18.log | wc -l +: 1589802244:0;ll +: 1589802359:0;cd .. +: 1589802389:0;curl -O https://arthas.gitee.io//arthas/arthas-boot.jar +: 1589802432:0;java -jar arthas-boot.jar --repo-mirror aliyun --use-http +: 1589804190:0;gst +: 1589804192:0;gl +: 1589804197:0;gco master +: 1589804199:0;gl +: 1589804224:0;cd .. +: 1589804226:0;gst +: 1589804227:0;gl +: 1589815501:0;cd /Volumes/Seagate\ Backup\ Plus\ Drive/Video/img.mm24.cc +: 1589815506:0;php -S 0.0.0.0:8081 diff --git a/.zshrc b/.zshrc index ff7dfac..5830745 100644 --- a/.zshrc +++ b/.zshrc @@ -123,12 +123,13 @@ alias blog="cd /Users/shixuesen/workspace/dev/src/myHexoBlog" alias ins="cd /Users/shixuesen/workspace/dev/src/graph-tutorial" alias sins="cd /Users/shixuesen/OneDrive/Pictures/instagram && ./2.sh" alias php74="/usr/local/bin/php" +alias eproxy="export http_proxy=http://127.0.0.1:1087;export https_proxy=http://127.0.0.1:1087;" export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -export http_proxy=http://127.0.0.1:1087; -export https_proxy=http://127.0.0.1:1087; +#export http_proxy=http://127.0.0.1:1087; +#export https_proxy=http://127.0.0.1:1087;