Commit Graph
100 Commits
Author SHA1 Message Date
lxk0301 5285dc33bb !105 npm设置淘宝源
Merge pull request !105 from xiaoFsu/N/A
2021-02-06 10:16:46 +08:00
lxk0301 40445b9486 迁移过期活动,神仙书院脚本 2021-02-06 09:22:35 +08:00
lxk0301 09b1ed37e7 !102 云函数移除过期的secret
Merge pull request !102 from DoveBoy/N/A
2021-02-06 09:14:24 +08:00
lxk0301 91f6e27220 !101 移除失效活动的secret
Merge pull request !101 from DoveBoy/N/A
2021-02-06 09:13:19 +08:00
lxk0301 47f5a52583 !98 云函数移除过期活动
Merge pull request !98 from DoveBoy/N/A
2021-02-06 09:11:12 +08:00
lxk0301 864d508fb6 !111 更新查看链接
Merge pull request !111 from EchoChan/N/A
2021-02-06 09:10:02 +08:00
lxk0301 e9df9533cd crontab_list.sh 2021-02-06 00:52:01 +08:00
lxk0301 2c297f77c8 !110 [京喜农场] 兼容 hundun 库新的 token 获取脚本 && 新增 成熟未收取&未种植(成熟已收取)状态判断
Merge pull request !110 from 古月玄/master
2021-02-05 21:33:24 +08:00
lxk0301 c727724bab jd_jdzz.js 2021-02-05 20:42:52 +08:00
lxk0301 455d3b7895 debug 2021-02-05 18:54:05 +08:00
lxk0301 2a1855e8db debug 2021-02-05 18:29:44 +08:00
lxk0301 57d4f3e003 debug 2021-02-05 18:05:24 +08:00
lxk0301 d9b3081631 debug 2021-02-05 18:01:18 +08:00
lxk0301 0c574e865b !108 解决docker1 设定下次运行docker_entrypoint.sh时间出错,导致docker无限重启的问题
Merge pull request !108 from hausthy/N/A
2021-02-05 17:11:49 +08:00
lxk0301 f78d2e8a09 debug 2021-02-05 16:10:29 +08:00
lxk0301 1763ffd620 debug 2021-02-05 16:07:33 +08:00
lxk0301 267931f03f debug 2021-02-05 16:02:50 +08:00
lxk0301 388a3d1163 迁移过期活动脚本 jd_nian.js 2021-02-05 15:26:53 +08:00
lxk0301 9582fb8859 !106 增加jsonParse函数
Merge pull request !106 from EchoChan/N/A
2021-02-05 12:47:12 +08:00
lxk0301 04cb853199 压缩 2021-02-05 12:28:21 +08:00
lxk0301 1bb6f9d975 update 2021-02-05 12:02:23 +08:00
lxk0301 6a6424595d update 2021-02-05 10:47:44 +08:00
lxk0301 c2d7762ee9 Merge remote-tracking branch 'origin/master' 2021-02-05 09:28:54 +08:00
lxk0301 e510ec5543 update 2021-02-05 09:28:32 +08:00
lxk0301 97e802f04d 增加pr过来的删除京东优惠券脚本,京东神仙书院积分兑换改成大于0积分即可兑换京豆 2021-02-05 09:25:35 +08:00
lxk0301 7bbcd95e46 !103 fix bug
Merge pull request !103 from AboutCXJ/N/A
2021-02-05 09:17:33 +08:00
lxk0301 b2c61ec6aa !95 删除优惠券
Merge pull request !95 from JDHelloWorld/N/A
2021-02-05 09:13:11 +08:00
lxk0301 786479999b update 2021-02-04 22:19:08 +08:00
lxk0301 3368f4f78a !96 修改为每天执行3次pull
Merge pull request !96 from AboutCXJ/master
2021-02-04 21:06:24 +08:00
lxk0301 f038495b34 Merge ; commit 'a466f3497ab0900f2d3ee04d39b43da095dbd0d6'
Conflicts:
	README.md
