1
This commit is contained in:
@@ -17,6 +17,6 @@
|
|||||||
<SelfContained>false</SelfContained>
|
<SelfContained>false</SelfContained>
|
||||||
<!--<DockerArch>x86</DockerArch>-->
|
<!--<DockerArch>x86</DockerArch>-->
|
||||||
<!--<DockerArch>arm</DockerArch> -->
|
<!--<DockerArch>arm</DockerArch> -->
|
||||||
<!--<DockerCoreVersion>2.1.7</DockerCoreVersion>-->
|
<!--<DockerCoreVersion>2.1.8</DockerCoreVersion>-->
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -95,8 +95,8 @@ Cookie 及 `sec_user_id` 是同步功能的核心,需严格按步骤获取,
|
|||||||
|
|
||||||
| 镜像标签 | 架构 |
|
| 镜像标签 | 架构 |
|
||||||
| ----------------- | -------------- |
|
| ----------------- | -------------- |
|
||||||
| `beta_2.1.7` | x86_64 (amd64) |
|
| `beta_2.1.8` | x86_64 (amd64) |
|
||||||
| `arm_2.1.7` | ARM64 |
|
| `arm_2.1.8` | ARM64 |
|
||||||
|
|
||||||
|
|
||||||
### 构建命令示例
|
### 构建命令示例
|
||||||
@@ -113,7 +113,7 @@ Cookie 及 `sec_user_id` 是同步功能的核心,需严格按步骤获取,
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
dysync:
|
dysync:
|
||||||
image: ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_2.1.7
|
image: ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_2.1.8
|
||||||
container_name: dysync2026 # 容器名称
|
container_name: dysync2026 # 容器名称
|
||||||
restart: unless-stopped # 始终重启容器,除非容器被手动停止或Docker服务停止
|
restart: unless-stopped # 始终重启容器,除非容器被手动停止或Docker服务停止
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="search-area">
|
<div class="search-area">
|
||||||
|
|
||||||
|
未开启<a-switch v-model:checked="quaryData.unOpen" @change="onSyncFilterChange" size="small" />
|
||||||
同步<a-switch v-model:checked="quaryData.openSync" @change="onSyncFilterChange" size="small" />
|
同步<a-switch v-model:checked="quaryData.openSync" @change="onSyncFilterChange" size="small" />
|
||||||
全同步<a-switch v-model:checked="quaryData.fullSync" @change="onSyncFilterChange" size="small" />
|
全同步<a-switch v-model:checked="quaryData.fullSync" @change="onSyncFilterChange" size="small" />
|
||||||
<!-- 搜索按钮 -->
|
<!-- 搜索按钮 -->
|
||||||
@@ -197,6 +198,7 @@ interface QuaryParam {
|
|||||||
mySelfId?: string;
|
mySelfId?: string;
|
||||||
openSync: boolean;
|
openSync: boolean;
|
||||||
fullSync: boolean;
|
fullSync: boolean;
|
||||||
|
unOpen: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface AddForm {
|
interface AddForm {
|
||||||
@@ -270,6 +272,7 @@ const quaryData: UnwrapRef<QuaryParam> = reactive({
|
|||||||
mySelfId: '',
|
mySelfId: '',
|
||||||
openSync: false,
|
openSync: false,
|
||||||
fullSync: false,
|
fullSync: false,
|
||||||
|
unOpen: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
// 生命周期 - 挂载时初始化
|
// 生命周期 - 挂载时初始化
|
||||||
|
|||||||
+1
-1
@@ -131,7 +131,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<!-- 核心配置:仅用核心版本号2.1.7,自动拼接前缀 -->
|
<!-- 核心配置:仅用核心版本号2.1.8,自动拼接前缀 -->
|
||||||
<!--<Target Name="DockerBuildAndPushAfterPublish" AfterTargets="Publish">
|
<!--<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)"
|
<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'" />
|
Condition="'$(DockerArch)' == 'x86'" />
|
||||||
|
|||||||
@@ -46,6 +46,8 @@
|
|||||||
|
|
||||||
public bool FullSync { get; set; }
|
public bool FullSync { get; set; }
|
||||||
|
|
||||||
|
public bool UnOpen { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class FollowUpdateDto
|
public class FollowUpdateDto
|
||||||
|
|||||||
@@ -44,8 +44,9 @@ namespace dy.net.repository
|
|||||||
var where = this.Db.Queryable<DouyinFollowed>()
|
var where = this.Db.Queryable<DouyinFollowed>()
|
||||||
.Where(x => x.mySelfId == dto.MySelfId)
|
.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.UnOpen, x => !x.OpenSync && !x.FullSync)
|
||||||
.WhereIF(dto.FullSync, x => x.OpenSync && x.FullSync);
|
.WhereIF(!dto.UnOpen && dto.OpenSync, x => x.OpenSync)
|
||||||
|
.WhereIF(!dto.UnOpen && dto.FullSync, x => x.OpenSync && x.FullSync);
|
||||||
//.WhereIF(!dto.OpenSync, x => !x.OpenSync && !x.FullSync);
|
//.WhereIF(!dto.OpenSync, x => !x.OpenSync && !x.FullSync);
|
||||||
var totalCount = await where.CountAsync();
|
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();
|
var list = await where.OrderByDescending(x => x.OpenSync).OrderByDescending(x => x.LastSyncTime).Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ namespace dy.net.service
|
|||||||
if (followed != null)
|
if (followed != null)
|
||||||
{
|
{
|
||||||
followed.OpenSync = dto.OpenSync;
|
followed.OpenSync = dto.OpenSync;
|
||||||
followed.FullSync = dto.FullSync;
|
followed.FullSync = dto.OpenSync && dto.FullSync;
|
||||||
followed.SavePath = dto.SavePath;
|
followed.SavePath = dto.SavePath;
|
||||||
return await _followRepository.Update(followed);
|
return await _followRepository.Update(followed);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user