diff --git a/.backup/crontab-20210728-070100.gz b/.backup/crontab-20210728-070100.gz new file mode 100644 index 0000000..9eacc95 Binary files /dev/null and b/.backup/crontab-20210728-070100.gz differ diff --git a/.zsh_history b/.zsh_history index fdcbc9d..d3cabc9 100644 --- a/.zsh_history +++ b/.zsh_history @@ -6926,7 +6926,6 @@ done : 1603696849:0;nm01 : 1603696853:0;n01 : 1603696861:0;cat ~/.zshrc| grep n -: 1603698947:0;ssh root@10.86.10.254 : 1603762235:0;mkdir jd_base : 1603762251:0;bash -c "$(wget https://raw.githubusercontent.com/EvineDeng/jd-base/main/first_run.sh -O -)\ \ @@ -7285,7 +7284,6 @@ done : 1606202552:0;ping walle.nicomama.it : 1606232615:0;php artisan make : 1606233182:0;php artisan make:command XiurenjiScrape -: 1606274970:0;gb : 1606275474:0;brew info docker : 1606275492:0;brew cask info docker : 1606280957:0;java -jar target/ip-demo.jar @@ -7881,7 +7879,6 @@ done : 1610969748:0;export https_proxy=http://127.0.0.1:8890 : 1610970316:0;unexport https_proxy=http://127.0.0.1:8890 : 1610970333:0;unset https_proxy; -: 1610970756:0;php artisan common:test : 1610983893:0;curl -L https://www.v2ph.com/company/beautyleg : 1610983906:0;curl https://www.v2ph.com/company/beautyleg : 1611021526:0;chmod +x mtSecKill\ \(2\).mac @@ -8227,7 +8224,6 @@ done : 1615120331:0;hexo new draft "〃ªåƒ¾ƒ£åƒ¼¾åƒ»ƒ¾æƒ´¶ç®ƒ·æ³ƒµæƒ©ƒ«åƒ¦ƒ¬è¯»ä¹¦ã€ƒ«ç¬ƒ´è®°ä¹ƒ«æƒµ´çƒ°ƒ¦ç®ƒ·æ³ƒµ" : 1615120621:0;hexo publish "〃ªåƒ¾ƒ£åƒ¼¾åƒ»ƒ¾æƒ´¶ç®ƒ·æ³ƒµæƒ©ƒ«åƒ¦ƒ¬è¯»ä¹¦ã€ƒ«ç¬ƒ´è®°ä¹ƒ«æƒµ´çƒ°ƒ¦ç®ƒ·æ³ƒµ" : 1615120925:0;cd .Trashes -: 1615120930:0;sudo su : 1615128283:0;php71 : 1615167694:0;cat ~/.zshrc| grep ii : 1615167704:0;cat ~/.zshrc @@ -9162,7 +9158,6 @@ done : 1623763035:0;cd PR社僥¨å¥ƒ·åƒ»¾Â·è§ƒ¦éƒ‚ƒ±åƒ°ƒ¨è¾ƒ±4 : 1623763063:0;php artisan rename:test '/Volumes/192.168.31.202/PR社僥¨å¥ƒ·åƒ»¾Â·è§ƒ¦éƒ‚ƒ±åƒ°ƒ¨è¾ƒ±4' '' : 1623810962:0;php artisan -: 1623822679:0;git stash : 1623822703:0;git stash pop : 1623822740:0;git commit -m "fix present receive" : 1623893507:0;iins @@ -9203,14 +9198,12 @@ done : 1624282337:0;php artisan handle:video "/Volumes/Backup/HuaVid/Ivy Aura Hardcore Pack" : 1624326278:0;ffmpeg -h | grep -C 5 thread : 1624326469:0;alias | grep git -: 1624326493:0;alias | grep 'git diff' : 1624363784:0;cat ~/.mavenrc : 1624364642:0;ls /usr/bin/java : 1624364646:0;ls -alh /usr/bin/java : 1624412687:0;cd ~/Documents/sync : 1624439322:0;ping v2.nicksxs.com : 1624440658:0;gcl https://github.com/openjdk/jdk.git -: 1624499651:0;gd : 1624514027:0;bash configure : 1624517739:0;gcl https://github.com/meolu/walle-web-v1.x.git : 1624517988:0;exoit @@ -9237,59 +9230,8 @@ done : 1624858467:0;gco knowledge-platform-service/src/main/resources/spring-mq.xml : 1624858727:0;git merge --abort : 1624859258:0;git commit -m "feature: add end limit for new early learning" -: 1624860204:0;gst -: 1624860209:0;git add . : 1624860235:0;git commit -m "feature: add NewEarlyCheckMaxBuyPhaseMonthRequest" -: 1624860236:0;gp -: 1624860239:0;gco dev -: 1624860240:0;gl -: 1624860246:0;git merge feature/limit_end_month_for_new_early_learning -: 1624860318:0;mi -: 1624860439:0;gst -: 1624860446:0;git add . -: 1624860461:0;git commit -m "merge feature limit_end_month_for_new_early_learning" -: 1624860462:0;gp -: 1624860465:0;gst -: 1624860466:0;gl -: 1624860747:0;nm2 -: 1624860810:0;gst -: 1624860812:0;gco dev -: 1624860813:0;gl -: 1624861287:0;gst -: 1624861295:0;git add . : 1624861318:0;git commit -m "fix message msgTraceSwitch" -: 1624861319:0;gst -: 1624861320:0;gp -: 1624862984:0;ssh jump -: 1624867377:0;exit -: 1624867810:0;txy1 -: 1624871471:0;ssh jump -: 1624893474:0;txy1 -: 1624929981:0;ins -: 1624929986:0;php artisan tujigu:s && php artisan nvshen:get -v && eproxy php artisan xiu:get -v && unproxy -: 1624931082:0;exit -: 1624931108:0;gst -: 1624931109:0;gl -: 1624931114:0;gco feature/limit_end_month_for_new_early_learning -: 1624931115:0;gl -: 1624931125:0;gco test -: 1624931126:0;gl -: 1624931133:0;git merge feature/limit_end_month_for_new_early_learning -: 1624931301:0;mi -: 1624931381:0;ins -: 1624931384:0;php artisan xiuren:s -: 1624931537:0;cd knowledge-platform-client -: 1624931538:0;md -: 1624931573:0;cd .. -: 1624931574:0;gst -: 1624931576:0;git add . -: 1624931581:0;git commit -m "merge feature limit_end_month_for_new_early_learning" -: 1624931583:0;gp -: 1624931596:0;gst -: 1624931598:0;gl -: 1624931612:0;gco feature/limit_end_month_for_new_early_learning -: 1624931613:0;gl -: 1624931668:0;gco test : 1624931669:0;gl : 1624931675:0;git merge feature/limit_end_month_for_new_early_learning : 1624931741:0;mi @@ -10876,3 +10818,64 @@ done : 1627350171:0;gl : 1627350181:0;gst : 1627350182:0;gl +: 1627351166:0;php artisan common:test "/Volumes/intel660p/video/mv/bilibili/郿©åƒ»½å¥³åƒ»ƒ‚饭惫ƒ­çƒ»´æƒ«ƒ­" --env=local +: 1627351439:0;ins +: 1627351446:0;php artisan tujigu:s && php artisan nvshen:get -v && eproxy php artisan xiu:get -v && unproxy +: 1627351453:0;ins +: 1627351455:0;php artisan xiuren:s +: 1627352198:0;brew cleanup -n +: 1627352875:0;exit +: 1627362188:0;txy1 +: 1627367098:0;gst +: 1627367100:0;gl +: 1627367200:0;gst +: 1627367346:0;gco -b feature/modify_learning_receive_box_wx_push_sxs20210727 +: 1627367347:0;gst +: 1627367508:0;git add . +: 1627367546:0;git commit -m "modify wx push remark " +: 1627367547:0;gp +: 1627367553:0;git push --set-upstream origin feature/modify_learning_receive_box_wx_push_sxs20210727 +: 1627367692:0;gst +: 1627367695:0;gl +: 1627367703:0;gco - +: 1627367719:0;gb +: 1627367737:0;gco feature/series_course_offline_contact_teacher_sxs_20210722 +: 1627367738:0;gst +: 1627367739:0;gl +: 1627368542:0;ssh root@10.86.10.254 +: 1627369318:0;gst +: 1627369323:0;gco dev +: 1627369325:0;gl +: 1627375480:0;sudo su +: 1627383359:0;$ ffprobe -v error -select_streams v:0 -show_entries stream=codec_name -of default=nokey=1:noprint_wrappers=1 "/Volumes/intel660p/video/mv/bilibili/郿©åƒ»½å¥³åƒ»ƒ‚饭惫ƒ­çƒ»´æƒ«ƒ­/活僪¨ä½ƒ¼åƒ³ã€ƒ°ä¸ƒªç«åƒ°ƒ±ã€ƒ±T-ARA巨魃´åƒ»ƒ‚ç­äºƒ«ä»¶åƒ¨°åºƒµæƒ¸¯æ€ƒ®ä¹ƒ¨åƒ»ƒ¾äºƒ«ï¼ƒ¿å¥¹ä»¬æƒ»¾ç»ƒ¯ç»ƒ¯åƒ®ƒ¦äºƒ¦ä»€ä¹ƒ¨ï¼ƒ¿é¥­åƒ³¥è¯¾åƒ€‚第亃¬æƒ¼ƒ¿.mp4"\ + +: 1627383368:0;ffprobe -v error -select_streams v:0 -show_entries stream=codec_name -of default=nokey=1:noprint_wrappers=1 "/Volumes/intel660p/video/mv/bilibili/郿©åƒ»½å¥³åƒ»ƒ‚饭惫ƒ­çƒ»´æƒ«ƒ­/活僪¨ä½ƒ¼åƒ³ã€ƒ°ä¸ƒªç«åƒ°ƒ±ã€ƒ±T-ARA巨魃´åƒ»ƒ‚ç­äºƒ«ä»¶åƒ¨°åºƒµæƒ¸¯æ€ƒ®ä¹ƒ¨åƒ»ƒ¾äºƒ«ï¼ƒ¿å¥¹ä»¬æƒ»¾ç»ƒ¯ç»ƒ¯åƒ®ƒ¦äºƒ¦ä»€ä¹ƒ¨ï¼ƒ¿é¥­åƒ³¥è¯¾åƒ€‚第亃¬æƒ¼ƒ¿.mp4"\ + +: 1627383449:0;ffprobe -v error -show_format -show_streams "/Volumes/intel660p/video/mv/bilibili/郿©åƒ»½å¥³åƒ»ƒ‚饭惫ƒ­çƒ»´æƒ«ƒ­/活僪¨ä½ƒ¼åƒ³ã€ƒ°ä¸ƒªç«åƒ°ƒ±ã€ƒ±T-ARA巨魃´åƒ»ƒ‚ç­äºƒ«ä»¶åƒ¨°åºƒµæƒ¸¯æ€ƒ®ä¹ƒ¨åƒ»ƒ¾äºƒ«ï¼ƒ¿å¥¹ä»¬æƒ»¾ç»ƒ¯ç»ƒ¯åƒ®ƒ¦äºƒ¦ä»€ä¹ƒ¨ï¼ƒ¿é¥­åƒ³¥è¯¾åƒ€‚第亃¬æƒ¼ƒ¿.mp4"\ + +: 1627383481:0;ffprobe -v error -show_format -show_streams "/Volumes/intel660p/video/mv/bilibili/郿©åƒ»½å¥³åƒ»ƒ‚饭惫ƒ­çƒ»´æƒ«ƒ­/郣½ç»ƒ¹æƒ¨ƒ±è¿ƒ»æƒ½¥åƒ°¬èƒ¥¿ï¼ChumChurum惾ƒ·æƒ¼ƒ©çƒ¼ƒ¿YUJIN大烹½éƒµ¿èƒ¥¿æ€§æƒ¤ƒ¿çƒ£­èƒ¨ƒ¾é«ƒ¸æ¸ƒ¥é¥­æƒ«ƒ­çƒ»´æƒ«ƒ­äºƒ¬åƒ°ƒ¨ä¸€ P2 ChumChurum 惾ƒ·æƒ¼ƒ©çƒ¼ƒ¿.mp4"\ + +: 1627383834:0;composer require php-ffmpeg/php-ffmpeg +: 1627384088:0;php artisan common:test +: 1627384106:0;php artisan common:test "aaa" +: 1627384127:0;ffprobe -h +: 1627384391:0;which ffprobe +: 1627384423:0;php artisan common:test "aaa" +: 1627384662:0;php artisan common:test "/Volumes/intel660p/video/mv/bilibili/郿©åƒ»½å¥³åƒ»ƒ‚饭惫ƒ­çƒ»´æƒ«ƒ­" --env=local +: 1627385095:0;exit +: 1627393051:0;gst +: 1627393058:0;git add . +: 1627393066:0;git commit -m "modify ffmpeg" +: 1627393069:0;gst +: 1627393070:0;gp +: 1627400714:0;exit +: 1627401517:0;ins +: 1627401522:0;php artisan common:test "/Volumes/intel660p/video/mv/bilibili/郿©åƒ»½å¥³åƒ»ƒ‚饭惫ƒ­çƒ»´æƒ«ƒ­" --env=local +: 1627433246:0;exit +: 1627435968:0;ins +: 1627435984:0;vim app/Services/FfmpegService.php +: 1627436018:0;php artisan common:test "/Volumes/intel660p/video/mv/bilibili/" --env=local +: 1627436316:0;ins +: 1627436322:0;php artisan tujigu:s && php artisan nvshen:get -v && eproxy php artisan xiu:get -v && unproxy +: 1627436354:0;ins +: 1627436357:0;php artisan xiuren:s