diff --git a/.backup/crontab-20210316-070100.gz b/.backup/crontab-20210316-070100.gz new file mode 100644 index 0000000..771523d Binary files /dev/null and b/.backup/crontab-20210316-070100.gz differ diff --git a/.backup/npm_packages b/.backup/npm_packages index 00b4504..6926e1e 100644 --- a/.backup/npm_packages +++ b/.backup/npm_packages @@ -1,14 +1,20 @@ /Users/shixuesen/.nvm/versions/node/v10.20.1/lib -+-- @tarojs/cli@3.0.10 ++-- @tarojs/cli@3.1.3 | +-- @hapi/joi@17.1.1 -| +-- @tarojs/helper@3.0.10 -| +-- @tarojs/service@3.0.10 -| +-- @tarojs/shared@3.0.10 -| +-- @tarojs/taro@3.0.10 -| +-- @tarojs/taroize@3.0.10 +| +-- @tarojs/helper@3.1.3 +| +-- @tarojs/plugin-platform-alipay@3.1.3 +| +-- @tarojs/plugin-platform-jd@3.1.3 +| +-- @tarojs/plugin-platform-qq@3.1.3 +| +-- @tarojs/plugin-platform-swan@3.1.3 +| +-- @tarojs/plugin-platform-tt@3.1.3 +| +-- @tarojs/plugin-platform-weapp@3.1.3 +| +-- @tarojs/service@3.1.3 +| +-- @tarojs/shared@3.1.3 +| +-- @tarojs/taro@3.1.3 +| +-- @tarojs/taroize@3.1.3 | +-- @tarojs/transformer-wx@2.2.10 | +-- @types/request@2.48.5 -| +-- @typescript-eslint/parser@2.34.0 +| +-- @typescript-eslint/parser@4.17.0 | +-- adm-zip@0.4.16 | +-- babel-core@6.26.3 | +-- babel-eslint@8.2.6 @@ -16,28 +22,26 @@ | +-- babel-plugin-danger-remove-unused-import@1.1.2 | +-- babel-plugin-preval@1.6.4 | +-- babel-plugin-remove-dead-code@1.3.2 -| +-- babel-plugin-transform-decorators-legacy@1.3.5 | +-- babel-plugin-transform-define@1.3.2 -| +-- babel-plugin-transform-react-jsx@6.24.1 | +-- babel-plugin-transform-taroapi@1.3.15 | +-- babel-template@6.26.0 | +-- babel-traverse@6.26.0 | +-- babel-types@6.26.0 | +-- babylon@6.18.0 | +-- better-babel-generator@6.26.1 -| +-- cli-highlight@2.1.4 +| +-- cli-highlight@2.1.10 | +-- cross-spawn@7.0.3 | +-- css-to-react-native-transform@1.9.0 -| +-- css-what@3.3.0 +| +-- css-what@3.4.2 | +-- download-git-repo@2.0.0 | +-- ejs@2.7.4 | +-- envinfo@6.0.1 | +-- eslint@6.8.0 -| +-- eslint-config-taro@3.0.10 -| +-- eslint-plugin-import@2.22.0 -| +-- eslint-plugin-react@7.20.6 +| +-- eslint-config-taro@3.1.3 +| +-- eslint-plugin-import@2.22.1 +| +-- eslint-plugin-react@7.22.0 | +-- eslint-plugin-react-hooks@1.7.0 -| +-- eslint-plugin-taro@3.0.10 +| +-- eslint-plugin-taro@3.1.3 | +-- eslint-plugin-vue@6.2.2 | +-- fbjs@1.0.0 | +-- find-yarn-workspace-root@1.2.1 @@ -60,14 +64,14 @@ | +-- postcss-modules-resolve-imports@1.3.0 | +-- postcss-modules-scope@1.1.0 | +-- postcss-modules-values@1.3.0 -| +-- postcss-pxtransform@3.0.10 +| +-- postcss-pxtransform@3.1.3 | +-- postcss-reporter@6.0.1 | +-- postcss-taro-unit-transform@1.2.15 | +-- postcss-url@7.3.2 | +-- prettier@1.19.1 | +-- prop-types@15.7.2 | +-- request@2.88.2 -| +-- resolve@1.17.0 +| +-- resolve@1.20.0 | +-- sax@1.2.4 | +-- semver@5.7.1 | +-- shelljs@0.8.4 @@ -75,7 +79,7 @@ | +-- tapable@1.1.3 | +-- taro-css-to-react-native@2.2.10 | +-- through2@2.0.5 -| +-- vinyl@2.2.0 +| +-- vinyl@2.2.1 | +-- vinyl-fs@3.0.3 | +-- xml2js@0.4.23 | `-- xxhashjs@0.2.2 diff --git a/.zsh_history b/.zsh_history index fe2336c..97af9c5 100644 --- a/.zsh_history +++ b/.zsh_history @@ -5302,7 +5302,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1588248600:0;cd \[Playboy\]\ 2014.04.01\ Lovelyn\ in\ Daytime\ Tease\ \[50P1MP4262MB\] : 1588248608:0;mediainfo daytime-tease-lovelyn-nude.mp4 : 1588258530:0;cd /Volumes/Seagate\ Backup\ Plus\ Drive/Video/tmp/to -: 1588401686:0;cd .npm : 1588401713:0;cd /usr/local/lib/node_modules : 1588401719:0;tldr : 1588401735:0;npm config list @@ -5602,7 +5601,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1590129047:0;git commit -m "modify: metaRequest" : 1590131180:0;node use v10.15 : 1590132937:0;nvm use v10.15 -: 1590133155:0;npm install -g @tarojs/cli : 1590134206:0;cd .nvm/versions/node/v10 : 1590134222:0;cd ~/.nvm/versions/node/v10.15.3 : 1590134251:0;cd etc @@ -7540,7 +7538,6 @@ done : 1606718010:0;docker pull docker/desktop-vpnkit-controller : 1606718101:0;docker image ls : 1606718195:0;kubectl cluster-info -: 1606718389:0;kubectl get pods : 1606719312:0;git commit -m "fix redeem todo" : 1606721067:0;git commit -m "fix error desc 惼郂 ==> 惼龃" : 1606734666:0;ps aux | grep 46358 @@ -7596,7 +7593,6 @@ done : 1606912686:0;cd /Users/shixuesen/Documents/tmp : 1606959627:0;./jenkins.sh know : 1606959701:0;cat jenkins.sh -: 1606961124:0;cls : 1606968790:0;mv mobe_19920223 mobeee19920223 : 1606971975:0;cd ../src : 1606972106:0;cd php-photoslibrary @@ -7651,39 +7647,8 @@ done : 1608473402:0;unalias php : 1608477525:0;hexo publish "仃丁仲礼胂羃僻僨裁聃点僵" : 1608691839:0;cd knowledge-platform -: 1608692641:0;gl -: 1608692654:0;gco feature/order_add_channel_code_mall_sxs201214 -: 1608692656:0;gst -: 1608692657:0;gl : 1608692660:0;git log -: 1608692670:0;gco dev -: 1608692671:0;gl -: 1608692675:0;git merge feature/order_add_channel_code_mall_sxs201214 -: 1608693036:0;mi -: 1608693309:0;gst -: 1608693317:0;git add . -: 1608693348:0;git commit -m "merge feature feature/order_add_channel_code_mall_sxs201214" -: 1608693350:0;gst -: 1608693352:0;gp -: 1608693367:0;cd trade-platform-api -: 1608693369:0;md -: 1608693399:0;cd ../trade-platform-common -: 1608693400:0;gst -: 1608693401:0;md -: 1608693526:0;nm6 -: 1608693725:0;gst -: 1608693849:0;mi : 1608693976:0;rm -rf ~/.m2/repository/com/zhicong/knowledge/knowledge-center-client -: 1608693979:0;mi -: 1608694066:0;gst -: 1608694070:0;git add . -: 1608694072:0;git commit -m "merge feature feature/order_add_channel_code_mall_sxs201214" -: 1608694074:0;gp -: 1608694080:0;gl -: 1608694090:0;gp -: 1608694102:0;cd ../knowledge-cube-web -: 1608694103:0;gst -: 1608694104:0;gl : 1608694107:0;gco dev : 1608694108:0;gl : 1608694114:0;git merge feature/order_add_channel_code_mall_sxs201214 @@ -10614,3 +10579,21 @@ done : 1615734767:0;cd .npm : 1615734771:0;ls : 1615771784:0;txy2 +: 1615774394:0;eproxy php artisan ins:like +: 1615774400:0;eproxy php artisan xiu:get -v +: 1615774406:0;php artisan nvshen:get -v +: 1615776309:0;exit +: 1615776317:0;ins +: 1615776747:0;ssh jump +: 1615778311:0;php artisan tujigu:s +: 1615784951:0;php artisan xiuren:s +: 1615785158:0;cd ~ +: 1615785160:0;npm info +: 1615785173:0;npm install -g @tarojs/cli +: 1615788185:0;npm info @tarojs/cli +: 1615789292:0;cls +: 1615793468:0;exit +: 1615798458:0;txy2 +: 1615798779:0;ssh ubuntu@115.159.36.184 +: 1615813972:0;ping 155.94.184.27 +: 1615815420:0;ssh ubuntu@115.159.36.184