Merge feature/merge-upstream: Modal 小屏 + 视频播放 + Docker Alpine（冲突以 feature 为准）

Browse Source

# Conflicts:
#	Dockerfile
#	Dockerfile-arm
#	dto/VideoPageRequestDTO.cs
#	model/AppConfig.cs
#	repository/DyCollectVideoRepository.cs
#	service/CommonService.cs
#	service/DyCollectVideoService.cs
#	service/DyHttpClientService.cs

...

This commit is contained in:

yuming

2026-07-03 20:03:46 +08:00

parent 8e8d256e9a e6c5587637

commit cf40a7e89a

203 changed files with 28876 additions and 10250 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/appconf.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 81 KiB

docs/auth.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 66 KiB After Width:  |  Height:  |  Size: 213 KiB

docs/auth2.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 109 KiB After Width:  |  Height:  |  Size: 91 KiB

docs/config1.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 105 KiB After Width:  |  Height:  |  Size: 169 KiB

docs/datalist.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 202 KiB After Width:  |  Height:  |  Size: 200 KiB

docs/findcookie_1_2_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 412 KiB

docs/findcookie_4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 240 KiB

docs/findcookie_5.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 170 KiB

docs/findcookie_6_7.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 282 KiB

docs/findcookie_8.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 170 KiB

docs/finduser_id.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 895 KiB

docs/follows.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 185 KiB

docs/followset.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 281 KiB

docs/getcookies.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 166 KiB After Width:  |  Height:  |  Size: 877 KiB

docs/getmysecuid.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 340 KiB

docs/getuperuid.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 708 KiB

docs/homepage.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 177 KiB After Width:  |  Height:  |  Size: 164 KiB

docs/homepage_night.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 178 KiB After Width:  |  Height:  |  Size: 162 KiB

docs/logs.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 119 KiB After Width:  |  Height:  |  Size: 395 KiB

docs/mobile-home.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 49 KiB

docs/mobile-log.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 52 KiB

docs/mobile-logdetail.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 186 KiB

docs/player.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 448 KiB

docs/set.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 74 KiB After Width:  |  Height:  |  Size: 167 KiB

docs/wx.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 106 KiB

docs/zfb.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 127 KiB