Commit Graph

411 Commits

Author SHA1 Message Date
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 3169d3aca4 Update alist.json 2023-02-13 00:41:39 +08:00
FongMi 1394700357 switchable > changeable 2023-02-12 12:33:50 +08:00
FongMi de575f9995 Update alist.json 2023-02-12 10:40:00 +08:00
FongMi 7b20bcba0b Downgrade gson 2023-02-12 00:16:56 +08:00
FongMi 5e43442241 Clean code 2023-02-11 18:47:27 +08:00
FongMi b441eae27e Update live.json 2023-02-11 00:48:00 +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 a6aacebeca Create ali.json 2023-02-08 11:58:02 +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
FongMi 2a7b58c7f7 Update token 2023-02-07 20:41:55 +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 8c3c0b6306 as 2023-02-05 13:33:05 +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 8809a6edf6 Update live 2023-02-04 17:29:47 +08:00
FongMi 71a560c446 Update live.json 2023-02-04 17:19:43 +08:00
FongMi 9a94beaac5 Fix Ying 2023-02-03 19:41:36 +08:00
dukun 6f555c0252 as 2023-02-02 18:59:15 +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 1dc135b7f2 as 2023-02-02 18:17:30 +08:00
dukun e5487f2a02 as 2023-02-02 18:15:43 +08:00
dukun beb52f9ce1 as 2023-02-02 17:56:32 +08:00
dukun f13cdc78db as 2023-02-02 17:55:54 +08:00
dukun c081704358 as 2023-02-02 17:36:51 +08:00
dukun 0ada2a45a2 as 2023-02-02 15:43:13 +08:00
dukun a02949700f as 2023-02-02 13:47:19 +08:00
dukun 7ebadc7b9a as 2023-02-02 13:35:15 +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
dukun ef8ad1b901 as 2023-02-02 13:13:26 +08:00
dukun 8b3e96bc1e as 2023-02-02 11:55:21 +08:00
dukun c284ffb3ef as 2023-02-02 11:51:42 +08:00
dukun c9d6071cd9 as 2023-02-02 11:44:56 +08:00