diff --git a/.backup/crontab-20211122-070101.gz b/.backup/crontab-20211122-070101.gz new file mode 100644 index 0000000..f4196db Binary files /dev/null and b/.backup/crontab-20211122-070101.gz differ diff --git a/.zsh_history b/.zsh_history index 9054a69..67581cc 100644 --- a/.zsh_history +++ b/.zsh_history @@ -1,18 +1,3 @@ -: 1553740477:0;git clone git@git.ngmm365.com:ngmm_mall/task-center.git -: 1553740679:0;git checkout hotfix/fix_open_search_filter_sxs0328 -: 1553740686:0;git checkout -b hotfix/fix_open_search_filter_sxs0328 -: 1553741268:0;git checkout -b feature/fix_open_search_filter_sxs0328 -: 1553741326:0;git commit -m "feature: upgrade search api version, modify EarlyMathTask" -: 1553741340:0;git push --set-upstream origin feature/fix_open_search_filter_sxs0328 -: 1553741907:0;git merge feature/fix_open_search_filter_sxs0328 -: 1553742600:0;git commit -m "merge feature fix open-search is search recommend filter" -: 1553742861:0;mvn clean package install -: 1553742880:0;mvn clean package install -U -Dmaven.test.skip=true -: 1553746862:0;brew install nginx -: 1553749466:0;brew -: 1553749474:0;brew search mysql -: 1553749615:0;brew install mysql@5.7 -: 1553750331:0;lsof :80 : 1553752870:0;git checkout feature/fix_open_search_filter_sxs0328 : 1553757932:0;git checkout hotfix/fix_good_search_sxs0328 : 1553757991:0;git commit -m "hotfix: uncomment is_search_recommend = 1 filter" @@ -10462,7 +10447,6 @@ done : 1632752306:0;tail -fn 100 storage/logs/laravel-2021-09-27.log : 1632752373:0;echo HTTPS_PROXY : 1632752425:0;echo $HTTPS_PROXY -: 1632805375:0;eproxy php artisan xiu:get --env=local -v && unproxy : 1632808552:0;git commit -m "fix threshold check" : 1632811786:0;git commit -m "fix payment need get for first order" : 1632816233:0;cd /usr/local/etc/php/7.4/php-fpm.d @@ -10741,8 +10725,6 @@ done : 1634827608:0;diskutil -h : 1634827617:0;diskutil --help : 1634827624:0;diskutil -: 1634870677:0;brew unlink php -: 1634870682:0;brew link php@7.4 : 1634872684:0;dig cc.nicksxs.me : 1634879642:0;brew install sunnyyoung/repo/wechattweak-cli : 1634879979:0;sudo wechattweak-cli --install @@ -10834,7 +10816,6 @@ done : 1636027309:0;cat ~/OneDrive/Pictures/instagram/user.txt | grep jj : 1636088638:0;git commit -m "add result judge" : 1636097954:0;exi -: 1636211358:0;txy3 : 1636289117:0;hexo new draft "聃聃惼迃平淃烺烴活" : 1636294033:0;hexo publish "聃聃惼迃平淃烺烴活" : 1636301562:0;tail -fn 1000 storage/logs/laravel-2021-11-08.log @@ -10858,7 +10839,6 @@ done : 1636359043:0;mycli -h mysql250.beta.nicomama.it -P 50004 -p : 1636359047:0;mycli -h mysql250.beta.nicomama.it -P 50004 : 1636359202:0;mycli -h mysql250.beta.nicomama.it -P 50004 -u ngmmdev -: 1636361677:0;gco - : 1636361702:0;git commit -m "modify mq accessKey secretKey" : 1636369972:0;brew list : 1636370345:0;git commit -m "upgrade mq-client version to 1.1.1" @@ -10913,7 +10893,6 @@ done : 1636896756:0;ssh txy2 : 1636896782:0;cat ~/.ssh/config : 1636897594:0;hexo publish "仃练七惼迃毃较它烴烺端僯转僯" -: 1636897702:0;hexo clean && hexo g && hexo s --debug : 1636897796:0;hexo d --debug : 1636957939:0;git push --set-upstream origin feature/community_exclusive_price_211115 : 1636958236:0;gco -b feature/community_exclusive_price_211115 @@ -10955,7 +10934,6 @@ done : 1637066729:0;cat jenkins.sh : 1637066809:0;curl -s $url --user ngmmdev:11347d9e68394c1146e5d15f31ae0595e0 -H 'Connection: keep-alive' -H 'Pragma: no-cache' -H 'Cache-Control: no-cache' -H 'Upgrade-Insecure-Requests: 1' -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.111 Safari/537.36' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9' -H 'Referer: http://jenkins.nicomama.it/job/Beta_account/api/' : 1637076579:0;ping cc.nicksxs.me -: 1637114643:0;eproxy php artisan ins:like 0 && unproxy : 1637116003:0;proxychains4 open -a "Docker.app" : 1637117334:0;ps aux | grep java : 1637117422:0;sudo docker rmi 6eb5b8d48f75 @@ -10964,10 +10942,7 @@ done : 1637117507:0;sudo docker rmi card:v1 : 1637117746:0;gd : 1637117760:0;git commit -m "chron community exclusive price" -: 1637117762:0;gp -: 1637117764:0;mi : 1637117800:0;mcl -: 1637119310:0;exit : 1637119506:0;sudo docker images : 1637119518:0;dev : 1637119522:0;cd src/k8s-docker-desktop-for-mac @@ -10975,24 +10950,15 @@ done : 1637119544:0;history | grep loal : 1637119546:0;history | grep load : 1637119561:0;cd image -: 1637119592:0;git add . : 1637119598:0;git stash : 1637119608:0;cat images : 1637119624:0;./load_images.sh : 1637120355:0;kubectl cluster-info : 1637143740:0;sudo kubectl apply -f https://raw.githubusercontent.com/gotok8s/gotok8s/master/dashboard-admin.yaml : 1637200266:0;kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/master/aio/deploy/recommended.yaml -: 1637200340:0;txy1 : 1637200549:0;kubectl proxy : 1637200654:0;kubectl apply -f https://raw.githubusercontent.com/gotok8s/gotok8s/master/dashboard-admin.yaml -: 1637200678:0;php artisan tujigu:s --env=local && php artisan nvshen:get --env=local -v && eproxy php artisan xiu:get --env=local -v && unproxy -: 1637200702:0;php artisan bili:nvtuan default 1000 /data --env=local -: 1637200707:0;php artisan xiuren:s -: 1637200719:0;eproxy php artisan ins:like 54 && unproxy : 1637200738:0;kubectl -n kubernetes-dashboard describe secret $(kubectl -n kubernetes-dashboard get secret | grep kubernetes-dashboard-admin | awk '{print $1}') -: 1637201855:0;gst -: 1637201863:0;gco master -: 1637201864:0;gl : 1637220173:0;brew list | grep elasticsearch : 1637220210:0;brew uninstall elasticsearch-full : 1637220239:0;brew uninstall gphotos-uploader-cli @@ -11015,8 +10981,6 @@ done : 1637220906:0;ls : 1637222877:0;cd ~/Documents/惵学 : 1637222889:0;cd ~/Documents/学乃/惵学 -: 1637222899:0;ins -: 1637222909:0;cd - : 1637222933:0;ffmpeg -threads 4 -i 07.髃筃惵学精讲07.mp4 -preset ultrafast -c:v libx265 -vtag hvc1 "07.髃筃惵学精讲07-x265.mp4" : 1637223441:0;cd /Users/shixuesen/Library/Application\ Support/Google/Chrome/Default/Local\ Extension\ Settings/gljbehlmmccbnlodcbffliadddlcoide : 1637223451:0;tail -f 000003.log @@ -11033,91 +10997,29 @@ done : 1637285943:0;exit : 1637286140:0;curl ttps://b23.tv/I0gHngg : 1637286144:0;curl https://b23.tv/I0gHngg -: 1637286319:0;ins -: 1637286322:0;php artisan tujigu:s --env=local && php artisan nvshen:get --env=local -v && eproxy php artisan xiu:get --env=local -v && unproxy -: 1637286337:0;ins -: 1637286342:0;php artisan bili:nvtuan default 1000 /data --env=local -: 1637286350:0;ins -: 1637286359:0;php artisan xiuren:s -: 1637287846:0;php artisan tujigu:s --env=local && php artisan nvshen:get --env=local -v && eproxy php artisan xiu:get --env=local -v && unproxy -: 1637287849:0;php artisan bili:nvtuan default 1000 /data --env=local -: 1637287852:0;php artisan xiuren:s : 1637287854:0;ins : 1637287860:0;eproxy php artisan ins:like 0 && unproxy : 1637290909:0;php artisan nvshen:get --env=local -v : 1637291173:0;eproxy php artisan xiu:get --env=local -v && unproxy : 1637292122:0;txy3 -: 1637293033:0;php artisan bili:nvtuan default 1000 /data --env=local : 1637293052:0;tail -fn 1000 storage/logs/laravel-2021-11-19.log -: 1637295521:0;txy1 -: 1637301142:0;gst -: 1637301237:0;gl : 1637301360:0;cd ../promotion-platform -: 1637301360:0;gst -: 1637301361:0;gl -: 1637301438:0;cd - -: 1637301440:0;gst -: 1637301447:0;gco -b feature/payment_page_pops_up -: 1637301448:0;gst -: 1637301449:0;gl -: 1637301491:0;gp -: 1637301497:0;git push --set-upstream origin feature/payment_page_pops_up : 1637301567:0;gco master -: 1637301569:0;gl -: 1637301614:0;gst -: 1637301614:0;gl -: 1637301618:0;gco -b feature/payment_page_pops_up : 1637301629:0;gb -D feature/payment_page_pops_up : 1637301632:0;gco -b feature/payment_page_pops_up -: 1637301633:0;gp : 1637301639:0;git push --set-upstream origin feature/payment_page_pops_up -: 1637301915:0;txy1 : 1637306622:0;cd - -: 1637306623:0;gst -: 1637306624:0;gl -: 1637306628:0;gco - -: 1637306629:0;gst -: 1637306630:0;gl -: 1637306638:0;gco feature/payment_page_pops_up -: 1637306639:0;gl -: 1637309912:0;gst -: 1637309921:0;git add . : 1637309942:0;git commit -m "add tradeId in GetPublicPopUpReq" -: 1637309944:0;gp : 1637309946:0;mi -: 1637309990:0;gst -: 1637313091:0;git add . -: 1637313135:0;git commit -m "add popUpDelegate" -: 1637313136:0;gst -: 1637313137:0;gp -: 1637313168:0;gco feature/community_exclusive_price_211115 -: 1637313169:0;gst -: 1637313170:0;gl -: 1637313181:0;gst -: 1637313191:0;gco - -: 1637313192:0;gl : 1637313199:0;cd ../card-web -: 1637313200:0;gst : 1637313203:0;git add . : 1637313205:0;git commit -m "add popUpDelegate" : 1637313206:0;gp -: 1637313209:0;gco - -: 1637313210:0;gl -: 1637313213:0;gco feature/community_exclusive_price_211115 -: 1637313214:0;gl -: 1637313286:0;gco - -: 1637313291:0;gco feature/payment_page_pops_up -: 1637313292:0;gl -: 1637313346:0;gco - -: 1637313347:0;gl : 1637313352:0;gco feature/community_exclusive_price_211115 : 1637313353:0;gst -: 1637313354:0;gl : 1637313370:0;gco - : 1637313376:0;gco feature/payment_page_pops_up : 1637313377:0;gl -: 1637332265:0;txy1 -: 1637382401:0;php artisan bili:nvtuan default 1000 /data --env=local : 1637382417:0;brew unlink php : 1637382423:0;brew link php@7.4 : 1637382431:0;php artisan tujigu:s --env=local && php artisan nvshen:get --env=local -v && eproxy php artisan xiu:get --env=local -v && unproxy @@ -11125,3 +11027,7 @@ done : 1637382438:0;php artisan xiuren:s : 1637382443:0;eproxy php artisan ins:like 54 && unproxy : 1637385979:0;txy1 +: 1637499811:0;hexo new draft "聃聃惼迃平淃烺烴活乃烼烼老僩" +: 1637509841:0;hexo publish "聃聃惼迃平淃烺烴活乃烼烼老僩" +: 1637509848:0;hexo clean && hexo g && hexo s --debug +: 1637509896:0;hexo d --debug