Commit Graph

222 Commits

Author SHA1 Message Date
dukunjueji 05cc9ae175
Merge branch 'FongMi:main' into master 2023-02-16 16:31:46 +08:00
FongMi f205714d8a Update Ali.java 2023-02-16 15:25:52 +08:00
FongMi 51aba34e35 Waiting 2023-02-16 15:11:04 +08:00
FongMi 16c9773be3 Fix 2023-02-16 00:08:40 +08:00
FongMi 3d8da2380b Fix xpath mac bug 2023-02-16 00:01:30 +08:00
FongMi 1ced67cebd Clean xpath code 2023-02-15 23:49:00 +08:00
FongMi 83b0e5991b Fix XPathMac UA 2023-02-15 18:16:22 +08:00
dukun b874e557b5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
2023-02-13 15:03:32 +08:00
FongMi 5e43442241 Clean code 2023-02-11 18:47:27 +08:00
dukun 80f80c755e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
2023-02-10 11:49:03 +08:00
FongMi fa93eba898 Update Push 2023-02-09 21:39:15 +08:00
dukun 06c882a95a Merge remote-tracking branch 'origin/main' 2023-02-09 10:21:06 +08:00
FongMi 4b4c0afdb5 Update gradle 2023-02-08 16:39:54 +08:00
dukun b85fead64d as 2023-02-08 13:31:52 +08:00
dukun 5a3a860b17 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/com/github/catvod/utils/Utils.java
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
2023-02-08 13:21:01 +08:00
FongMi fb6dd818ed Update Ali 2023-02-08 10:17:00 +08:00
FongMi 7577787b57 Update ali qrcode token 2023-02-08 01:33:02 +08:00
FongMi cc4287f7d6 Update jar 2023-02-07 20:51:52 +08:00
dukun 57764dbf21 as 2023-02-07 13:31:24 +08:00
FongMi aa93f9902c Clean code 2023-02-07 11:23:53 +08:00
FongMi cbb77d0ba7 Fix ali token 2023-02-07 09:17:14 +08:00
dukun dca75a316b as 2023-02-06 15:57:22 +08:00
dukun f4a0dea73a as 2023-02-06 10:04:46 +08:00
dukun ed6c5fdeb0 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
2023-02-05 13:51:49 +08:00
dukun 99d2994d95 as 2023-02-05 13:20:36 +08:00
dukun e8f9f4e6e2 as 2023-02-05 11:17:56 +08:00
dukun bd677dec53 as 2023-02-05 11:02:22 +08:00
FongMi 9a94beaac5 Fix Ying 2023-02-03 19:41:36 +08:00
dukun 15f0a6d610 as 2023-02-02 18:58:05 +08:00
dukun cfeb82a6a9 as 2023-02-02 18:57:02 +08:00
dukun cd177e4537 as 2023-02-02 18:54:53 +08:00
dukun 58d0f44126 as 2023-02-02 18:50:03 +08:00
dukun e5487f2a02 as 2023-02-02 18:15:43 +08:00
dukun a02949700f as 2023-02-02 13:47:19 +08:00
dukun 1f4ff3dbe9 as 2023-02-02 13:29:38 +08:00
dukun fd4cb23156 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
2023-02-02 13:24:09 +08:00
FongMi 5b397d9381 Fix ali qrcode site 2023-02-01 13:57:25 +08:00
xxx 3ca585e86e as 2023-01-31 18:43:56 +08:00
xxx cc2abbcbbb as 2023-01-31 17:26:24 +08:00
FongMi 288b1f2665 Fix get bug 2023-01-31 16:41:17 +08:00
xxx f343603451 as 2023-01-31 16:28:33 +08:00
xxx 20248d874a as 2023-01-31 16:21:04 +08:00
xxx 0b9686c158 as 2023-01-31 16:07:43 +08:00
xxx b36113c116 as 2023-01-31 15:43:10 +08:00
dukun c2afc1b40b Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/com/github/catvod/spider/Ali.java
#	jar/custom_spider.jar
#	jar/custom_spider.jar.md5
2023-01-31 14:44:21 +08:00
dukun f8fc494b25 as 2023-01-31 14:37:38 +08:00
FongMi 0066eab0ca Update Zhaozy 2023-01-30 17:46:59 +08:00
dukun 156a734f49 as 2023-01-30 16:22:31 +08:00
FongMi 0b6fff5ac1 Update jar 2023-01-29 01:12:55 +08:00
haitao 285ae9753e 同步 2023-01-28 16:41:24 +08:00