diff --git a/.backup/crontab-20210916-070100.gz b/.backup/crontab-20210916-070100.gz new file mode 100644 index 0000000..88baa95 Binary files /dev/null and b/.backup/crontab-20210916-070100.gz differ diff --git a/.zsh_history b/.zsh_history index 8273948..c8f89b7 100644 --- a/.zsh_history +++ b/.zsh_history @@ -8998,7 +8998,6 @@ done : 1623289266:0;cd /Volumes/Backup/HuaVid/leezy : 1623289287:0;eproxy youtube-dl -i -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 https://www.youtube.com/channel/UCOON7HbktJy5i19fyKTOEXw : 1623294831:0;cat ~/.m2/settings.xml -: 1623294866:0;code ~/.m2/settings.xml : 1623294991:0;open ~/.m2 : 1623302323:0;cd 36-僱ƒ¦èƒ°ƒ¬æ©ƒ¸å­ƒ°éƒ¥± : 1623302514:0;cd PR社僱ƒ¦èƒ°ƒ¬æ©ƒ¸å­ƒ°éƒ¥±è§ƒ¦éƒ‚ƒ± @@ -9435,7 +9434,6 @@ done : 1626348566:0;man brew : 1626348602:0;brew cleanup -s : 1626348909:0;cd /Volumes/WIN/video/Ayu\ Sakurai -: 1626350537:0;df -h : 1626352239:0;mediainfo blk-136-x265.mp4 : 1626355791:0;ffmpeg -i blk-136.mp4 -c:v libx265 -vtag hvc1 blk-136-x265.mp4 : 1626356905:0;cd /Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/lib/missioncontrol @@ -10100,7 +10098,6 @@ for i in $(seq 1 2)\ do\ annie -f 64 $url$i\ done -: 1630478724:0;rm -rf * : 1630479117:0;cd Contents : 1630479243:0;cat ~/.zshrc | grep JAVA_HOME : 1630479264:0;cat ~/.zshrc @@ -10140,47 +10137,20 @@ done : 1630498488:0;git stash list : 1630502506:0;cd /Volumes/WD/VideoCollection/rainbow : 1630502547:0;ffmpeg -threads 4 -i "ფ‚ქƒ‚ფ€áƒ¥ƒ ფƒ­áƒ¥µáƒ¦¨áƒ¤ƒ«áƒ¥³áƒ¦« ფƒ¥áƒ¥¦áƒ¤ƒ«áƒ¥µáƒ¦«áƒ¤ƒ§áƒ¥©áƒ¤ƒ«áƒ¥®(RAINBOW) ფƒ¬áƒ¥µáƒ¦¨áƒ¤ƒ¯áƒ¥ƒ‚ღ·-0KXffUop2q0.mp4" -preset ultrafast -c:v libx265 -vtag hvc1 "ფ‚ქƒ‚ფ€áƒ¥ƒ ფƒ­áƒ¥µáƒ¦¨áƒ¤ƒ«áƒ¥³áƒ¦« ფƒ¥áƒ¥¦áƒ¤ƒ«áƒ¥µáƒ¦«áƒ¤ƒ§áƒ¥©áƒ¤ƒ«áƒ¥®(RAINBOW) ფƒ¬áƒ¥µáƒ¦¨áƒ¤ƒ¯áƒ¥ƒ‚ღ·-0KXffUop2q0-x265.mp4" -: 1630541084:0;php artisan common:test "/Volumes/WD/tmp/bilibili/女僻ƒ‚" --env=local -: 1630544651:0;cd ~ -: 1630548849:0;php artisan common:test "/Volumes/WD/tmp/bilibili/女僻ƒ‚" --env=local -: 1630548919:0;ins -: 1630548922:0;php artisan tujigu:s && php artisan nvshen:get -v && eproxy php artisan xiu:get -v && unproxy -: 1630548943:0;ins -: 1630548946:0;php artisan xiuren:s : 1630549461:0;cd /Volumes/intel660p/video/mv/bilibili/å­ƒ½æƒ»¦æƒ»¦ -: 1630549468:0;annie -f 64 av292590895 -: 1630549541:0;eproxy : 1630549542:0;annie -f 64 av292590895 -: 1630549690:0;cd .. : 1630549693:0;cd Natsu夃¯æƒ·¥ : 1630549699:0;annie -f 64 av720230131 : 1630549796:0;cd ../iu : 1630549801:0;annie -f 64 av974745818 : 1630550329:0;cd /Volumes/WD/tmp/bilibili/ : 1630550339:0;annie -f 64 av847595780 -: 1630551925:0;ping tjg.hywly.com : 1630551930:0;dig tjg.hywly.com : 1630551952:0;dig tjg.hywly.com @8.8.8.8 : 1630551973:0;dig tjg.hywly.com @1.1.1.1 -: 1630552502:0;ping tjg.hywly.com : 1630552572:0;eproy ping tjg.hywly.com : 1630552581:0;eproxy ping tjg.hywly.com -: 1630552592:0;eproxy php artisan ins:like 54 && unproxy -: 1630559261:0;cd .. -: 1630559262:0;gst -: 1630559267:0;gd -: 1630559653:0;gst -: 1630559657:0;git add . : 1630559666:0;git commit -m "upgrade common biz" -: 1630559668:0;gl -: 1630559674:0;gp -: 1630559678:0;gco dev -: 1630559679:0;gl -: 1630560173:0;gst -: 1630560179:0;git diff . -: 1630560193:0;mi -: 1630560929:0;gst -: 1630560932:0;gco - : 1630560933:0;gl : 1630568007:0;unproxy : 1630568011:0;ping tjg.hywly.com @@ -10974,3 +10944,140 @@ done : 1631635191:0;git add . : 1631635204:0;git commit -m "modify escapeshellarg" : 1631635205:0;gp +: 1631670794:0;ins +: 1631670798:0;php artisan tujigu:s --env=local && php artisan nvshen:get --env=local -v && eproxy php artisan xiu:get --env=local -v && unproxy +: 1631670824:0;ins +: 1631670827:0;php artisan xiuren:s +: 1631670833:0;ins +: 1631670843:0;eproxy php artisan ins:like 54 && unproxy +: 1631671894:0;mi +: 1631671978:0;code ~/.m2/settings.xml +: 1631672008:0;mi +: 1631672067:0;mcl +: 1631672088:0;cd ~/.m2/repository/org +: 1631672089:0;l +: 1631672098:0;cd springframework +: 1631672098:0;ls +: 1631672101:0;rm -rf * +: 1631672106:0;mcl +: 1631672123:0;l +: 1631672129:0;rm -rf * +: 1631672142:0;mi +: 1631672194:0;ls +: 1631672198:0;cd .. +: 1631672203:0;ls +: 1631672622:0;cd .. +: 1631673370:0;tail -fn 1000 storage/logs/laravel-2021-09-15.log +: 1631674771:0;php artisan xiuren:s +: 1631687488:0;gst +: 1631687490:0;gl +: 1631688901:0;exit +: 1631688956:0;df -h +: 1631688959:0;exit +: 1631688982:0;pr1 +: 1631688996:0;ssh root@155.94.201.160 +: 1631690183:0;gst +: 1631690191:0;git add . +: 1631690194:0;git stash +: 1631690196:0;gst +: 1631690197:0;gl +: 1631690330:0;gst +: 1631690338:0;gl +: 1631690344:0;gco - +: 1631690345:0;gl +: 1631690578:0;nm5 +: 1631690728:0;curl 'http://admindevapi.ngmm001.com/admin/education/center/logistics/addGiftPackage' \\ + -H 'Connection: keep-alive' \\ + -H 'Pragma: no-cache' \\ + -H 'Cache-Control: no-cache' \\ + -H 'Accept: application/json, text/plain, */*' \\ + -H 'x-access-token: 40cb7291-7505-4562-bc25-cc356ddaf6ca' \\ + -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36' \\ + -H 'x-user-id: 29' \\ + -H 'Content-Type: application/json;charset=UTF-8' \\ + -H 'Origin: http://localhost:3100' \\ + -H 'Accept-Language: zh-CN,zh;q=0.9,en;q=0.8' \\ + --data-raw '{"id":null,"title":"惶°æƒ«¼æƒ°­ç¤¼åƒ¬ƒ¥","bizType":13,"bizSymbol":"assembling_blocks","channelType":1,"sendLimit":null,"operatorName":"admin","detailList":[{"serverType":1007,"serverId":0.01,"templateList":[{"id":164,"templateName":"樃烩ƒ¨ä¸ƒ«åƒ¥³èƒ´å¤ƒºä¸ªsku"},{"id":134,"templateName":"cc僯ƒ±è´§æµƒ«è¯ƒµ"},{"id":132,"templateName":"惫¼æƒ°­çƒ»ƒ²å­ƒ°æ¨ƒçƒ©ƒ¨"},{"id":131,"templateName":"佃³ç³»è¯¾æ¨ƒçƒ©ƒ¨2"},{"id":130,"templateName":"樃烩ƒ¨2333"}],"image":"https://staticimg.ngmm365.com/0408030e4337affa2e9baeda1ded1f8a-w1000_h947.png"}],"timeArr":[1631635200000,1635609600000],"serverId":2976,"startTime":1631635200000,"endTime":1635609600000}' \\ + --compressed \\ + --insecure +: 1631690899:0;nm5 +: 1631690924:0;nm2 +: 1631691006:0;curl 'http://admindevapi.ngmm001.com/admin/education/center/logistics/addGiftPackage' \\ + -H 'Connection: keep-alive' \\ + -H 'Pragma: no-cache' \\ + -H 'Cache-Control: no-cache' \\ + -H 'Accept: application/json, text/plain, */*' \\ + -H 'x-access-token: 40cb7291-7505-4562-bc25-cc356ddaf6ca' \\ + -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36' \\ + -H 'x-user-id: 29' \\ + -H 'Content-Type: application/json;charset=UTF-8' \\ + -H 'Origin: http://localhost:3100' \\ + -H 'Accept-Language: zh-CN,zh;q=0.9,en;q=0.8' \\ + --data-raw '{"id":null,"title":"惶°æƒ«¼æƒ°­ç¤¼åƒ¬ƒ¥","bizType":13,"bizSymbol":"assembling_blocks","channelType":1,"sendLimit":null,"operatorName":"admin","detailList":[{"serverType":1007,"serverId":0.01,"templateList":[{"id":164,"templateName":"樃烩ƒ¨ä¸ƒ«åƒ¥³èƒ´å¤ƒºä¸ªsku"},{"id":134,"templateName":"cc僯ƒ±è´§æµƒ«è¯ƒµ"},{"id":132,"templateName":"惫¼æƒ°­çƒ»ƒ²å­ƒ°æ¨ƒçƒ©ƒ¨"},{"id":131,"templateName":"佃³ç³»è¯¾æ¨ƒçƒ©ƒ¨2"},{"id":130,"templateName":"樃烩ƒ¨2333"}],"image":"https://staticimg.ngmm365.com/0408030e4337affa2e9baeda1ded1f8a-w1000_h947.png"}],"timeArr":[1631635200000,1635609600000],"serverId":2976,"startTime":1631635200000,"endTime":1635609600000}' \\ + --compressed \\ + --insecure +: 1631691788:0;nm5 +: 1631691871:0;curl 'http://admindevapi.ngmm001.com/admin/education/center/logistics/addGiftPackage' \\ + -H 'Connection: keep-alive' \\ + -H 'Pragma: no-cache' \\ + -H 'Cache-Control: no-cache' \\ + -H 'Accept: application/json, text/plain, */*' \\ + -H 'x-access-token: 40cb7291-7505-4562-bc25-cc356ddaf6ca' \\ + -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36' \\ + -H 'x-user-id: 29' \\ + -H 'Content-Type: application/json;charset=UTF-8' \\ + -H 'Origin: http://localhost:3100' \\ + -H 'Accept-Language: zh-CN,zh;q=0.9,en;q=0.8' \\ + --data-raw '{"id":null,"title":"惶°æƒ«¼æƒ°­ç¤¼åƒ¬ƒ¥","bizType":13,"bizSymbol":"assembling_blocks","channelType":1,"sendLimit":null,"operatorName":"admin","detailList":[{"serverType":1007,"serverId":0.01,"templateList":[{"id":164,"templateName":"樃烩ƒ¨ä¸ƒ«åƒ¥³èƒ´å¤ƒºä¸ªsku"},{"id":134,"templateName":"cc僯ƒ±è´§æµƒ«è¯ƒµ"},{"id":132,"templateName":"惫¼æƒ°­çƒ»ƒ²å­ƒ°æ¨ƒçƒ©ƒ¨"},{"id":131,"templateName":"佃³ç³»è¯¾æ¨ƒçƒ©ƒ¨2"},{"id":130,"templateName":"樃烩ƒ¨2333"}],"image":"https://staticimg.ngmm365.com/0408030e4337affa2e9baeda1ded1f8a-w1000_h947.png"}],"timeArr":[1631635200000,1635609600000],"serverId":2976,"startTime":1631635200000,"endTime":1635609600000}' \\ + --compressed \\ + --insecure +: 1631692336:0;ssh root@155.94.201.160 +: 1631695005:0;gst +: 1631695008:0;gco . +: 1631695009:0;gst +: 1631695010:0;gl +: 1631695012:0;gco - +: 1631695013:0;gl +: 1631695017:0;gco feature/lego_L0 +: 1631695019:0;gl +: 1631695122:0;ssh root@155.94.201.160 +: 1631695435:0;mi +: 1631695613:0;gst +: 1631695617:0;git add . +: 1631695638:0;git commit -m "modify goodsId requirement and query self" +: 1631695639:0;gp +: 1631695651:0;gco dev +: 1631695652:0;gl +: 1631695657:0;git merge feature/lego_L0 +: 1631695663:0;gp +: 1631696818:0;ls +: 1631696821:0;git status +: 1631696826:0;git push +: 1631696847:0;git push -u origin --all +: 1631696863:0;tail -fn 1000 /var/mail/shixuesen +: 1631696889:0;cat .git/config +: 1631696938:0;vim .git/config +: 1631706935:0;ssh root@155.94.201.160 +: 1631706960:0;dev +: 1631706962:0;cd src +: 1631706993:0;gcl http://git.nicksxs.com/nicksxs/mgp25.git +: 1631707807:0;cat ~/.ssh/id_rsa.pub +: 1631708055:0;ssh root@155.94.201.160 +: 1631708076:0;vim ~/.zshrc +: 1631708101:0;bwg1 +: 1631708122:0;sk1 +: 1631710936:0;txy3 +: 1631712124:0;gst +: 1631712128:0;git add . +: 1631712318:0;git commit -m "modify" +: 1631712320:0;git add . +: 1631712325:0;git commit -m "modify" +: 1631712326:0;gp +: 1631718217:0;ins +: 1631718233:0;php artisan common:test "/Volumes/Samsung/weibo/people" --env=local +: 1631718239:0;redis-cli del stopFlag +: 1631718241:0;php artisan common:test "/Volumes/Samsung/weibo/people" --env=local +: 1631718253:0;ins +: 1631718257:0;tail -fn 1000 storage/logs/laravel-2021-09-15.log +: 1631750033:0;php artisan common:test "/Volumes/Samsung/weibo/video" --env=local +: 1631753808:0;redis-cli set stopFlag '1' diff --git a/.zshrc b/.zshrc index bc9e551..e80df51 100644 --- a/.zshrc +++ b/.zshrc @@ -103,7 +103,7 @@ alias txy1="ssh ubuntu@115.159.36.184" alias txy2="ssh ubuntu@118.24.10.31" alias txy3="ssh ubuntu@81.68.227.209" alias sk1="ssh root@64.52.109.110" -alias pr1="ssh root@155.94.135.213" +alias pr1="ssh root@155.94.201.160" alias uc1="ssh ubuntu@152.32.187.149" alias gcp1="ssh shixuesen@35.221.158.39" alias vim="nvim"