关注列表增加2个搜索条件
This commit is contained in:
jianzhichu
@@ -17,6 +17,6 @@
|
||||
<SelfContained>false</SelfContained>
|
||||
<!--<DockerArch>x86</DockerArch>-->
|
||||
<!--<DockerArch>arm</DockerArch> -->
|
||||
<!--<DockerCoreVersion>2.1.5</DockerCoreVersion>-->
|
||||
<!--<DockerCoreVersion>2.1.6</DockerCoreVersion>-->
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -3,7 +3,7 @@
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<_PublishTargetUrl>E:\code\dysync\bin\Release\net6.0\publish\</_PublishTargetUrl>
|
||||
<History>True|2026-03-16T11:59:40.7431031Z||;True|2026-03-16T19:59:04.2091761+08:00||;True|2026-03-16T19:59:00.1277280+08:00||;True|2026-03-13T19:03:43.3888728+08:00||;True|2026-03-13T19:00:46.5678455+08:00||;True|2026-03-08T20:40:39.8018016+08:00||;True|2026-03-08T20:37:16.4384198+08:00||;True|2026-03-05T22:22:59.1986039+08:00||;True|2026-03-05T21:47:10.7337653+08:00||;True|2026-03-05T21:44:09.8036238+08:00||;False|2026-03-05T21:44:03.0581762+08:00||;True|2026-03-05T18:20:17.8376341+08:00||;True|2026-03-02T21:57:32.1274356+08:00||;True|2026-02-25T22:29:25.1875055+08:00||;True|2026-02-25T22:28:53.3053713+08:00||;True|2026-02-12T19:27:23.6648031+08:00||;True|2026-02-12T19:25:10.7424743+08:00||;True|2026-02-12T17:33:31.2163848+08:00||;True|2026-02-12T17:16:08.2015031+08:00||;False|2026-02-12T17:16:02.9041381+08:00||;True|2026-02-12T17:12:44.8082909+08:00||;True|2026-02-12T17:04:22.1666828+08:00||;True|2026-02-12T17:03:04.2760582+08:00||;True|2026-02-12T16:52:01.7403172+08:00||;True|2026-02-12T16:49:57.7070533+08:00||;False|2026-02-12T16:49:53.4063422+08:00||;True|2026-02-12T16:43:13.2040344+08:00||;False|2026-02-12T16:42:58.3321319+08:00||;True|2026-02-12T16:29:28.6386479+08:00||;True|2026-02-12T16:19:46.9195592+08:00||;True|2026-02-12T14:32:25.3192428+08:00||;True|2026-02-12T12:18:02.1864306+08:00||;True|2026-02-11T20:39:23.8084775+08:00||;True|2026-02-11T20:37:06.6507806+08:00||;True|2026-02-11T20:04:19.1839991+08:00||;True|2026-02-10T21:59:37.6685615+08:00||;True|2026-02-10T15:43:23.5038986+08:00||;True|2026-02-10T14:42:48.6214001+08:00||;True|2026-02-06T23:15:19.0037070+08:00||;True|2026-02-06T22:52:30.1006808+08:00||;True|2026-02-06T22:49:02.0056235+08:00||;True|2026-02-06T22:45:30.6355735+08:00||;False|2026-02-06T22:45:25.7210123+08:00||;True|2026-02-06T22:38:37.6994272+08:00||;True|2026-02-06T22:14:47.8146805+08:00||;True|2026-02-03T22:34:12.3588819+08:00||;True|2026-02-03T22:20:08.9945012+08:00||;True|2026-02-03T21:06:17.7655312+08:00||;True|2026-02-02T23:24:09.9134119+08:00||;True|2026-02-02T23:21:52.3235946+08:00||;False|2026-02-02T23:21:47.1386702+08:00||;True|2026-02-02T23:20:46.6277206+08:00||;False|2026-02-02T23:20:40.3158947+08:00||;True|2026-02-02T22:55:39.4268475+08:00||;True|2026-02-01T21:34:30.5989260+08:00||;True|2026-02-01T21:30:20.7556066+08:00||;True|2026-01-30T21:56:47.1840381+08:00||;True|2026-01-28T22:01:00.8412391+08:00||;False|2026-01-28T21:49:29.1242233+08:00||;True|2026-01-28T21:48:26.1707204+08:00||;True|2026-01-28T21:48:05.8291762+08:00||;False|2026-01-28T21:48:01.1596391+08:00||;True|2026-01-28T21:37:59.4831763+08:00||;False|2026-01-28T21:37:53.5855464+08:00||;True|2026-01-28T21:27:51.1872828+08:00||;True|2026-01-28T13:01:14.1677037+08:00||;True|2026-01-28T12:36:45.7819776+08:00||;True|2026-01-28T12:09:15.6540204+08:00||;True|2026-01-28T12:08:40.0490617+08:00||;True|2026-01-28T11:58:55.4078870+08:00||;True|2026-01-27T22:37:03.3304942+08:00||;True|2026-01-27T22:05:40.4316281+08:00||;True|2026-01-26T22:30:43.5083924+08:00||;False|2026-01-26T22:30:33.7355213+08:00||;True|2026-01-26T22:26:26.0218548+08:00||;True|2026-01-26T22:21:32.3171217+08:00||;True|2026-01-26T22:20:40.3916780+08:00||;True|2026-01-26T22:16:19.1017273+08:00||;True|2026-01-26T22:13:34.2028883+08:00||;True|2026-01-26T21:46:23.7117812+08:00||;True|2026-01-26T21:41:19.6963033+08:00||;True|2026-01-25T21:27:13.9893777+08:00||;True|2026-01-24T21:45:22.8493624+08:00||;True|2026-01-24T21:31:35.4635265+08:00||;True|2026-01-24T21:27:31.3098506+08:00||;True|2026-01-24T15:47:01.6934638+08:00||;True|2026-01-24T15:32:35.6316009+08:00||;True|2026-01-24T15:16:28.7216639+08:00||;True|2026-01-23T22:14:26.8066324+08:00||;True|2026-01-23T13:36:48.4086406+08:00||;True|2026-01-23T13:30:27.2924204+08:00||;True|2026-01-23T13:02:53.3219368+08:00||;True|2026-01-23T13:01:54.3466638+08:00||;True|2026-01-23T13:01:28.8560809+08:00||;True|2026-01-22T23:18:32.0400436+08:00||;True|2026-01-22T22:29:29.5746209+08:00||;True|2026-01-22T21:32:21.7284081+08:00||;True|2026-01-22T21:20:26.5985955+08:00||;False|2026-01-22T21:20:21.1372539+08:00||;True|2026-01-22T21:11:18.3771739+08:00||;</History>
|
||||
<History>True|2026-03-19T12:18:59.0075437Z||;True|2026-03-19T20:17:13.9569732+08:00||;True|2026-03-19T20:14:14.2131925+08:00||;True|2026-03-19T19:54:46.3991458+08:00||;True|2026-03-16T19:59:40.7431031+08:00||;True|2026-03-16T19:59:04.2091761+08:00||;True|2026-03-16T19:59:00.1277280+08:00||;True|2026-03-13T19:03:43.3888728+08:00||;True|2026-03-13T19:00:46.5678455+08:00||;True|2026-03-08T20:40:39.8018016+08:00||;True|2026-03-08T20:37:16.4384198+08:00||;True|2026-03-05T22:22:59.1986039+08:00||;True|2026-03-05T21:47:10.7337653+08:00||;True|2026-03-05T21:44:09.8036238+08:00||;False|2026-03-05T21:44:03.0581762+08:00||;True|2026-03-05T18:20:17.8376341+08:00||;True|2026-03-02T21:57:32.1274356+08:00||;True|2026-02-25T22:29:25.1875055+08:00||;True|2026-02-25T22:28:53.3053713+08:00||;True|2026-02-12T19:27:23.6648031+08:00||;True|2026-02-12T19:25:10.7424743+08:00||;True|2026-02-12T17:33:31.2163848+08:00||;True|2026-02-12T17:16:08.2015031+08:00||;False|2026-02-12T17:16:02.9041381+08:00||;True|2026-02-12T17:12:44.8082909+08:00||;True|2026-02-12T17:04:22.1666828+08:00||;True|2026-02-12T17:03:04.2760582+08:00||;True|2026-02-12T16:52:01.7403172+08:00||;True|2026-02-12T16:49:57.7070533+08:00||;False|2026-02-12T16:49:53.4063422+08:00||;True|2026-02-12T16:43:13.2040344+08:00||;False|2026-02-12T16:42:58.3321319+08:00||;True|2026-02-12T16:29:28.6386479+08:00||;True|2026-02-12T16:19:46.9195592+08:00||;True|2026-02-12T14:32:25.3192428+08:00||;True|2026-02-12T12:18:02.1864306+08:00||;True|2026-02-11T20:39:23.8084775+08:00||;True|2026-02-11T20:37:06.6507806+08:00||;True|2026-02-11T20:04:19.1839991+08:00||;True|2026-02-10T21:59:37.6685615+08:00||;True|2026-02-10T15:43:23.5038986+08:00||;True|2026-02-10T14:42:48.6214001+08:00||;True|2026-02-06T23:15:19.0037070+08:00||;True|2026-02-06T22:52:30.1006808+08:00||;True|2026-02-06T22:49:02.0056235+08:00||;True|2026-02-06T22:45:30.6355735+08:00||;False|2026-02-06T22:45:25.7210123+08:00||;True|2026-02-06T22:38:37.6994272+08:00||;True|2026-02-06T22:14:47.8146805+08:00||;True|2026-02-03T22:34:12.3588819+08:00||;True|2026-02-03T22:20:08.9945012+08:00||;True|2026-02-03T21:06:17.7655312+08:00||;True|2026-02-02T23:24:09.9134119+08:00||;True|2026-02-02T23:21:52.3235946+08:00||;False|2026-02-02T23:21:47.1386702+08:00||;True|2026-02-02T23:20:46.6277206+08:00||;False|2026-02-02T23:20:40.3158947+08:00||;True|2026-02-02T22:55:39.4268475+08:00||;True|2026-02-01T21:34:30.5989260+08:00||;True|2026-02-01T21:30:20.7556066+08:00||;True|2026-01-30T21:56:47.1840381+08:00||;True|2026-01-28T22:01:00.8412391+08:00||;False|2026-01-28T21:49:29.1242233+08:00||;True|2026-01-28T21:48:26.1707204+08:00||;True|2026-01-28T21:48:05.8291762+08:00||;False|2026-01-28T21:48:01.1596391+08:00||;True|2026-01-28T21:37:59.4831763+08:00||;False|2026-01-28T21:37:53.5855464+08:00||;True|2026-01-28T21:27:51.1872828+08:00||;True|2026-01-28T13:01:14.1677037+08:00||;True|2026-01-28T12:36:45.7819776+08:00||;True|2026-01-28T12:09:15.6540204+08:00||;True|2026-01-28T12:08:40.0490617+08:00||;True|2026-01-28T11:58:55.4078870+08:00||;True|2026-01-27T22:37:03.3304942+08:00||;True|2026-01-27T22:05:40.4316281+08:00||;True|2026-01-26T22:30:43.5083924+08:00||;False|2026-01-26T22:30:33.7355213+08:00||;True|2026-01-26T22:26:26.0218548+08:00||;True|2026-01-26T22:21:32.3171217+08:00||;True|2026-01-26T22:20:40.3916780+08:00||;True|2026-01-26T22:16:19.1017273+08:00||;True|2026-01-26T22:13:34.2028883+08:00||;True|2026-01-26T21:46:23.7117812+08:00||;True|2026-01-26T21:41:19.6963033+08:00||;True|2026-01-25T21:27:13.9893777+08:00||;True|2026-01-24T21:45:22.8493624+08:00||;True|2026-01-24T21:31:35.4635265+08:00||;True|2026-01-24T21:27:31.3098506+08:00||;True|2026-01-24T15:47:01.6934638+08:00||;True|2026-01-24T15:32:35.6316009+08:00||;True|2026-01-24T15:16:28.7216639+08:00||;True|2026-01-23T22:14:26.8066324+08:00||;True|2026-01-23T13:36:48.4086406+08:00||;True|2026-01-23T13:30:27.2924204+08:00||;True|2026-01-23T13:02:53.3219368+08:00||;True|2026-01-23T13:01:54.3466638+08:00||;True|2026-01-23T13:01:28.8560809+08:00||;True|2026-01-22T23:18:32.0400436+08:00||;True|2026-01-22T22:29:29.5746209+08:00||;</History>
|
||||
<LastFailureDetails />
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -95,8 +95,8 @@ Cookie 及 `sec_user_id` 是同步功能的核心，需严格按步骤获取，
|
||||
|
||||
| 镜像标签 | 架构 |
|
||||
| ----------------- | -------------- |
|
||||
| `beta_2.1.5` | x86_64 (amd64) |
|
||||
| `arm_2.1.5` | ARM64 |
|
||||
| `beta_2.1.6` | x86_64 (amd64) |
|
||||
| `arm_2.1.6` | ARM64 |
|
||||
|
||||
|
||||
### 构建命令示例
|
||||
@@ -113,7 +113,7 @@ Cookie 及 `sec_user_id` 是同步功能的核心，需严格按步骤获取，
|
||||
|
||||
services:
|
||||
dysync:
|
||||
image: ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_2.1.5
|
||||
image: ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_2.1.6
|
||||
container_name: dysync2026 # 容器名称
|
||||
restart: unless-stopped # 始终重启容器，除非容器被手动停止或Docker服务停止
|
||||
ports:
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
</a-tabs>
|
||||
</div>
|
||||
<div class="search-area">
|
||||
|
||||
同步<a-switch v-model:checked="quaryData.openSync" @change="onSyncFilterChange" size="small" />
|
||||
全同步<a-switch v-model:checked="quaryData.fullSync" @change="onSyncFilterChange" size="small" />
|
||||
<!-- 搜索按钮 -->
|
||||
<a-button type="default" class="search-btn" @click="toggleSearchInput">
|
||||
<CloseOutlined v-if="searchInputVisible" />
|
||||
@@ -192,6 +195,8 @@ interface QuaryParam {
|
||||
pageSize: number;
|
||||
followUserName: string | null;
|
||||
mySelfId?: string;
|
||||
openSync: boolean;
|
||||
fullSync: boolean;
|
||||
}
|
||||
|
||||
interface AddForm {
|
||||
@@ -263,6 +268,8 @@ const quaryData: UnwrapRef<QuaryParam> = reactive({
|
||||
pageSize: 20,
|
||||
followUserName: null,
|
||||
mySelfId: '',
|
||||
openSync: false,
|
||||
fullSync: false,
|
||||
});
|
||||
|
||||
// 生命周期 - 挂载时初始化
|
||||
@@ -271,6 +278,10 @@ onMounted(() => {
|
||||
initData();
|
||||
});
|
||||
|
||||
const onSyncFilterChange = () => {
|
||||
quaryData.pageIndex = 0;
|
||||
initData();
|
||||
};
|
||||
// 生命周期 - 卸载时移除滚动监听
|
||||
onUnmounted(() => {
|
||||
const cardContainer = document.querySelector('.dept-user-card-container .card-list-container');
|
||||
|
||||
+1
-1
@@ -131,7 +131,7 @@
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- 核心配置：仅用核心版本号2.1.5，自动拼接前缀 -->
|
||||
<!-- 核心配置：仅用核心版本号2.1.6，自动拼接前缀 -->
|
||||
<!--<Target Name="DockerBuildAndPushAfterPublish" AfterTargets="Publish">
|
||||
<Exec Command="docker build -t jianzhichu/dysync.net:beta_$(DockerCoreVersion) . && docker tag jianzhichu/dysync.net:beta_$(DockerCoreVersion) ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_$(DockerCoreVersion) && docker push ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_$(DockerCoreVersion)"
|
||||
Condition="'$(DockerArch)' == 'x86'" />
|
||||
|
||||
@@ -42,6 +42,10 @@
|
||||
|
||||
public string MySelfId { get; set; }
|
||||
|
||||
public bool OpenSync { get; set; }
|
||||
|
||||
public bool FullSync { get; set; }
|
||||
|
||||
}
|
||||
|
||||
public class FollowUpdateDto
|
||||
|
||||
@@ -43,7 +43,9 @@ namespace dy.net.repository
|
||||
{
|
||||
var where = this.Db.Queryable<DouyinFollowed>()
|
||||
.Where(x => x.mySelfId == dto.MySelfId)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(dto.FollowUserName), x => x.UperName.Contains(dto.FollowUserName) || x.DouyinNo.Contains(dto.FollowUserName));
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(dto.FollowUserName), x => x.UperName.Contains(dto.FollowUserName) || x.DouyinNo.Contains(dto.FollowUserName))
|
||||
.WhereIF(dto.OpenSync,x=>x.OpenSync)
|
||||
.WhereIF(dto.FullSync,x=>x.FullSync &&x.OpenSync);
|
||||
var totalCount = await where.CountAsync();
|
||||
var list = await where.OrderByDescending(x => x.OpenSync).OrderByDescending(x => x.LastSyncTime).Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
return (list, totalCount);
|
||||
|
||||
Reference in New Issue
Block a user