diff --git a/.backup/crontab-20201229-070100.gz b/.backup/crontab-20201229-070100.gz new file mode 100644 index 0000000..9f43131 Binary files /dev/null and b/.backup/crontab-20201229-070100.gz differ diff --git a/.backup/pip3_packages b/.backup/pip3_packages index e69de29..82cc291 100644 --- a/.backup/pip3_packages +++ b/.backup/pip3_packages @@ -0,0 +1,140 @@ +Package Version +-------------------- ---------- +-elenium 3.11.0 +-ix 1.12.0 +absl-py 0.8.0 +aiodns 2.0.0 +aiohttp 3.6.2 +aiohttp-socks 0.2.2 +appdirs 1.4.3 +asciimatics 1.11.0 +asn1crypto 0.24.0 +astor 0.8.0 +async-timeout 3.0.1 +attrs 19.1.0 +Automat 0.7.0 +autopep8 1.4.4 +beautifulsoup4 4.6.3 +billiard 3.6.1.0 +bs4 0.0.1 +cchardet 2.1.5 +certifi 2020.4.5.1 +cffi 1.12.3 +chardet 3.0.4 +coala-utils 0.5.1 +constantly 15.1.0 +cos-python-sdk-v5 1.7.3 +coscmd 1.8.6.4 +cryptography 2.7 +cssselect 1.0.3 +cycler 0.10.0 +DateTime 4.3 +decorator 4.4.2 +dicttoxml 1.7.4 +docopt 0.6.2 +elasticsearch 7.1.0 +et-xmlfile 1.0.1 +fake-useragent 0.1.11 +future 0.18.2 +gast 0.3.1 +geographiclib 1.50 +geopy 1.20.0 +gevent 1.4.0 +google-pasta 0.1.7 +greenlet 0.4.15 +grpcio 1.23.0 +h5py 2.10.0 +hyperlink 19.0.0 +idna 2.9 +imageio 2.6.1 +imageio-ffmpeg 0.4.2 +importlib-metadata 2.0.0 +incremental 17.5.0 +instagram-scraper 1.7.1 +iso8601 0.1.12 +jdcal 1.4.1 +Jinja2 2.11.2 +joblib 0.13.2 +Keras 2.2.5 +Keras-Applications 1.0.8 +Keras-Preprocessing 1.1.0 +kiwisolver 1.1.0 +lxml 4.5.1 +m3u8 0.5.3 +Markdown 3.1.1 +MarkupSafe 1.1.1 +matplotlib 3.1.1 +moviepy 1.0.3 +multidict 4.6.1 +ntplib 0.3.3 +numpy 1.19.1 +opencv-python 4.1.0.25 +openpyxl 2.4.11 +pandas 0.25.3 +parse 1.12.1 +parsel 1.5.1 +piexif 1.1.2 +Pillow 5.2.0 +pip 20.0.2 +prettytable 0.7.2 +proglog 0.1.9 +protobuf 3.9.1 +pyasn1 0.4.5 +pyasn1-modules 0.2.5 +pycares 3.0.0 +pycodestyle 2.5.0 +pycparser 2.19 +PyDispatcher 2.0.5 +pyecharts 1.7.1 +pyecharts-snapshot 0.2.0 +pyee 6.0.0 +pyfiglet 0.8.post1 +PyHamcrest 1.9.0 +pymongo 3.5.1 +PyMySQL 0.9.3 +pyOpenSSL 19.0.0 +pyparsing 2.4.2 +pyppeteer 0.0.25 +pyquery 1.4.0 +PySocks 1.7.1 +python-dateutil 2.8.0 +pytz 2019.2 +PyYAML 5.1.1 +queuelib 1.5.0 +records 0.5.3 +requests 2.23.0 +requests-html 0.10.0 +schedule 0.6.0 +scikit-learn 0.21.3 +scipy 1.3.1 +Scrapy 1.5.1 +selenium 3.14.0 +service-identity 18.1.0 +setuptools 46.0.0 +simplejson 3.17.0 +six 1.10.0 +sklearn 0.0 +SQLAlchemy 1.3.17 +tablib 2.0.0 +tensorboard 1.14.0 +tensorflow 1.14.0 +tensorflow-estimator 1.14.0 +termcolor 1.1.0 +threadpool 1.3.2 +tqdm 4.31.1 +twint 2.1.7 +Twisted 19.2.1 +twitter-scraper 0.3.0 +twitterscraper 1.4.0 +urllib3 1.25.9 +w3lib 1.20.0 +wcwidth 0.1.7 +websockets 8.1 +Werkzeug 0.15.6 +wheel 0.34.2 +wrapcache 1.0.8 +wrapt 1.11.2 +XlsxWriter 1.2.8 +yarl 1.4.2 +zipp 3.4.0 +zope.interface 4.6.0 diff --git a/.backup/pip_packages b/.backup/pip_packages index d75c038..82cc291 100644 --- a/.backup/pip_packages +++ b/.backup/pip_packages @@ -1,20 +1,140 @@ -Package Version ------------------ -------- -certifi 2019.3.9 -chardet 3.0.4 -configparser 3.7.4 -cssselect 1.1.0 -futures 2.2.0 -idna 2.8 -instagram-scraper 1.6.0 -lxml 4.5.2 -pip 19.1.1 -pyquery 1.4.1 -PySocks 1.6.8 -requests 2.21.0 -setuptools 41.0.1 -six 1.12.0 -tqdm 4.31.1 -urllib3 1.24.1 -wheel 0.33.6 -xmltodict 0.12.0 +Package Version +-------------------- ---------- +-elenium 3.11.0 +-ix 1.12.0 +absl-py 0.8.0 +aiodns 2.0.0 +aiohttp 3.6.2 +aiohttp-socks 0.2.2 +appdirs 1.4.3 +asciimatics 1.11.0 +asn1crypto 0.24.0 +astor 0.8.0 +async-timeout 3.0.1 +attrs 19.1.0 +Automat 0.7.0 +autopep8 1.4.4 +beautifulsoup4 4.6.3 +billiard 3.6.1.0 +bs4 0.0.1 +cchardet 2.1.5 +certifi 2020.4.5.1 +cffi 1.12.3 +chardet 3.0.4 +coala-utils 0.5.1 +constantly 15.1.0 +cos-python-sdk-v5 1.7.3 +coscmd 1.8.6.4 +cryptography 2.7 +cssselect 1.0.3 +cycler 0.10.0 +DateTime 4.3 +decorator 4.4.2 +dicttoxml 1.7.4 +docopt 0.6.2 +elasticsearch 7.1.0 +et-xmlfile 1.0.1 +fake-useragent 0.1.11 +future 0.18.2 +gast 0.3.1 +geographiclib 1.50 +geopy 1.20.0 +gevent 1.4.0 +google-pasta 0.1.7 +greenlet 0.4.15 +grpcio 1.23.0 +h5py 2.10.0 +hyperlink 19.0.0 +idna 2.9 +imageio 2.6.1 +imageio-ffmpeg 0.4.2 +importlib-metadata 2.0.0 +incremental 17.5.0 +instagram-scraper 1.7.1 +iso8601 0.1.12 +jdcal 1.4.1 +Jinja2 2.11.2 +joblib 0.13.2 +Keras 2.2.5 +Keras-Applications 1.0.8 +Keras-Preprocessing 1.1.0 +kiwisolver 1.1.0 +lxml 4.5.1 +m3u8 0.5.3 +Markdown 3.1.1 +MarkupSafe 1.1.1 +matplotlib 3.1.1 +moviepy 1.0.3 +multidict 4.6.1 +ntplib 0.3.3 +numpy 1.19.1 +opencv-python 4.1.0.25 +openpyxl 2.4.11 +pandas 0.25.3 +parse 1.12.1 +parsel 1.5.1 +piexif 1.1.2 +Pillow 5.2.0 +pip 20.0.2 +prettytable 0.7.2 +proglog 0.1.9 +protobuf 3.9.1 +pyasn1 0.4.5 +pyasn1-modules 0.2.5 +pycares 3.0.0 +pycodestyle 2.5.0 +pycparser 2.19 +PyDispatcher 2.0.5 +pyecharts 1.7.1 +pyecharts-snapshot 0.2.0 +pyee 6.0.0 +pyfiglet 0.8.post1 +PyHamcrest 1.9.0 +pymongo 3.5.1 +PyMySQL 0.9.3 +pyOpenSSL 19.0.0 +pyparsing 2.4.2 +pyppeteer 0.0.25 +pyquery 1.4.0 +PySocks 1.7.1 +python-dateutil 2.8.0 +pytz 2019.2 +PyYAML 5.1.1 +queuelib 1.5.0 +records 0.5.3 +requests 2.23.0 +requests-html 0.10.0 +schedule 0.6.0 +scikit-learn 0.21.3 +scipy 1.3.1 +Scrapy 1.5.1 +selenium 3.14.0 +service-identity 18.1.0 +setuptools 46.0.0 +simplejson 3.17.0 +six 1.10.0 +sklearn 0.0 +SQLAlchemy 1.3.17 +tablib 2.0.0 +tensorboard 1.14.0 +tensorflow 1.14.0 +tensorflow-estimator 1.14.0 +termcolor 1.1.0 +threadpool 1.3.2 +tqdm 4.31.1 +twint 2.1.7 +Twisted 19.2.1 +twitter-scraper 0.3.0 +twitterscraper 1.4.0 +urllib3 1.25.9 +w3lib 1.20.0 +wcwidth 0.1.7 +websockets 8.1 +Werkzeug 0.15.6 +wheel 0.34.2 +wrapcache 1.0.8 +wrapt 1.11.2 +XlsxWriter 1.2.8 +yarl 1.4.2 +zipp 3.4.0 +zope.interface 4.6.0 diff --git a/.zsh_history b/.zsh_history index ce71a91..5ee714d 100644 --- a/.zsh_history +++ b/.zsh_history @@ -10843,3 +10843,149 @@ done : 1609119592:0;gb -a : 1609119620:0;gco dev : 1609119621:0;gl +: 1609121287:0;eproxy php artisan ins:like +: 1609121817:0;gst +: 1609121820:0;gco . +: 1609121821:0;gst +: 1609121822:0;gl +: 1609121830:0;gco feature/yet_another_early_learning +: 1609121833:0;gst +: 1609121834:0;gl +: 1609122350:0;dev +: 1609122353:0;cd test +: 1609122355:0;gcl https://github.com/huanghyw/jd_seckill.git +: 1609122407:0;mi +: 1609122510:0;gst +: 1609122512:0;git stash +: 1609122515:0;gst +: 1609122517:0;gco dev +: 1609122519:0;gl +: 1609122527:0;git stash pop +: 1609122570:0;mi +: 1609122644:0;cd jd_seckill +: 1609122645:0;ll +: 1609122654:0;pip -h +: 1609122674:0;pip -v +: 1609122681:0;pip -V +: 1609122687:0;pip3 -V +: 1609122700:0;pip3 install -r requirements.txt +: 1609123804:0;gst +: 1609123841:0;git add . +: 1609123862:0;git commit -m "add new early learning qr code" +: 1609123865:0;gl +: 1609123868:0;gp +: 1609123882:0;gst +: 1609123885:0;gco feature/coupon_optimization +: 1609123886:0;gl +: 1609124273:0;gst +: 1609124276:0;git add . +: 1609124292:0;git commit -m "fix creatorName from userName to staffName" +: 1609124293:0;gp +: 1609124298:0;gco dev +: 1609124299:0;gl +: 1609124302:0;git merge feature/coupon_optimization +: 1609124309:0;gp +: 1609124313:0;gco test +: 1609124314:0;gl +: 1609124318:0;git merge feature/coupon_optimization +: 1609124322:0;gp +: 1609124876:0;pip3 install --upgrade pip +: 1609124983:0;gco - +: 1609124984:0;gl +: 1609124988:0;gco feature/coupon_optimization +: 1609124989:0;gl +: 1609125013:0;gst +: 1609125021:0;git add . +: 1609125042:0;git commit -m "fix remove creatorRemark limit" +: 1609125043:0;gp +: 1609125065:0;gst +: 1609125069:0;gco test +: 1609125070:0;gl +: 1609125082:0;git merge feature/coupon_optimization +: 1609125086:0;gp +: 1609125234:0;which pip3.8 +: 1609125250:0;cd /usr/local/Cellar/python@3.9 +: 1609125250:0;ll +: 1609125253:0;cd 3.9.1_2 +: 1609125254:0;ll +: 1609125256:0;cd bin +: 1609125257:0;ll +: 1609125265:0;which pip3 +: 1609125278:0;/usr/local/opt/python@3.7/bin/pip3 -h +: 1609125286:0;which pip3 +: 1609125297:0;rm -rf /usr/local/opt/python@3.7/bin/pip3 +: 1609125314:0;cd /usr/local/Cellar/python@3.7/3.7.9_2/bin +: 1609125315:0;ll +: 1609125339:0;which python3 +: 1609125368:0;python3 -v +: 1609125387:0;python3 -V +: 1609125395:0;python3 -m pip install --upgrade pip +: 1609125438:0;dev +: 1609125446:0;cd test/jd_seckill +: 1609125448:0;gst +: 1609125534:0;cd /usr/local/Cellar/python@3.7/3.7.9_2/bin +: 1609125535:0;ll +: 1609125543:0;pip -V +: 1609125561:0;brew link python +: 1609125586:0;brew link --overwrite python@3.7 +: 1609125592:0;pip -V +: 1609125617:0;which python +: 1609125633:0;/usr/local/bin/python3 -V +: 1609125646:0;which python +: 1609125654:0;/usr/local/bin/python3 -V +: 1609125659:0;/usr/local/bin/python -V +: 1609125673:0;rm '/usr/local/bin/pip3' +: 1609125678:0;brew link --overwrite python@3.7 +: 1609125688:0;brew unlink python@3.7 && brew link --force python@3.7 +: 1609125703:0;python3 -V +: 1609125708:0;pip3 -V +: 1609125716:0;python3 -m pip install --upgrade pip +: 1609125742:0;pwd +: 1609125744:0;ll +: 1609125752:0;./pip3.7 -V +: 1609125759:0;ll +: 1609125776:0;pip3 +: 1609125781:0;pip3.7 +: 1609125799:0;python3 -m pip install --upgrade pip3 +: 1609125803:0;python3 -m pip install --upgrade pip +: 1609125817:0;cd /usr/local/lib/python3.7 +: 1609125818:0;ll +: 1609125820:0;cd site-packages +: 1609125821:0;ll +: 1609125845:0;cd ~ +: 1609125847:0;pip3 +: 1609125919:0;/usr/local/Cellar/python@3.7/3.7.9_2/bin/pip3.7 -V +: 1609125930:0;which python3 +: 1609125938:0;l /usr/local/opt/python@3.7/bin/python3 +: 1609125952:0;python3 -m pip install --upgrade pip +: 1609125976:0;cd /usr/local/opt/python@3.7/bin +: 1609125976:0;ll +: 1609125983:0;./pip3.7 -V +: 1609125996:0;rm ./pip3.7 +: 1609125999:0;python3 -m pip install --upgrade pip +: 1609126026:0;python3.7 -m pip install --upgrade pip +: 1609126034:0;pip3 +: 1609126038:0;pip3.9 +: 1609126045:0;brew unlink python@3.7 && brew link --force python@3.7 +: 1609126060:0;echo 'export PATH="/usr/local/opt/python@3.7/bin:$PATH"' >> ~/.zshrc +: 1609126063:0;source ~/.zshrc +: 1609126073:0;pip3 +: 1609126085:0;brew reinstall python@3.7 +: 1609126161:0;cd /usr/local/Cellar/python@3.7/3.7.9_2/bin +: 1609126162:0;ll +: 1609126165:0;pip3 -V +: 1609126172:0;dev +: 1609126178:0;cd test/jd_seckill +: 1609126198:0;pip3 install -r requirements.txt\ + +: 1609126513:0;code . +: 1609131480:0;eproxy php artisan ins:like +: 1609133821:0;php -v +: 1609142350:0;eproxy php artisan ins:like +: 1609143396:0;php artisan xiu:get -v +: 1609143488:0;php artisan nvshen:get -v +: 1609143497:0;eproxy php artisan xiu:get -v +: 1609143509:0;php artisan tujigu:s +: 1609147261:0;eproxy php artisan xiu:get -v +: 1609153845:0;ins +: 1609153878:0;php artisan bili:nvtuan default 1000 --env=local diff --git a/.zshrc b/.zshrc index a195943..72c7c93 100644 --- a/.zshrc +++ b/.zshrc @@ -166,3 +166,4 @@ autoload -U +X bashcompinit && bashcompinit complete -o nospace -C /usr/local/bin/bitcomplete bit export PATH="/usr/local/opt/php@7.1/bin:$PATH" export PATH="/usr/local/opt/php@7.1/sbin:$PATH" +export PATH="/usr/local/opt/python@3.7/bin:$PATH"