2021-02-04 20:11:27 +08:00
lxk0301 fde4de358c README.md 2021-02-04 20:02:29 +08:00
lxk0301 5b0aa47a66 修复 2021-02-04 16:43:20 +08:00
lxk0301 df730985f3 修复 2021-02-04 16:43:20 +08:00
lxk0301 fd83fee0e4 Merge remote-tracking branch 'origin/master' 2021-02-04 15:40:13 +08:00
lxk0301 f8e0eb6f3d Merge remote-tracking branch 'origin/master' 2021-02-04 15:40:13 +08:00
lxk0301 0af69386d8 修改文字明说 2021-02-04 15:39:19 +08:00
lxk0301 bd9506f993 修改文字明说 2021-02-04 15:39:19 +08:00
lxk0301 843760ef4a !87 云函数移除过期的secret
Merge pull request !87 from DoveBoy/N/A
2021-02-04 14:25:35 +08:00
lxk0301 8ddd0508a9 !87 云函数移除过期的secret
Merge pull request !87 from DoveBoy/N/A
2021-02-04 14:25:35 +08:00
lxk0301 df051090c3 update 2021-02-04 12:43:48 +08:00
lxk0301 e9d30f6d73 update 2021-02-04 12:43:48 +08:00
lxk0301 8a160e12f1 添加docker2不再维护的说明,迁移过期脚本(狂欢城 jd_818.js),iOS订阅也进行更新 2021-02-04 12:25:50 +08:00
lxk0301 188381a0e4 添加docker2不再维护的说明,迁移过期脚本(狂欢城 jd_818.js),iOS订阅也进行更新 2021-02-04 12:25:50 +08:00
lxk0301 2ebf488840 迁移失效的脚本 2021-02-04 11:07:23 +08:00
lxk0301 cec05d0d20 迁移失效的脚本 2021-02-04 11:07:23 +08:00
lxk0301 519166c3c0 update 2021-02-04 10:26:49 +08:00
lxk0301 14bfc41030 update 2021-02-04 10:26:49 +08:00
lxk0301 c09188debf update 2021-02-04 10:25:25 +08:00
lxk0301 cdecc5a025 update 2021-02-04 10:25:25 +08:00
lxk0301 4e6d6711aa 调整部分脚本通知频率, 运行无京豆不进行通知 2021-02-04 10:04:08 +08:00
lxk0301 a10b2ddc0e 调整部分脚本通知频率, 运行无京豆不进行通知 2021-02-04 10:04:08 +08:00
lxk0301 522fa83098 update 2021-02-04 09:46:50 +08:00
lxk0301 63c39b169a update 2021-02-04 09:46:50 +08:00
lxk0301 f0c6bc2fc3 Merge remote-tracking branch 'origin/master' 2021-02-04 09:32:00 +08:00
lxk0301 dbaf27274b Merge remote-tracking branch 'origin/master' 2021-02-04 09:32:00 +08:00
lxk0301 a046e5df2e 去掉pk互助 2021-02-04 09:31:50 +08:00
lxk0301 e0b9c36381 去掉pk互助 2021-02-04 09:31:50 +08:00
lxk0301 8f8f6fc8d7 !86 云函数移除过期活动
Merge pull request !86 from DoveBoy/N/A
2021-02-04 09:27:24 +08:00
lxk0301 8fbb297718 !86 云函数移除过期活动
Merge pull request !86 from DoveBoy/N/A
2021-02-04 09:27:24 +08:00
lxk0301 45a4c3c3c2 docker去掉过期活动脚本cron 2021-02-04 09:25:50 +08:00
lxk0301 768746be7d docker去掉过期活动脚本cron 2021-02-04 09:25:50 +08:00
lxk0301 62ccc0d3e3 迁移过期活动脚本,更新IOS订阅链接 2021-02-04 09:24:47 +08:00
lxk0301 a86b40e995 迁移过期活动脚本,更新IOS订阅链接 2021-02-04 09:24:47 +08:00
lxk0301 ce974dc6d8 update 2021-02-04 09:15:29 +08:00
lxk0301 1304e30f71 update 2021-02-04 09:15:29 +08:00
lxk0301 418ec492cf !85 迁移过期活动
Merge pull request !85 from DoveBoy/N/A
2021-02-04 09:06:40 +08:00
lxk0301 5c0ebfbc85 !85 迁移过期活动
Merge pull request !85 from DoveBoy/N/A
2021-02-04 09:06:40 +08:00
lxk0301 57f17f7acd !84 迁移过期活动
Merge pull request !84 from DoveBoy/N/A
2021-02-04 09:05:43 +08:00
lxk0301 474ecbaea0 !84 迁移过期活动
Merge pull request !84 from DoveBoy/N/A
2021-02-04 09:05:43 +08:00
lxk0301 90a8aba787 !83 云函数移除过期活动
Merge pull request !83 from DoveBoy/N/A
2021-02-04 09:05:22 +08:00
lxk0301 c5c1e98ca7 !83 云函数移除过期活动
Merge pull request !83 from DoveBoy/N/A
2021-02-04 09:05:22 +08:00
lxk0301 a3a9ae3e83 update 2021-02-04 08:24:44 +08:00
lxk0301 bff97ea3e1 update 2021-02-04 08:24:44 +08:00
lxk0301 61a853d455 !79 【轻量级 PR】:添加一个简单获取UA的方法
Merge pull request !79 from shizihang/N/A
2021-02-03 19:30:06 +08:00
lxk0301 492ae3f63f !79 【轻量级 PR】:添加一个简单获取UA的方法
Merge pull request !79 from shizihang/N/A
2021-02-03 19:30:06 +08:00
lxk0301 22414f57cf 调整年兽活动2.4日可兑换红包时的通知频率 2021-02-03 17:49:13 +08:00
lxk0301 f9847a709d 调整年兽活动2.4日可兑换红包时的通知频率 2021-02-03 17:49:13 +08:00
lxk0301 54154de88a 调整年兽活动2.4日可兑换红包时的通知频率 2021-02-03 17:45:53 +08:00
lxk0301 54ec411a39 调整年兽活动2.4日可兑换红包时的通知频率 2021-02-03 17:45:53 +08:00
lxk0301 200c473dd2 Merge remote-tracking branch 'origin/master' 2021-02-03 17:18:50 +08:00
lxk0301 bf0b341b8e Merge remote-tracking branch 'origin/master' 2021-02-03 17:18:50 +08:00
lxk0301 c140210591 !80 修改docker-compose 部署,京喜农场互助码参数的填写说明
Merge pull request !80 from yifenma/master
2021-02-03 16:57:00 +08:00
lxk0301 9a383ff64d !80 修改docker-compose 部署,京喜农场互助码参数的填写说明
Merge pull request !80 from yifenma/master
2021-02-03 16:57:00 +08:00
lxk0301 d95fc496b2 Merge remote-tracking branch 'origin/master' 2021-02-03 15:40:00 +08:00
lxk0301 62cb68355c Merge remote-tracking branch 'origin/master' 2021-02-03 15:40:00 +08:00
lxk0301 918440135a 增加可兑换红包时的通知 2021-02-03 15:39:51 +08:00
lxk0301 4b5232b60e 增加可兑换红包时的通知 2021-02-03 15:39:51 +08:00
lxk0301 51c6907f06 去掉过期脚本,源头好物红包 jd_coupon.js 2021-02-03 14:27:24 +08:00
lxk0301 d1f3f26297 去掉过期脚本,源头好物红包 jd_coupon.js 2021-02-03 14:27:24 +08:00
lxk0301 1f6ead59e4 update 2021-02-03 12:28:48 +08:00
lxk0301 dad7182de1 update 2021-02-03 12:28:48 +08:00
lxk0301 17c116f81b cookie失效后, iOS端不进行清空 2021-02-03 11:03:12 +08:00
lxk0301 caacf67278 cookie失效后, iOS端不进行清空 2021-02-03 11:03:12 +08:00
lxk0301 e2d7d6f9d1 Merge remote-tracking branch 'origin/master' 2021-02-03 09:50:08 +08:00
lxk0301 b80720512e Merge remote-tracking branch 'origin/master' 2021-02-03 09:50:08 +08:00
lxk0301 549e0aebae 修复重复昵称显示 2021-02-03 09:49:39 +08:00
lxk0301 5a055e716d 修复重复昵称显示 2021-02-03 09:49:39 +08:00
lxk0301 75019a9dc4 update 2021-02-03 08:38:54 +08:00
lxk0301 8b4d772264 update 2021-02-03 08:38:54 +08:00
lxk0301 98f8906a75 因宠汪汪聚宝盆活动已下线停止运营,故去掉宠汪汪聚宝盆辅助脚本. 2021-02-02 17:31:10 +08:00